Combat

slight git derp (my bad)