commit to save changes: will change FSM implementation to 2-dim table

added new states and changed token structure