Begin the switch to simple injector
Finished support for simple injector (I think)