Cartridge refactor WIP