hung injector off of request and more refactoring