WIP Cartridge Refactor - testing creating correct model