Added a queue to guarantee order.
Merge branch 'OrderQueue'