Move some stuff to make homesick work