More base state machine work