Feature/building pieces

Fixes #85