Lots of changes, added some new injectors and twiddled their API's a bit