City Rough

This is a rough draft of the city and an update to the map rules