DI WIP
Finished refactoring of DI container and service locator.