WIP: in-place-motion