wo: moving cities to own data structure