Cleaned up Building.java
Merge branch 'feature/models' into develop