Making city a big boy class and adding a separate file for connections