WIP Cartridge Refactor

* Update documentation