More queue improvements
Moar queueing