COMPREHENSIVE PLAN DRAFT 2020