Restructure the individual battles. Include challenger and defender models.