creator now working as an FSM properly.
Still needs a tidy, but I'm happy with the results.