Fixing my own mess ups...
Trying again, I must be tired...
refactored buildingType.js to make it less confusing.