Phase 2 resubmitted

Yup, back to the city with answers to their comments an questions.

We'll hear back on April 30th!