Preliminary commit, working on the order code