Logic changes / refactoring to fit the interface programming. Should be building now.