WIP: better frontend for moves