opt-queue-master
debugs and fix
don't merge or squash this - test / debug changes only