Still broken, working on injection