Research

Merge the interfaces for the 3 building types to dev.