Refactor Cart (changed to Order.new)