pretty big reorg of the newer qa stuff underneath streams, to reduce the duplicate state tracking in a switch