Working on order-machine and enhancing braintree