(WIP) Cdodge/shopping cart rewrite

Is this part of this PR?