some new classes for buildings, zones...
merged