Some better work on how we're retrieving cities. Yay!