Add move_to and wait_until calls