Move Status stuff to controller