More progress on the new queue system