Starting to make changes to order storage
fixed merge stuff
got server storage working
fixed merge conflicts