WIP Cartridge Refactor - Cartridge Repository

* Initial load + tests