made injector its own subsystem
massive commit