Add Combatant Work

Can successfully add a single combatant. Successive combatants reference
the first.
Revert "Add Combatant Work"

This reverts commit 68b161081237827fef956fd1f4fa090eac1b3878.
Merge remote-tracking branch 'origin/master'