Worked on Combatant and Move.

Ignore some of design for now.