So clean up and a rough implementation of move to grab.