Some more progress towards the queue system.