Moved some stuff to controllers