Large update: City basics