Major changes to Order and OrderList

Minor chnages to the others