WIP Cartridge Refactor -- restore --version to setup calls

[merge]