CityScape in progress, requiring CityLayout to finish it, maybe they could be merged in one class