Cartridge Refactor WIP