Pier Comprehensive Plan taking shape