base controllers
first working
controller injector
more updates
clean up