Worked on making the Civilian FSM work