Completed initial rewrite of the dependency injection container.