halfway done
version 1 fsm
Merge branch 'fsm1500'