Moving stuff to Controller