Fix bug in bbl class, add building class