Upgrading the CombatForm. Adding combat logic, and improving things.