Issue #70 New Finite State Machine