New State Machine

Took out the old state machine and added a new Finite State Machine