Major overhaul, add Injector.