Updated Controller to include stuff.