Added a couple new features, including canceling an order if it takes too long