Begins work on improved dependency injection.