Move more stuff around