Big refactoring: OrderItem now include quantity