Attempt to merge
Making progress on city management. Added management popup and a few method stubs.