Feature/take and store orders

These changes shouldn't be in this branch