Some more additions to the building class.