Startign to add singletons and structure the city