WIP: Order state in order list. See #51