Buildings added and a bunch of refactors
Merge remote-tracking branch 'origin/master'