Finished State Machine
Merge branch 'Testing/StateMachine'