Implemented State Machine 1.1

Fixed a small screw up in prior commit