First real commit of combat class