Added a bunch of controllers
What the hell GitHub??
merge