refactor city. add rewind.