Added basic building annotations. Renamed a few things to prevent future confusion.