WIP Cartridge Refactor - Finish context checking