Queues Module completed, additional changes