Porting to new CityLife API. Big cleanup still TODO