Initial implementation of city overlays instead of markers

Shitty but could be merged.

Still got some refactoring to do. Discussion/review welcomed.