Flesh out state_machine modeling
State_machine minor changes