(WIP) Cdodge/shopping cart rewrite

You don't really use this class, right?  No need to have it if you don't use it