move stuff to controllers