WIP fix dependency injections
fix controllers