Staging

A lot of reorganization and such. Putting stuff inside the callback so that the city is properly defined.