Basic building blocks

Merged David Nichols requested to merge basic_building_blocks into develop

Merge request reports