[WIP] Improve use of queues