Moved order methods from takeaway to order