Got cart storage working, need to fix clearing up of orphaned items