Moved some stuff around for prose