Continue work on two layer state machines