Did code tidy and added Order object state machine to hold current order
status (this replaces object T1)