Buildingblocks

Merge in buildingblocks changes to master.