Changes to screen requests.
Moved simple state machine to own file