Work on setting injections properly