Added all the new cartridge stuff and removed old stuff.