Refactor queueing system to allow auto-dequeuing to use dequeue directly and