The FSM branch is looking good. All features have been tested.
Ready for wider testing.