Got IoC working with pipeline refactoring, and hooked up to (now passing) unit tests