WIP fix dependency injections