Changed TV buildings to water sources, added WaterSource object