Shopping cart - 2nd submission.

I think this might be making the step definition a bit too complex.