starting to plan the FSM
Merge remote-tracking branch 'origin/master'