Move some things around and distinguish between the static representation of a Unit and a unit who is in battle (Combatant).