Started refactor of Shopping Cart