That's the sort of stuff going into my intermediate kit. I should add that it includes things I'd most likely use on others. Some I could on myself if conscious and able. But that brings up another valuable consideration: training family and friends.