Still working on fixing injecting