Revert "Revert "Major changes to Order and OrderList""

This reverts commit 20bcbd00c6d583389c8e386e086907f54d081eea.
Revert "Revert "Revert "Major changes to Order and OrderList"""

This reverts commit 49039a334855bec3a6035973a6c15a14e3d2f47f.
Revert "Revert "Major changes to Order and OrderList""

This reverts commit 20bcbd00c6d583389c8e386e086907f54d081eea.
Revert "Revert "Revert "Major changes to Order and OrderList"""

This reverts commit 9092fce7e6c7bbfc83c534008e20ba511a878e79.
Revert "Revert "Revert "Revert "Major changes to Order and OrderList""""

This reverts commit 2c76d0e295503907e77ae56b47ff48b134ac56f0.
Revert "Revert "Revert "Major changes to Order and OrderList"""

This reverts commit 49039a334855bec3a6035973a6c15a14e3d2f47f.
Revert "Revert "Major changes to Order and OrderList""

This reverts commit 20bcbd00c6d583389c8e386e086907f54d081eea.