Support for Timeout n and From ..

- The state machine gets kind of complex
  maybe it should become a parser at some point?