Rationalise the FSM

using Vehicle Factory state information