New state machine(s)
Small change
Continuing changes to the way state machines function
Continuing changes in the state machines
Ready to test new state machines
Merging state_machine to master