(WIP) Cdodge/shopping cart rewrite

I see what you mean, but I'd like to pass this observation onto the Product team. @griffresch @andywaldrop.