Added MakeOrder and TakeOrder logic