WIP: improve order storage format