refactor finished, added manual city picking