Combat system rewrite begun