state engine into two separate state engines, one for session
and one for requests.

Next comes the cleanup of all the bits and pieces...