Mostly done with flow class arbitration
Finished flow class arbitration, see ticket
Merge branch 'flow_class_arbitration'