More WIP: moving things around