2017 Update to the Comprehensive Plan