Feature/take and store orders

These style changes shouldn't be part of this branch.