V2 New cartridge code path

See commits