Refactored build method to allow for interface instantiation at runtime

Removed some remaining cruft from the last PR.