Continued work on Civilian FSM