Refactored Tombstoning to use a Dictionary, elminiating the need to restore from multiple stateobjects.