Kill/Death Storage changes

part 1