+ constants in buildings
+ costfactors
merge conflicts