Moving stuff to the right place, pt.2