WIP Cartridge Refactor - update documentation