Big step forward towards order refactor