Reworking the whole unit-player-city relationship