Move stuff to make more sense