Update move token.  #29
Add waitfor token handler.  #29