start working on making the change city code DWIM