CityRDF added, started working on each form