Are there reasons for not moving this fully into the OrderManager?