Shopping cart - updates based on Blake's feedback from PR #104