Merge pull request #20 from pmorie/dev/cartridge_refactor

Fixes / WIP
wip: stub V2 add/remove_cart