(WIP) Cdodge/shopping cart rewrite

remove commented code before merge.