Remaking blocks, added Building class