Work on fixing the OrderManager implementation (broken)