From ecef67c066b3ea41299402aae93826f124298c42 Mon Sep 17 00:00:00 2001
From: Gethe <gethe88@gmail.com>
Date: Sat, 6 Nov 2021 03:40:02 +0000
Subject: [PATCH] 2.5.2 (40892)

---
 .../Blizzard_Commentator.lua                  |  13 +
 .../Blizzard_CommentatorUnitFrame.lua         |   2 +-
 .../Blizzard_UIWidgetTopCenterFrame.lua       |   2 +-
 .../FrameXML/ObjectAPI/PlayerLocation.lua     |  18 +
 .../AddOns/Blizzard_Commentator/Bindings.xml  | 184 -----
 .../CommentatorVictoryFanfare.lua             |  66 --
 .../CommentatorVictoryFanfare.xml             | 173 ----
 Interface_TBC/FrameXML/BNet.lua               |   5 +
 Interface_TBC/FrameXML/FriendsFrame.lua       |  11 +-
 Interface_TBC/FrameXML/Minimap.lua            |   6 -
 Interface_TBC/FrameXML/StaticPopup.lua        |  22 -
 Interface_TBC/FrameXML/UnitPopup.lua          |   2 +
 .../AddOns/Blizzard_Commentator/Bindings.xml  | 352 ---------
 .../CommentatorEventAlerts.lua                |  26 -
 .../CommentatorEventAlerts.xml                |  16 -
 .../CommentatorVictoryFanfare.lua             |  66 --
 .../CommentatorVictoryFanfare.xml             | 173 ----
 .../Blizzard_Commentator/PvPCommentator.lua   | 630 ---------------
 .../Blizzard_Commentator/PvPCommentator.xml   |  11 -
 .../Blizzard_Commentator/TeamDisplay.lua      | 197 -----
 .../Blizzard_Commentator/TeamDisplay.xml      |  85 --
 .../AddOns/Blizzard_Commentator/UnitFrame.lua | 415 ----------
 .../UnitFrameLayoutData.lua                   | 741 ------------------
 .../UnitFrameTemplates.xml                    | 126 ---
 Interface_Vanilla/FrameXML/BNet.lua           |   5 +
 Interface_Vanilla/FrameXML/FriendsFrame.lua   |  11 +-
 Interface_Vanilla/FrameXML/Minimap.lua        |   1 -
 Interface_Vanilla/FrameXML/UnitPopup.lua      |   2 +
 28 files changed, 65 insertions(+), 3296 deletions(-)
 delete mode 100644 Interface_TBC/AddOns/Blizzard_Commentator/Bindings.xml
 delete mode 100644 Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua
 delete mode 100644 Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/Bindings.xml
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.lua
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.xml
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.lua
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.xml
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.lua
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.xml
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrame.lua
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameLayoutData.lua
 delete mode 100644 Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameTemplates.xml

diff --git a/Interface/AddOns/Blizzard_Commentator/Blizzard_Commentator.lua b/Interface/AddOns/Blizzard_Commentator/Blizzard_Commentator.lua
index 5a413943e9..94cbf3ec4d 100644
--- a/Interface/AddOns/Blizzard_Commentator/Blizzard_Commentator.lua
+++ b/Interface/AddOns/Blizzard_Commentator/Blizzard_Commentator.lua
@@ -36,6 +36,15 @@ function CycleFollowCameraTransitionPreset(index)
 	C_Commentator.SetFollowCameraSpeeds(unpack(FOLLOW_CAM_TRANSITION_SPEEDS[CurrentCamTransitionIndex]));
 end
 
+function SetSpectatorModeForOtherFrames(spectatorMode)
+	if (UIWidgetTopCenterContainerFrame) then
+		UIWidgetTopCenterContainerFrame:SetSpectatorMode(spectatorMode, Commentator.Scoreboard.Clock);
+	end
+	if (BattlefieldMapFrame) then
+		BattlefieldMapFrame:SetSpectatorMode(spectatorMode);
+	end
+end
+
 CommentatorMixin = {}
 
 function CommentatorMixin:OnLoad()
@@ -276,6 +285,7 @@ function CommentatorMixin:Shutdown()
 	self.Scoreboard:Hide();
 	self:ClearUnitFrames();
 	self:SetFrameLock(false);
+	SetSpectatorModeForOtherFrames(false);
 end
 
 function CommentatorMixin:Reset()
@@ -457,6 +467,7 @@ function CommentatorMixin:OnObserverStateChanged(oldState, newState)
 		self:ClearUnitFrames();
 
 		self:SetFrameLock(true);
+		SetSpectatorModeForOtherFrames(true);
 	elseif newState == TOURNAMENTARENA_ZONESTATE_OBSERVING or newState == TOURNAMENTARENA_ZONESTATE_PREMATCH then
 		ClearTarget();
 
@@ -466,6 +477,7 @@ function CommentatorMixin:OnObserverStateChanged(oldState, newState)
 		self.currentSpeedFactor = nil;
 
 		self:SetFrameLock(true);
+		SetSpectatorModeForOtherFrames(true);
 	elseif newState == TOURNAMENTARENA_ZONESTATE_SCANNING then
 		ClearTarget();
 
@@ -477,6 +489,7 @@ function CommentatorMixin:OnObserverStateChanged(oldState, newState)
 		self:ClearUnitFrames();
 
 		self:SetFrameLock(false);
+		SetSpectatorModeForOtherFrames(false);
 	end
 end
 
diff --git a/Interface/AddOns/Blizzard_Commentator/Blizzard_CommentatorUnitFrame.lua b/Interface/AddOns/Blizzard_Commentator/Blizzard_CommentatorUnitFrame.lua
index 0d55378fbf..15b1b89a32 100644
--- a/Interface/AddOns/Blizzard_Commentator/Blizzard_CommentatorUnitFrame.lua
+++ b/Interface/AddOns/Blizzard_Commentator/Blizzard_CommentatorUnitFrame.lua
@@ -255,7 +255,7 @@ end
 
 function CommentatorUnitFrameMixin:GetPlayerNameText()
 	if self.lifeState == LifeState.Dead then
-		return COMMENTATOR_UNITFRAME_DEAD_STR;
+		return self:GetPlayerName() .. " " .. COMMENTATOR_UNITFRAME_DEAD_STR;
 	elseif self.ccDisplayText and GetCVarBool("commentatorLossOfControlTextUnitFrame") then
 		return self.ccDisplayText;
 	else
diff --git a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTopCenterFrame.lua b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTopCenterFrame.lua
index a7821de523..cc6682255e 100644
--- a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTopCenterFrame.lua
+++ b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTopCenterFrame.lua
@@ -50,7 +50,7 @@ end
 function UIWidgetTopCenterContainerMixin:SetSpectatorMode(spectatorMode, relativeFrame)
 	if (spectatorMode) then
 		if (relativeFrame) then
-			self:SetPoint("TOP", relativeFrame, "BOTTOM", 0, -5);
+			self:SetPoint("TOP", relativeFrame, "BOTTOM", 0, 0);
 		end
 		self:SetScale(1.5);
 	else
diff --git a/Interface/FrameXML/ObjectAPI/PlayerLocation.lua b/Interface/FrameXML/ObjectAPI/PlayerLocation.lua
index f49c2c7575..bfab2c89bf 100644
--- a/Interface/FrameXML/ObjectAPI/PlayerLocation.lua
+++ b/Interface/FrameXML/ObjectAPI/PlayerLocation.lua
@@ -43,6 +43,12 @@ end
 	return playerLocation;
 end
 
+--[[static]] function PlayerLocation:CreateFromWhoIndex(whoIndex)
+	local playerLocation = CreateFromMixins(PlayerLocationMixin);
+	playerLocation:SetWhoIndex(whoIndex);
+	return playerLocation;
+end
+
 --[[public api]]
 function PlayerLocationMixin:SetGUID(guid)
 	self:ClearAndSetField("guid", guid);
@@ -118,6 +124,18 @@ function PlayerLocationMixin:GetVoiceID()
 	return self.voiceMemberID, self.voiceChannelID;
 end
 
+function PlayerLocationMixin:SetWhoIndex(whoIndex)
+	self:ClearAndSetField("whoIndex", whoIndex);
+end
+
+function PlayerLocationMixin:IsWhoIndex()
+	return self.whoIndex ~= nil;
+end
+
+function PlayerLocationMixin:GetWhoIndex()
+	return self.whoIndex;
+end
+
 function PlayerLocationMixin:SetCommunityData(clubID, streamID, epoch, position)
 	self:Clear();
 	self.communityClubID = clubID;
diff --git a/Interface_TBC/AddOns/Blizzard_Commentator/Bindings.xml b/Interface_TBC/AddOns/Blizzard_Commentator/Bindings.xml
deleted file mode 100644
index b526e74ca0..0000000000
--- a/Interface_TBC/AddOns/Blizzard_Commentator/Bindings.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<Bindings>
-	<!-- Commentator Bindings -->	
-	<Binding name="COMMENTATORRESET" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:Reset();
-	</Binding>
-	
-	<Binding name="COMMENTATORMOVESPEEDINCREASE" header="COMMENTATORCAMERA" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ModifyCameraSpeed(1);
-	</Binding>
-	<Binding name="COMMENTATORMOVESPEEDDECREASE" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ModifyCameraSpeed(-1);
-	</Binding>
-	
-	<Binding name="COMMENTATORZOOMIN" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ZoomIn();
-	</Binding>
-	<Binding name="COMMENTATORZOOMOUT" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ZoomOut();
-	</Binding>
-	<Binding name="COMMENTATORRESETZOOM" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ResetFoVTarget();
-	</Binding>
-	<Binding name="TOGGLE_SMART_CAMERA" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetUseSmartCamera(not C_Commentator.IsUsingSmartCamera());
-	</Binding>
-	<Binding name="TOGGLE_SMART_CAMERA_LOCK" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetSmartCameraLocked(not C_Commentator.IsSmartCameraLocked());
-	</Binding>>
-
-	<Binding name="COMMENTATORLOOKATNONE" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ClearCameraTarget();
-	</Binding>
-	
-	
-	<Binding name="CYCLEFOLLOWTRANSITONSPEED" category="BINDING_HEADER_COMMENTATOR">
-		CycleFollowCameraTransitionPreset();
-	</Binding>
-	<Binding name="FORCEFOLLOWTRANSITON" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ForceFollowTransition();
-	</Binding>
-	<Binding name="TOGGLESMOOTHFOLLOWTRANSITIONS" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetSmoothFollowTransitioning(not C_Commentator.GetSmoothFollowTransitioning());
-	</Binding>
-	<Binding name="TOGGLECAMERACOLLISION" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetCameraCollision(not C_Commentator.GetCameraCollision());
-	</Binding>
-
-	
-	<Binding name="TEAM_1_ADD_SCORE" header="COMMENTATORSCORING" category="BINDING_HEADER_COMMENTATOR">
-		Commentator.Scoreboard:AddScore(1)
-	</Binding>
-	<Binding name="TEAM_2_ADD_SCORE" category="BINDING_HEADER_COMMENTATOR">
-		Commentator.Scoreboard:AddScore(2)
-	</Binding>
-	<Binding name="TEAM_1_REMOVE_SCORE" category="BINDING_HEADER_COMMENTATOR">
-		Commentator.Scoreboard:RemoveScore(1)
-	</Binding>
-	<Binding name="TEAM_2_REMOVE_SCORE" category="BINDING_HEADER_COMMENTATOR">
-		Commentator.Scoreboard:RemoveScore(2)
-	</Binding>
-	<Binding name="RESET_SCORE_COUNT" category="BINDING_HEADER_COMMENTATOR">
-		Commentator.Scoreboard:ResetScores()
-	</Binding>
-	<Binding name="SWAPUNITFRAMES" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:SwapTeams();
-	</Binding>
-	<Binding name="CHECK_FOR_SCOREBOARD" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:CheckScoreboard();
-	</Binding>
-	<Binding name="TOGGLE_FRAME_LOCK" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ToggleFrameLock();
-	</Binding>
-
-	<Binding name="COMMENTATORFOLLOW1" header="COMMENTATORFOLLOW" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW2" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW3" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW4" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW5" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW6" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW7" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW8" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW9" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW10" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW11" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW12" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	
-	<Binding name="COMMENTATORFOLLOW1SNAP" header="COMMENTATORFOLLOWSNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW2SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW3SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW4SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW5SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW6SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW7SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW8SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW9SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW10SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW11SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW12SNAP" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	
-	<Binding name="COMMENTATORLOOKAT1" header="COMMENTATORLOOKAT" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 1, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT2" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 2, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT3" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 3, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT4" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 4, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT5" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 5, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT6" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(1, 6, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT7" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 1, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT8" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 2, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT9" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 3, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT10" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 4, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT11" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 5, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT12" category="BINDING_HEADER_COMMENTATOR">
-		Commentator:ObservePlayer(2, 6, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-</Bindings>
diff --git a/Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua b/Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua
deleted file mode 100644
index 08f3b18ae6..0000000000
--- a/Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-
-local COMMENTATOR_VICTORY_FANFARE_MODEL_SCENE_ID = 59;
-local COMMENTATOR_VICTORY_FANFARE_EFFECT_MODEL_ID = 382335;--"SPELLS\\EASTERN_PLAGUELANDS_BEAM_EFFECT.M2";
-
-CommentatorVictoryFanfareFrameMixin = {};
-
-function CommentatorVictoryFanfareFrameMixin:OnLoad()
-	self:RegisterEvent("PLAYER_ENTERING_WORLD");
-	self.BackgroundModelScene:SetFromModelSceneID(COMMENTATOR_VICTORY_FANFARE_MODEL_SCENE_ID, true);
-	
-	local effect = self.BackgroundModelScene:GetActorByTag("effect");
-	if effect then
-		effect:SetModelByFileID(COMMENTATOR_VICTORY_FANFARE_EFFECT_MODEL_ID);
-		effect:SetAlpha(0.0);
-		self.BackgroundModelScene.effect = effect;
-	end
-	
-	local effect2 = self.BackgroundModelScene:GetActorByTag("effect2");
-	if effect2 then
-		effect2:SetModelByFileID(COMMENTATOR_VICTORY_FANFARE_EFFECT_MODEL_ID);
-		effect2:SetAlpha(0.0);
-		self.BackgroundModelScene.effect2 = effect2;
-	end
-	
-	self.BG1:SetWidth(GetScreenWidth() * 0.8);
-	self.BG1:SetHeight(2);
-	
-	self.BG2:SetWidth(GetScreenWidth() * 0.8);
-	self.BG2:SetHeight(2);
-
-end
-
-function CommentatorVictoryFanfareFrameMixin:OnEvent(event)
-	if event == "PLAYER_ENTERING_WORLD" then
-		self:Reset();
-		self:Hide();
-	end
-end
-
-function CommentatorVictoryFanfareFrameMixin:PlayVictoryFanfare(text, team)
-	self.Title:SetText(text);
-	self.TitleFlash:SetText(text);
-	self.TeamName:SetText(team);
-	self.TeamNameFlash:SetText(team);
-
-	self:Reset();
-	self.Anim:Play();
-	
-	C_Timer.After(1.5, function()
-		self.BackgroundModelScene.EffectAnimIn:Play();
-		self.BackgroundModelScene:Show();
-	end);
-	
-	C_Timer.After(5.0, function()
-		self.ExitArenaButton:Show();
-	end);
-end
-
-function CommentatorVictoryFanfareFrameMixin:Reset()
-	self.Icon:SetAlpha(0);
-	self.Icon2:SetAlpha(0);
-	self.Icon3:SetAlpha(0);
-	self.BackgroundModelScene:Hide();
-	self.Anim:Stop();
-	self.ExitArenaButton:Hide();
-end
diff --git a/Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml b/Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml
deleted file mode 100644
index 60b2fda445..0000000000
--- a/Interface_TBC/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
-
-	<Script file="CommentatorVictoryFanfare.lua"/>
-	
-	<Frame name="CommentatorVictoryFanfareFrame" hidden="true" parent="UIParent" mixin="CommentatorVictoryFanfareFrameMixin">
-		<Size x="600" y="300"/>
-		<Anchors>
-			<Anchor point="TOP" x="0" y="-170"/>
-		</Anchors>
-		<Frames>
-			<ModelScene parentKey="BackgroundModelScene" enableMouse="false" inherits="NonInteractableModelSceneMixinTemplate">
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="UIParent"/>
-					<Anchor point="BOTTOMRIGHT" relativeTo="UIParent"/>
-				</Anchors>
-				<Animations>
-					<AnimationGroup parentKey="EffectAnimIn" setToFinalAlpha="true">
-						<Alpha childKey="effect" duration="0.5" order="1" fromAlpha="0" toAlpha="1"/>
-						<Alpha childKey="effect2" duration="0.5" order="1" fromAlpha="0" toAlpha="1"/>
-					</AnimationGroup>
-				</Animations>
-			</ModelScene>
-			<Button parentKey="ExitArenaButton" frameStrata="TOOLTIP">
-				<Size x="32" y="32" />
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="UIParent" />
-					<Anchor point="BOTTOMRIGHT" relativeTo="UIParent" />
-				</Anchors>
-				<Scripts>
-					<OnClick>
-						Commentator:ExitInstance();
-					</OnClick>
-				</Scripts>
-			</Button>
-		</Frames>
-		<Layers>
-			<Layer level="BACKGROUND">
-				<Texture parentKey="Icon" hidden="false" alpha="0" alphaMode="BLEND" atlas="bonusobjectives-title-icon-honor" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" x="0" y="-9"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="1">
-				<Texture parentKey="Icon2" hidden="false" alpha="0" alphaMode="ADD" atlas="bonusobjectives-title-icon-honor" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="2">
-				<Texture parentKey="Icon3" hidden="false" alpha="0" alphaMode="ADD" atlas="bonusobjectives-title-icon-honor" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BORDER">
-				<Texture parentKey="BG1" hidden="false" alpha="0" alphaMode="BLEND" atlas="tournamentarena-winnerline" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BORDER" textureSubLevel="1">
-				<Texture parentKey="BG2" hidden="false" alpha="0" alphaMode="ADD" atlas="tournamentarena-winnerline" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="ARTWORK">
-				<FontString parentKey="Title" inherits="CommentatorVictoryFanfare" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="80"/>
-					</Anchors>
-					<Color r="1" g="0.82" b="0"/>
-				</FontString>
-				<FontString parentKey="TitleFlash" inherits="Game120Font" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="80"/>
-					</Anchors>
-					<Color r="1" g="1" b="1"/>
-				</FontString>
-				<FontString parentKey="TeamName" inherits="CommentatorVictoryFanfareTeam" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="-80"/>
-					</Anchors>
-					<Color r="1" g="0.82" b="0"/>
-				</FontString>
-				<FontString parentKey="TeamNameFlash" inherits="CommentatorVictoryFanfareTeam" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="-80"/>
-					</Anchors>
-					<Color r="1" g="1" b="1"/>
-				</FontString>
-				<FontString parentKey="BonusLabel" inherits="GameFontHighlightLarge" alpha="0">
-					<Anchors>
-						<Anchor point="TOP" relativeKey="$parent.Title" relativePoint="BOTTOM" x="0" y="-7"/>
-					</Anchors>
-				</FontString>
-			</Layer>
-			<Layer level="BACKGROUND">
-				<Texture parentKey="Starglow" hidden="false" alpha="0" alphaMode="BLEND" atlas="titleprestige-starglow">
-					<Size x="800" y="500"/>
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon" x="0" y="2"/>
-					</Anchors>
-				</Texture>
-				<Texture parentKey="Starglow3" hidden="false" alpha="0" alphaMode="BLEND" atlas="titleprestige-starglow">
-					<Size x="600" y="500"/>
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Starglow" x="0" y="2"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="1">
-				<Texture parentKey="Starglow2" hidden="false" alpha="0" alphaMode="ADD" atlas="titleprestige-starglow" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Starglow"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="ARTWORK" textureSubLevel="-3">
-				<Texture parentKey="Glowcover" hidden="false" alpha="0" alphaMode="ADD" atlas="titleprestige-glowcover" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon" x="0" y="7"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-		</Layers>
-		<Animations>
-			<AnimationGroup parentKey="Anim" setToFinalAlpha="true">
-				<Scale childKey="BG1" duration="0.33" order="1" fromScaleX="0.001" fromScaleY="1" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="BG1" duration="0.01" order="1" fromAlpha="0" toAlpha="1"/>
-				<Scale childKey="BG2" duration="0.33" order="1" fromScaleX="0.001" fromScaleY="1" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="BG2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="BG2" startDelay="0.33" smoothing="IN" duration="0.33" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Title" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="BonusLabel" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="TitleFlash" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="TitleFlash" startDelay="0.33" smoothing="IN" duration="0.33" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Icon" startDelay="1.2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Scale childKey="Icon" startDelay="1.2" smoothing="IN" duration="0.33" order="1" fromScaleX="3.4" fromScaleY="3.4" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="Icon2" startDelay="1.2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="Icon2" startDelay="1.53" smoothing="IN" duration="0.33" order="1" fromAlpha="1" toAlpha="0"/>
-				<Scale childKey="Icon2" startDelay="1.2" smoothing="IN" duration="0.33" order="1" fromScaleX="3.4" fromScaleY="3.4" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="Icon3" startDelay="1.2" duration="0.33" order="1" fromAlpha="0" toAlpha="0.35"/>
-				<Alpha childKey="Icon3" startDelay="1.53" smoothing="IN" duration="0.33" order="1" fromAlpha="0.35" toAlpha="0"/>
-				<Scale childKey="Icon3" startDelay="1.2" smoothing="IN" duration="0.33" order="1" fromScaleX="4.8" fromScaleY="4.8" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="Starglow2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Rotation childKey="Starglow2" duration="1.5" order="1" degrees="30"/>
-				<Alpha childKey="Starglow3" duration="0.33" order="1" fromAlpha="0" toAlpha="0.3"/>
-				<Alpha childKey="Glowcover" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="Starglow" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="Starglow" startDelay="0.33" duration="0.33" order="1" fromAlpha="1" toAlpha="1.0"/>
-				<Alpha childKey="Starglow" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Starglow2" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Starglow3" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Glowcover" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Scale childKey="Starglow" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-				<Scale childKey="Starglow2" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-				<Scale childKey="Starglow3" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-				<Scale childKey="Glowcover" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-			</AnimationGroup>
-		</Animations>
-		<Scripts>
-			<OnLoad method="OnLoad"/>
-			<OnEvent method="OnEvent"/>
-		</Scripts>
-	</Frame>
-
-</Ui>
\ No newline at end of file
diff --git a/Interface_TBC/FrameXML/BNet.lua b/Interface_TBC/FrameXML/BNet.lua
index f1f9a39b2c..ad387aab67 100644
--- a/Interface_TBC/FrameXML/BNet.lua
+++ b/Interface_TBC/FrameXML/BNet.lua
@@ -23,6 +23,7 @@ BNET_CLIENT_WC3 = "W3";
 BNET_CLIENT_ARCADE = "RTRO";
 BNET_CLIENT_CRASH4 = "WLBY";
 BNET_CLIENT_D2 = "OSI";
+BNET_CLIENT_COD_VANGUARD = "FORE";
 
 WOW_PROJECT_MAINLINE = 1;
 WOW_PROJECT_CLASSIC = 2;
@@ -400,6 +401,8 @@ function BNet_GetClientEmbeddedTexture(client, width, height, xOffset, yOffset)
  		textureString = "Interface\\ChatFrame\\UI-ChatIcon-CrashBandicoot4";
  	elseif ( client == BNET_CLIENT_D2 ) then
  		textureString = "Interface\\ChatFrame\\UI-ChatIcon-DiabloIIResurrected";
+ 	elseif ( client == BNET_CLIENT_COD_VANGUARD ) then
+ 		textureString = "Interface\\ChatFrame\\UI-ChatIcon-CallOfDutyVanguard";
 	else
 		textureString = "Interface\\ChatFrame\\UI-ChatIcon-Battlenet";
 	end
@@ -439,6 +442,8 @@ function BNet_GetClientTexture(client)
  		return "Interface\\FriendsFrame\\Battlenet-CrashBandicoot4icon";
  	elseif ( client == BNET_CLIENT_D2 ) then
  		return "Interface\\FriendsFrame\\Battlenet-DiabloIIResurrectedicon";
+ 	elseif ( client == BNET_CLIENT_COD_VANGUARD ) then
+ 		return "Interface\\FriendsFrame\\Battlenet-CallOfDutyVanguardicon";
 	else
 		return "Interface\\FriendsFrame\\Battlenet-Battleneticon";
 	end
diff --git a/Interface_TBC/FrameXML/FriendsFrame.lua b/Interface_TBC/FrameXML/FriendsFrame.lua
index 6ac03cb711..a10a876282 100644
--- a/Interface_TBC/FrameXML/FriendsFrame.lua
+++ b/Interface_TBC/FrameXML/FriendsFrame.lua
@@ -193,7 +193,7 @@ function FriendsFrame_ClickSummonButton (self)
 	end
 end
 
-function FriendsFrame_ShowDropdown(name, connected, lineID, chatType, chatFrame, friendsList, isMobile, communityClubID, communityStreamID, communityEpoch, communityPosition, guid)
+function FriendsFrame_ShowDropdown(name, connected, lineID, chatType, chatFrame, friendsList, isMobile, communityClubID, communityStreamID, communityEpoch, communityPosition, guid, whoIndex)
 	HideDropDownMenu(1);
 	if ( connected or friendsList ) then
 		if ( connected ) then
@@ -216,6 +216,7 @@ function FriendsFrame_ShowDropdown(name, connected, lineID, chatType, chatFrame,
 		FriendsDropDown.bnetIDAccount = nil;
 		FriendsDropDown.isMobile = isMobile;
 		FriendsDropDown.guid = guid;
+		FriendsDropDown.whoIndex = whoIndex;
 		ToggleDropDownMenu(1, nil, FriendsDropDown, "cursor");
 	end
 end
@@ -754,6 +755,12 @@ function WhoList_Update()
 		-- The WHO_LIST_UPDATE handler also clears it, but that event doesn't fire if the Who Frame isn't shown.
 		WhoFrame.selectedWho = nil;
 	end
+	-- If we're in the process of reporting someone from the Who Frame, back out since their index might change.
+	HideDropDownMenu(1);
+	if (PlayerReportFrame and PlayerReportFrame.playerLocation and PlayerReportFrame.playerLocation:IsWhoIndex()) then
+		PlayerReportFrame:CancelReport();
+	end
+
 	WhoFrame.numWhos = numWhos;
 
 	local name, guild, level, race, class, zone;
@@ -1087,7 +1094,7 @@ function FriendsFrameWhoButton_OnClick(self, button)
 		WhoList_Update();
 	else
 		local name = _G["WhoFrameButton"..self:GetID().."Name"]:GetText();
-		FriendsFrame_ShowDropdown(name, 1);
+		FriendsFrame_ShowDropdown(name, 1, nil, nil, nil, nil , nil, nil, nil, nil, nil , nil, _G["WhoFrameButton"..self:GetID()].whoIndex);
 	end
 end
 
diff --git a/Interface_TBC/FrameXML/Minimap.lua b/Interface_TBC/FrameXML/Minimap.lua
index 922f076068..8b8287bfcd 100644
--- a/Interface_TBC/FrameXML/Minimap.lua
+++ b/Interface_TBC/FrameXML/Minimap.lua
@@ -557,12 +557,6 @@ function BattlefieldFrame_UpdateStatus(tooltipOnly)
 				-- Have been accepted show enter battleground dialog
 				tooltip = format(BATTLEFIELD_QUEUE_CONFIRM, mapName, SecondsToTime(GetBattlefieldPortExpiration(i)));
 				if ( not tooltipOnly ) then
-
-					if (bgtype == "WARGAME") then
-						local dialog = StaticPopup_Show("CONFIRM_WARGAME_ENTRY", mapName, nil, i);
-					end
-
-					PlaySound(SOUNDKIT.PVP_THROUGH_QUEUE);
 					MiniMapBattlefieldFrame:Show();
 				end
 				showRightClickText = 1;
diff --git a/Interface_TBC/FrameXML/StaticPopup.lua b/Interface_TBC/FrameXML/StaticPopup.lua
index 12a9b73217..92379bee19 100644
--- a/Interface_TBC/FrameXML/StaticPopup.lua
+++ b/Interface_TBC/FrameXML/StaticPopup.lua
@@ -780,28 +780,6 @@ StaticPopupDialogs["CONFIRM_BATTLEFIELD_ENTRY"] = {
 	multiple = 1
 };
 
-StaticPopupDialogs["CONFIRM_WARGAME_ENTRY"] = {
-	text = CONFIRM_BATTLEFIELD_ENTRY,
-	button1 = ENTER_BATTLE,
-	button2 = LEAVE_QUEUE,
-	OnAccept = function(self, data)
-		if ( not AcceptBattlefieldPort(data, true) ) then
-			return 1;
-		end
-		if( StaticPopup_Visible( "DEATH" ) ) then
-			StaticPopup_Hide( "DEATH" );
-		end
-	end,
-	OnCancel = function(self, data)
-		AcceptBattlefieldPort(data,false);
-	end,
-	timeout = 0,
-	whileDead = 1,
-	noCancelOnReuse = 1,
-	noCancelOnEscape = 1,
-	multiple = 1
-};
-
 StaticPopupDialogs["BFMGR_CONFIRM_WORLD_PVP_QUEUED"] = {
 	text = WORLD_PVP_QUEUED,
 	button1 = OKAY,
diff --git a/Interface_TBC/FrameXML/UnitPopup.lua b/Interface_TBC/FrameXML/UnitPopup.lua
index 975a469298..a5a9a55895 100644
--- a/Interface_TBC/FrameXML/UnitPopup.lua
+++ b/Interface_TBC/FrameXML/UnitPopup.lua
@@ -686,6 +686,8 @@ local function UnitPopup_TryCreatePlayerLocation(menu, guid)
 		return PlayerLocation:CreateFromGUID(guid);
 	elseif menu.unit then
 		return PlayerLocation:CreateFromUnit(menu.unit);
+	elseif menu.whoIndex then
+		return PlayerLocation:CreateFromWhoIndex(menu.whoIndex);
 	end
 
 	return nil;
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/Bindings.xml b/Interface_Vanilla/AddOns/Blizzard_Commentator/Bindings.xml
deleted file mode 100644
index 47408c9166..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/Bindings.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-<Bindings>
-	<!-- Commentator Bindings -->	
-	<Binding name="COMMENTATORRESET" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ResetCommentator();
-	</Binding>
-
-	<Binding name="COMMENTATORMOVESPEEDINCREASE" header="COMMENTATORCAMERA" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ModifyCameraSpeed(1);
-	</Binding>
-	<Binding name="COMMENTATORMOVESPEEDDECREASE" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ModifyCameraSpeed(-1);
-	</Binding>
-	
-	<Binding name="COMMENTATORZOOMIN" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ZoomIn();
-	</Binding>
-	<Binding name="COMMENTATORZOOMOUT" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ZoomOut();
-	</Binding>
-	<Binding name="COMMENTATORRESETZOOM" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ResetFoVTarget();
-	</Binding>
-	<Binding name="TOGGLE_SMART_CAMERA" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetUseSmartCamera(not C_Commentator.IsUsingSmartCamera());
-	</Binding>
-	<Binding name="TOGGLE_SMART_CAMERA_LOCK" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetSmartCameraLocked(not C_Commentator.IsSmartCameraLocked());
-	</Binding>>
-
-	<Binding name="COMMENTATORLOOKATNONE" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ClearCameraTarget();
-	</Binding>
-	
-	
-	<Binding name="CYCLEFOLLOWTRANSITONSPEED" category="BINDING_HEADER_COMMENTATOR">
-		CycleFollowCameraTransitionPreset();
-	</Binding>
-	<Binding name="FORCEFOLLOWTRANSITON" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.ForceFollowTransition();
-	</Binding>
-	<Binding name="TOGGLESMOOTHFOLLOWTRANSITIONS" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetSmoothFollowTransitioning(not C_Commentator.GetSmoothFollowTransitioning());
-	</Binding>
-	<Binding name="TOGGLECAMERACOLLISION" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SetCameraCollision(not C_Commentator.GetCameraCollision());
-	</Binding>
-
-	
-	<Binding name="TEAM_1_ADD_SCORE" header="COMMENTATORSCORING" category="BINDING_HEADER_COMMENTATOR">
-		CommentatorTeamDisplay:AddScore(1)
-	</Binding>
-	<Binding name="TEAM_2_ADD_SCORE" category="BINDING_HEADER_COMMENTATOR">
-		CommentatorTeamDisplay:AddScore(2)
-	</Binding>
-	<Binding name="TEAM_1_REMOVE_SCORE" category="BINDING_HEADER_COMMENTATOR">
-		CommentatorTeamDisplay:RemoveScore(1)
-	</Binding>
-	<Binding name="TEAM_2_REMOVE_SCORE" category="BINDING_HEADER_COMMENTATOR">
-		CommentatorTeamDisplay:RemoveScore(2)
-	</Binding>
-	<Binding name="RESET_SCORE_COUNT" category="BINDING_HEADER_COMMENTATOR">
-		CommentatorTeamDisplay:ResetScore()
-	</Binding>
-	<Binding name="SWAPUNITFRAMES" category="BINDING_HEADER_COMMENTATOR">
-		C_Commentator.SwapTeamSides();
-		PvPCommentator:SetNeedsFullRefresh(true);
-		CommentatorTeamDisplay:RefreshPlayerNamesAndScores();
-	</Binding>
-	<Binding name="CHECK_FOR_SCOREBOARD" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:CheckScoreboard();
-	</Binding>
-	<Binding name="TOGGLE_COMMENTATOR_UNIT_FRAMES" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ToggleUnitFrames();
-	</Binding>
-	<Binding name="TOGGLE_FRAME_LOCK" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ToggleFrameLock();
-	</Binding>
-
-
-	<Binding name="COMMENTATORFOLLOW_1_1" header="COMMENTATORFOLLOW" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_2" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_3" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_4" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_5" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_6" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_7" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 7, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_8" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 8, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_9" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 9, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_10" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 10, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_11" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 11, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_12" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 12, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_13" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 13, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_14" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 14, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_15" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 15, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_1" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_2" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_3" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_4" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_5" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_6" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_7" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 7, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_8" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 8, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_9" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 9, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_10" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 10, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_11" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 11, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_12" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 12, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_13" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 13, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_14" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 14, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_15" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 15, TOURNAMENT_OBSERVE_PLAYER_PRIMARY);
-	</Binding>
-
-	<Binding name="COMMENTATORFOLLOW_1_1_SNAP" header="COMMENTATORFOLLOWSNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_2_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_3_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_4_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_5_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_6_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_7_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 7, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_8_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 8, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_9_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 9, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_10_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 10, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_11_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 11, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_12_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 12, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_13_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 13, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_14_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 14, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_1_15_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 15, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_1_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 1, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_2_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 2, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_3_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 3, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_4_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 4, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_5_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 5, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_6_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 6, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_7_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 7, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_8_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 8, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_9_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 9, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_10_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 10, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_11_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 11, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_12_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 12, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_13_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 13, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_14_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 14, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-	<Binding name="COMMENTATORFOLLOW_2_15_SNAP" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 15, TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP);
-	</Binding>
-
-	<Binding name="COMMENTATORLOOKAT_1_1" header="COMMENTATORLOOKAT" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 1, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_2" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 2, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_3" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 3, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_4" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 4, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_5" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 5, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_6" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 6, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_7" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 7, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_8" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 8, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_9" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 9, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_10" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 10, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_11" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 11, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_12" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 12, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_13" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 13, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_14" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 14, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_1_15" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(1, 15, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_1" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 1, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_2" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 2, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_3" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 3, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_4" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 4, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_5" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 5, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_6" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 6, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_7" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 7, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_8" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 8, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_9" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 9, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_10" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 10, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_11" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 11, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_12" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 12, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_13" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 13, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_14" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 14, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-	<Binding name="COMMENTATORLOOKAT_2_15" category="BINDING_HEADER_COMMENTATOR">
-		PvPCommentator:ObservePlayer(2, 15, TOURNAMENT_OBSERVE_PLAYER_SECONDARY);
-	</Binding>
-</Bindings>
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.lua b/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.lua
deleted file mode 100644
index 5cd85dd201..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-function CommentatorEventAlertsFrame_OnLoad(self)
-	RaidNotice_FadeInit(self.slot1);
-	RaidNotice_FadeInit(self.slot2);
-	self.timings = { };
-	self.timings["RAID_NOTICE_MIN_HEIGHT"] = 20.0;
-	self.timings["RAID_NOTICE_MAX_HEIGHT"] = 25.0;
-	self.timings["RAID_NOTICE_SCALE_UP_TIME"] = 0.2;
-	self.timings["RAID_NOTICE_SCALE_DOWN_TIME"] = 0.4;
-	
-	self:RegisterEvent("CHAT_MSG_BG_SYSTEM_ALLIANCE");
-	self:RegisterEvent("CHAT_MSG_BG_SYSTEM_HORDE");
-end
-
-function CommentatorEventAlertsFrame_OnEvent(self, event, ...)
-	if (event == "CHAT_MSG_BG_SYSTEM_ALLIANCE" or event == "CHAT_MSG_BG_SYSTEM_HORDE") then
-		local text = ...;
-		local info = ChatTypeInfo["BG_SYSTEM_NEUTRAL"]
-		if (event == "CHAT_MSG_BG_SYSTEM_ALLIANCE") then
-			info = ChatTypeInfo["BG_SYSTEM_ALLIANCE"]; 
-		elseif (event == "CHAT_MSG_BG_SYSTEM_HORDE") then
-			info = ChatTypeInfo["BG_SYSTEM_HORDE"]
-		end
-		local displayTime = 5;
-		RaidNotice_AddMessage( self, text, info, displayTime );
-	end
-end
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.xml b/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.xml
deleted file mode 100644
index ac9ab911ab..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorEventAlerts.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
-	<Script file="CommentatorEventAlerts.lua"/>
-
-	<Frame name="CommentatorEventAlertsFrameFrameTemplate" inherits="RaidBossEmoteFrameTemplate" hidden="true" virtual="true">
-		<Scripts>
-			<OnLoad function="CommentatorEventAlertsFrame_OnLoad"/>
-			<OnEvent function="CommentatorEventAlertsFrame_OnEvent"/>
-		</Scripts>
-	</Frame>
-
-	<Frame name="CommentatorEventAlertsFrame" inherits="CommentatorEventAlertsFrameFrameTemplate" parent="UIParent" frameStrata="HIGH" toplevel="true">
-		<Anchors>
-			<Anchor point="TOP" relativeTo="UIWidgetTopCenterContainerFrame" relativePoint="BOTTOM" x="0" y="-10"/>
-		</Anchors>
-	</Frame>
-</Ui>
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua b/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua
deleted file mode 100644
index 08f3b18ae6..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-
-local COMMENTATOR_VICTORY_FANFARE_MODEL_SCENE_ID = 59;
-local COMMENTATOR_VICTORY_FANFARE_EFFECT_MODEL_ID = 382335;--"SPELLS\\EASTERN_PLAGUELANDS_BEAM_EFFECT.M2";
-
-CommentatorVictoryFanfareFrameMixin = {};
-
-function CommentatorVictoryFanfareFrameMixin:OnLoad()
-	self:RegisterEvent("PLAYER_ENTERING_WORLD");
-	self.BackgroundModelScene:SetFromModelSceneID(COMMENTATOR_VICTORY_FANFARE_MODEL_SCENE_ID, true);
-	
-	local effect = self.BackgroundModelScene:GetActorByTag("effect");
-	if effect then
-		effect:SetModelByFileID(COMMENTATOR_VICTORY_FANFARE_EFFECT_MODEL_ID);
-		effect:SetAlpha(0.0);
-		self.BackgroundModelScene.effect = effect;
-	end
-	
-	local effect2 = self.BackgroundModelScene:GetActorByTag("effect2");
-	if effect2 then
-		effect2:SetModelByFileID(COMMENTATOR_VICTORY_FANFARE_EFFECT_MODEL_ID);
-		effect2:SetAlpha(0.0);
-		self.BackgroundModelScene.effect2 = effect2;
-	end
-	
-	self.BG1:SetWidth(GetScreenWidth() * 0.8);
-	self.BG1:SetHeight(2);
-	
-	self.BG2:SetWidth(GetScreenWidth() * 0.8);
-	self.BG2:SetHeight(2);
-
-end
-
-function CommentatorVictoryFanfareFrameMixin:OnEvent(event)
-	if event == "PLAYER_ENTERING_WORLD" then
-		self:Reset();
-		self:Hide();
-	end
-end
-
-function CommentatorVictoryFanfareFrameMixin:PlayVictoryFanfare(text, team)
-	self.Title:SetText(text);
-	self.TitleFlash:SetText(text);
-	self.TeamName:SetText(team);
-	self.TeamNameFlash:SetText(team);
-
-	self:Reset();
-	self.Anim:Play();
-	
-	C_Timer.After(1.5, function()
-		self.BackgroundModelScene.EffectAnimIn:Play();
-		self.BackgroundModelScene:Show();
-	end);
-	
-	C_Timer.After(5.0, function()
-		self.ExitArenaButton:Show();
-	end);
-end
-
-function CommentatorVictoryFanfareFrameMixin:Reset()
-	self.Icon:SetAlpha(0);
-	self.Icon2:SetAlpha(0);
-	self.Icon3:SetAlpha(0);
-	self.BackgroundModelScene:Hide();
-	self.Anim:Stop();
-	self.ExitArenaButton:Hide();
-end
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml b/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml
deleted file mode 100644
index b50c351c02..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/CommentatorVictoryFanfare.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
-
-	<Script file="CommentatorVictoryFanfare.lua"/>
-	
-	<Frame name="CommentatorVictoryFanfareFrame" hidden="true" parent="UIParent" mixin="CommentatorVictoryFanfareFrameMixin">
-		<Size x="600" y="300"/>
-		<Anchors>
-			<Anchor point="TOP" x="0" y="-170"/>
-		</Anchors>
-		<Frames>
-			<ModelScene parentKey="BackgroundModelScene" enableMouse="false" inherits="NonInteractableModelSceneMixinTemplate">
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="UIParent"/>
-					<Anchor point="BOTTOMRIGHT" relativeTo="UIParent"/>
-				</Anchors>
-				<Animations>
-					<AnimationGroup parentKey="EffectAnimIn" setToFinalAlpha="true">
-						<Alpha childKey="effect" duration="0.5" order="1" fromAlpha="0" toAlpha="1"/>
-						<Alpha childKey="effect2" duration="0.5" order="1" fromAlpha="0" toAlpha="1"/>
-					</AnimationGroup>
-				</Animations>
-			</ModelScene>
-			<Button parentKey="ExitArenaButton" frameStrata="TOOLTIP">
-				<Size x="32" y="32" />
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="UIParent" />
-					<Anchor point="BOTTOMRIGHT" relativeTo="UIParent" />
-				</Anchors>
-				<Scripts>
-					<OnClick>
-						PvPCommentator:ExitInstance();
-					</OnClick>
-				</Scripts>
-			</Button>
-		</Frames>
-		<Layers>
-			<Layer level="BACKGROUND">
-				<Texture parentKey="Icon" hidden="false" alpha="0" alphaMode="BLEND" atlas="bonusobjectives-title-icon-honor" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" x="0" y="-9"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="1">
-				<Texture parentKey="Icon2" hidden="false" alpha="0" alphaMode="ADD" atlas="bonusobjectives-title-icon-honor" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="2">
-				<Texture parentKey="Icon3" hidden="false" alpha="0" alphaMode="ADD" atlas="bonusobjectives-title-icon-honor" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BORDER">
-				<Texture parentKey="BG1" hidden="false" alpha="0" alphaMode="BLEND" atlas="tournamentarena-winnerline" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BORDER" textureSubLevel="1">
-				<Texture parentKey="BG2" hidden="false" alpha="0" alphaMode="ADD" atlas="tournamentarena-winnerline" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="ARTWORK">
-				<FontString parentKey="Title" inherits="CommentatorVictoryFanfare" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="80"/>
-					</Anchors>
-					<Color r="1" g="0.82" b="0"/>
-				</FontString>
-				<FontString parentKey="TitleFlash" inherits="Game120Font" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="80"/>
-					</Anchors>
-					<Color r="1" g="1" b="1"/>
-				</FontString>
-				<FontString parentKey="TeamName" inherits="CommentatorVictoryFanfareTeam" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="-80"/>
-					</Anchors>
-					<Color r="1" g="0.82" b="0"/>
-				</FontString>
-				<FontString parentKey="TeamNameFlash" inherits="CommentatorVictoryFanfareTeam" alpha="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.BG1" x="0" y="-80"/>
-					</Anchors>
-					<Color r="1" g="1" b="1"/>
-				</FontString>
-				<FontString parentKey="BonusLabel" inherits="GameFontHighlightLarge" alpha="0">
-					<Anchors>
-						<Anchor point="TOP" relativeKey="$parent.Title" relativePoint="BOTTOM" x="0" y="-7"/>
-					</Anchors>
-				</FontString>
-			</Layer>
-			<Layer level="BACKGROUND">
-				<Texture parentKey="Starglow" hidden="false" alpha="0" alphaMode="BLEND" atlas="titleprestige-starglow">
-					<Size x="800" y="500"/>
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon" x="0" y="2"/>
-					</Anchors>
-				</Texture>
-				<Texture parentKey="Starglow3" hidden="false" alpha="0" alphaMode="BLEND" atlas="titleprestige-starglow">
-					<Size x="600" y="500"/>
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Starglow" x="0" y="2"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="1">
-				<Texture parentKey="Starglow2" hidden="false" alpha="0" alphaMode="ADD" atlas="titleprestige-starglow" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Starglow"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-			<Layer level="ARTWORK" textureSubLevel="-3">
-				<Texture parentKey="Glowcover" hidden="false" alpha="0" alphaMode="ADD" atlas="titleprestige-glowcover" useAtlasSize="true">
-					<Anchors>
-						<Anchor point="CENTER" relativeKey="$parent.Icon" x="0" y="7"/>
-					</Anchors>
-				</Texture>
-			</Layer>
-		</Layers>
-		<Animations>
-			<AnimationGroup parentKey="Anim" setToFinalAlpha="true">
-				<Scale childKey="BG1" duration="0.33" order="1" fromScaleX="0.001" fromScaleY="1" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="BG1" duration="0.01" order="1" fromAlpha="0" toAlpha="1"/>
-				<Scale childKey="BG2" duration="0.33" order="1" fromScaleX="0.001" fromScaleY="1" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="BG2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="BG2" startDelay="0.33" smoothing="IN" duration="0.33" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Title" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="BonusLabel" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="TitleFlash" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="TitleFlash" startDelay="0.33" smoothing="IN" duration="0.33" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Icon" startDelay="1.2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Scale childKey="Icon" startDelay="1.2" smoothing="IN" duration="0.33" order="1" fromScaleX="3.4" fromScaleY="3.4" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="Icon2" startDelay="1.2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="Icon2" startDelay="1.53" smoothing="IN" duration="0.33" order="1" fromAlpha="1" toAlpha="0"/>
-				<Scale childKey="Icon2" startDelay="1.2" smoothing="IN" duration="0.33" order="1" fromScaleX="3.4" fromScaleY="3.4" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="Icon3" startDelay="1.2" duration="0.33" order="1" fromAlpha="0" toAlpha="0.35"/>
-				<Alpha childKey="Icon3" startDelay="1.53" smoothing="IN" duration="0.33" order="1" fromAlpha="0.35" toAlpha="0"/>
-				<Scale childKey="Icon3" startDelay="1.2" smoothing="IN" duration="0.33" order="1" fromScaleX="4.8" fromScaleY="4.8" toScaleX="1" toScaleY="1"/>
-				<Alpha childKey="Starglow2" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Rotation childKey="Starglow2" duration="1.5" order="1" degrees="30"/>
-				<Alpha childKey="Starglow3" duration="0.33" order="1" fromAlpha="0" toAlpha="0.3"/>
-				<Alpha childKey="Glowcover" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="Starglow" duration="0.33" order="1" fromAlpha="0" toAlpha="1"/>
-				<Alpha childKey="Starglow" startDelay="0.33" duration="0.33" order="1" fromAlpha="1" toAlpha="1.0"/>
-				<Alpha childKey="Starglow" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Starglow2" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Starglow3" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Alpha childKey="Glowcover" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromAlpha="1" toAlpha="0"/>
-				<Scale childKey="Starglow" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-				<Scale childKey="Starglow2" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-				<Scale childKey="Starglow3" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-				<Scale childKey="Glowcover" startDelay="1.0" smoothing="IN" duration="0.46" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.55" toScaleY="0.55"/>
-			</AnimationGroup>
-		</Animations>
-		<Scripts>
-			<OnLoad method="OnLoad"/>
-			<OnEvent method="OnEvent"/>
-		</Scripts>
-	</Frame>
-
-</Ui>
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.lua b/Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.lua
deleted file mode 100644
index 674fe33c99..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.lua
+++ /dev/null
@@ -1,630 +0,0 @@
-
-local ADDON_NAME = ...;
-
-TOURNAMENT_OBSERVE_PLAYER_PRIMARY = 1;
-TOURNAMENT_OBSERVE_PLAYER_SECONDARY = 2;
-TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP = 3;
-
-local TOURNAMENTARENA_ZONESTATE_SCANNING = "scanning";					-- [ Waiting to join a match ] --
-local TOURNAMENTARENA_ZONESTATE_TRANSFERRING_IN = "transferring_in";		-- [ Joining a match ] --
-local TOURNAMENTARENA_ZONESTATE_TRANSFERRING_OUT = "transferring_out";	-- [ Leaving a match ] --
-local TOURNAMENTARENA_ZONESTATE_PREMATCH = "prematch";					-- [ In a match that hasn't started ] --
-local TOURNAMENTARENA_ZONESTATE_OBSERVING = "observing";					-- [ In a match that has started] --
-local TOURNAMENTARENA_ZONESTATE_SCOREBOARD = "scoreboard";				-- [ Match is over, at the scoreboard ] --
-local TOURNAMENTARENA_ZONESTATE_RESETTING = "resetting";					-- [ A reset was requested, determining the appropriate state to be in ] --
-
-local MAX_PLAYERS_FOR_STANDARD = 3;
-local MAX_PLAYERS_FOR_COMPACT = 6;
-local MAX_PLAYERS_FOR_VERY_COMPACT = 10;
-
-local followCameraTransitionSpeedPresets = {
-	{ 0.05, 20.0 },
-	{ 0.10, 30.0 },
-	{ 0.03, 15.0 },
-}
-
-local TournamentObserverCurrentFollowCameraPreset = 1;
-function SetFollowCameraTransitionPreset(index)
-	C_Commentator.SetFollowCameraSpeeds(unpack(followCameraTransitionSpeedPresets[index]));
-	TournamentObserverCurrentFollowCameraPreset = index;
-end
-
-function CycleFollowCameraTransitionPreset(index)
-	TournamentObserverCurrentFollowCameraPreset = TournamentObserverCurrentFollowCameraPreset + 1;
-	if TournamentObserverCurrentFollowCameraPreset > #followCameraTransitionSpeedPresets then
-		TournamentObserverCurrentFollowCameraPreset = 1;
-	end
-	
-	C_Commentator.SetFollowCameraSpeeds(unpack(followCameraTransitionSpeedPresets[TournamentObserverCurrentFollowCameraPreset]));
-end
-
-function SetSpectatorModeForOtherFrames(spectatorMode)
-	if (UIWidgetTopCenterContainerFrame) then
-		UIWidgetTopCenterContainerFrame:SetSpectatorMode(spectatorMode, CommentatorTeamDisplay);
-	end
-	if (BattlefieldMapFrame) then
-		BattlefieldMapFrame:SetSpectatorMode(spectatorMode);
-	end
-end
-
-PvPCommentatorMixin = {};
-
-function PvPCommentatorMixin:OnLoad()
-	self.cameraMoveSpeed = 7;
-
-	self.unitFrames = {};
-	self.sortedUnitFrames = {};
-	self.showUnitFrames = true;
-	local TEAM_POSITIONS = { "left", "right", };
-
-	for teamIndex = 1, C_Commentator.GetMaxNumTeams() do
-		self.unitFrames[teamIndex] = {};
-		
-		for playerIndex = 1, C_Commentator.GetMaxNumPlayersPerTeam() do
-			local newFrame = CreateFrame("FRAME", nil, WorldFrame, "CommentatorUnitFrameTemplate");
-			newFrame:Initialize(TEAM_POSITIONS[teamIndex]);
-			self.unitFrames[teamIndex][playerIndex] = newFrame;
-		end
-	end
-	
-	self:RegisterEvent("COMMENTATOR_ENTER_WORLD");
-	self:RegisterEvent("COMMENTATOR_PLAYER_UPDATE");
-	self:RegisterEvent("COMMENTATOR_PLAYER_NAME_OVERRIDE_UPDATE");
-
-	self:RegisterEvent("PLAYER_ENTERING_WORLD");
-	self:RegisterEvent("PLAYER_LEAVING_WORLD");
-
-	self:RefreshTeamFrameLayout();
-
-	self.state = TOURNAMENTARENA_ZONESTATE_SCANNING;
-	self:CheckObserverState();
-	
-	SetFollowCameraTransitionPreset(1);
-end
-
-function PvPCommentatorMixin:ObservePlayer(teamIndex, playerIndex, observationType)
-	local unitFrame = self.sortedUnitFrames[teamIndex] and self.sortedUnitFrames[teamIndex][playerIndex];
-	if unitFrame and unitFrame:IsValid() then
-		teamIndex, playerIndex = unitFrame:GetTeamAndPlayer();
-
-		if C_Commentator.IsUsingSmartCamera() then
-			if observationType == TOURNAMENT_OBSERVE_PLAYER_PRIMARY then
-				C_Commentator.LookAtPlayer(teamIndex, playerIndex, 1);
-			
-			-- There are three modes for the follow came and only two for smart cam so TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP is the same as TOURNAMENT_OBSERVE_PLAYER_SECONDARY.
-			elseif observationType == TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP or observationType == TOURNAMENT_OBSERVE_PLAYER_SECONDARY then
-				C_Commentator.LookAtPlayer(teamIndex, playerIndex, 2);
-			end
-		else
-			if observationType == TOURNAMENT_OBSERVE_PLAYER_PRIMARY then
-				C_Commentator.FollowPlayer(teamIndex, playerIndex);
-			elseif observationType == TOURNAMENT_OBSERVE_PLAYER_SECONDARY then
-				C_Commentator.LookAtPlayer(teamIndex, playerIndex);
-			elseif observationType == TOURNAMENT_OBSERVE_PLAYER_PRIMARY_SNAP then
-				C_Commentator.FollowPlayer(teamIndex, playerIndex, true);
-			end
-		end
-	end
-end
-
-function PvPCommentatorMixin:ModifyCameraSpeed(speed)
-	self.cameraMoveSpeed = math.max(math.min(40, self.cameraMoveSpeed + speed), 1);
-	C_Commentator.SetMoveSpeed(self.cameraMoveSpeed);
-end
-
-function PvPCommentatorMixin:ResetCommentator()	
-	if C_Commentator.IsSpectating() then
-		self:SetObserverState(TOURNAMENTARENA_ZONESTATE_RESETTING);
-	else
-		CommentatorFadeToBlackFrame:Stop();
-		CommentatorTeamDisplay:Hide();
-		self:SetAllUnitFramesVisibilityState(false);
-		self:SetFrameLock(false);
-		SetSpectatorModeForOtherFrames(false);
-		self.state = TOURNAMENTARENA_ZONESTATE_SCANNING;
-	end
-end
-
-function PvPCommentatorMixin:SetFrameLock(enabled)
-	if enabled then
-		C_Commentator.SetMouseDisabled(true);
-		AddFrameLock("COMMENTATOR_SPECTATING_MODE");
-	else
-		C_Commentator.SetMouseDisabled(false);
-		RemoveFrameLock("COMMENTATOR_SPECTATING_MODE");
-	end
-end
-
-function PvPCommentatorMixin:ToggleUnitFrames()
-	self.showUnitFrames = not self.showUnitFrames;
-	self:RefreshTeamFrameLayout();
-end
-
-function PvPCommentatorMixin:ToggleFrameLock()
-	if IsFrameLockActive("COMMENTATOR_SPECTATING_MODE") then
-		self:SetFrameLock(false);
-	else
-		self:SetFrameLock(true);
-	end
-end
-
-function PvPCommentatorMixin:SetDefaultBindings()
-	SetBinding("\\", "TOGGLEGAMEMENU");
-
-	SetBinding("]", "COMMENTATORMOVESPEEDINCREASE");
-	SetBinding("[", "COMMENTATORMOVESPEEDDECREASE");
-	
-	SetBinding("MOUSEWHEELUP", "COMMENTATORZOOMIN");
-	SetBinding("MOUSEWHEELDOWN", "COMMENTATORZOOMOUT");
-
-	SetBinding("ESCAPE", "COMMENTATORLOOKATNONE");
-	
-	SetBinding("F1",		"COMMENTATORFOLLOW_1_1");
-	SetBinding("F2",		"COMMENTATORFOLLOW_1_2");
-	SetBinding("F3",		"COMMENTATORFOLLOW_1_3");
-	SetBinding("F4",		"COMMENTATORFOLLOW_1_4");
-	SetBinding("F5",		"COMMENTATORFOLLOW_1_5");
-	SetBinding("F6",		"COMMENTATORFOLLOW_1_6");
-	SetBinding("F7",		"COMMENTATORFOLLOW_2_1");
-	SetBinding("F8",		"COMMENTATORFOLLOW_2_2");
-	SetBinding("F9",		"COMMENTATORFOLLOW_2_3");
-	SetBinding("F10",		"COMMENTATORFOLLOW_2_4");
-	SetBinding("F11",		"COMMENTATORFOLLOW_2_5");
-	SetBinding("F12",		"COMMENTATORFOLLOW_2_6");
-	
-	SetBinding("1",			"COMMENTATORFOLLOW_1_1_SNAP");
-	SetBinding("2",			"COMMENTATORFOLLOW_1_2_SNAP");
-	SetBinding("3",			"COMMENTATORFOLLOW_1_3_SNAP");
-	SetBinding("4",			"COMMENTATORFOLLOW_1_4_SNAP");
-	SetBinding("5",			"COMMENTATORFOLLOW_1_5_SNAP");
-	SetBinding("6",			"COMMENTATORFOLLOW_1_6_SNAP");
-	SetBinding("7",			"COMMENTATORFOLLOW_2_1_SNAP");
-	SetBinding("8",			"COMMENTATORFOLLOW_2_2_SNAP");
-	SetBinding("9",			"COMMENTATORFOLLOW_2_3_SNAP");
-	SetBinding("0",			"COMMENTATORFOLLOW_2_4_SNAP");
-	SetBinding("-",			"COMMENTATORFOLLOW_2_5_SNAP");
-	SetBinding("=",			"COMMENTATORFOLLOW_2_6_SNAP");
-	
-	SetBinding("CTRL-SHIFT-R", "COMMENTATORRESET");
-	
-	SetBinding(",", "TEAM_1_ADD_SCORE");
-	SetBinding(".", "TEAM_2_ADD_SCORE");
-	SetBinding("SHIFT-,", "TEAM_1_REMOVE_SCORE");
-	SetBinding("SHIFT-.", "TEAM_2_REMOVE_SCORE");
-	SetBinding("U", "RESET_SCORE_COUNT");
-	SetBinding("/", "SWAPUNITFRAMES");
-	
-	SetBinding("TAB", "TOGGLE_SMART_CAMERA");
-	
-	SetBinding("N", "TOGGLE_CASTER_COOLDOWN_DISPLAY");
-	SetBinding("CTRL-SHIFT-N", "CHECK_FOR_SCOREBOARD");
-	SetBinding("SHIFT-N", "TOGGLE_NAMEPLATE_SIZE");
-	
-	SetBinding("CAPSLOCK", "TOGGLE_SMART_CAMERA_LOCK");
-
-	SetBinding("SHIFT-SPACE", nil);
-	
-	SetBinding("F", "FORCEFOLLOWTRANSITON");
-	SetBinding("T", "TOGGLESMOOTHFOLLOWTRANSITIONS");
-	SetBinding("C", "TOGGLECAMERACOLLISION");
-	SetBinding("V", "CYCLEFOLLOWTRANSITONSPEED");
-
-	SetBinding("M", "TOGGLEBATTLEFIELDMINIMAP");
-	SetBinding("B", "TOGGLEWORLDSTATESCORES");
-	SetBinding("L", "TOGGLE_COMMENTATOR_UNIT_FRAMES");
-
-	AttemptToSaveBindings(GetCurrentBindingSet());
-end
-
-function PvPCommentatorMixin:SetNeedsFullRefresh(needed)
-	self.needsFullRefresh = needed;
-end
-
-function PvPCommentatorMixin:NeedsFullRefresh()
-	return self.needsFullRefresh;
-end
-
-function PvPCommentatorMixin:IsCompact()
-	return self.compactLevel >= COMMENTATOR_UNIT_FRAME_COMPACT;
-end
-
-function PvPCommentatorMixin:IsVeryCompact()
-	return self.compactLevel >= COMMENTATOR_UNIT_FRAME_VERY_COMPACT;
-end
-
-function PvPCommentatorMixin:IsExtremelyCompact()
-	return self.compactLevel >= COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT;
-end
-
-function PvPCommentatorMixin:OnUpdate(elapsed)
-	if not IsPlayerInWorld() then return end
-	
-	if self:NeedsFullRefresh() then
-		self:FullPlayerRefresh();
-	end
-	
-	self:CheckObserverState();
-	self:LayoutTeamFrames();
-
-
-	self.targetSpeedFactor = IsShiftKeyDown() and 2.0 or 1.0;
-	self.currentSpeedFactor = DeltaLerp(self.currentSpeedFactor or 1.0, self.targetSpeedFactor, .05, elapsed);
-	C_Commentator.SetSpeedFactor(self.currentSpeedFactor);
-
-	-- We need to always keep UI visibility on as this controls whether nameplates are visible, however commands like TOGGLEUI (Alt+Z) 
-	-- might turn this off if commentators need to briefly enable the default UI to adjust something and then hide it
-		-- "SetInWorldUIVisibility" is a new function that enables nameplates, etc. but doesn't affect the actual UI frames
-	SetInWorldUIVisibility(true);
-end
-
-function PvPCommentatorMixin:SetDefaultCommentatorSettings()
-	self:SetDefaultBindings();
-	self:SetDefaultCVars();
-end
-
-function PvPCommentatorMixin:SetDefaultCVars()
-	SetCVar("UnitNameFriendlyPlayerName", 1);
-	SetCVar("UnitNameFriendlyPetName", 1);
-	SetCVar("UnitNameFriendlyGuardianName", 0);
-	SetCVar("UnitNameFriendlyTotemName", 0);
-	
-	SetCVar("UnitNameEnemyPlayerName", 1);
-	SetCVar("UnitNameEnemyPetName", 0);
-	SetCVar("UnitNameEnemyGuardianName", 0);
-	SetCVar("UnitNameEnemyTotemName", 0);
-
-	SetCVar("Sound_ListenerAtCharacter", 0);
-
-	SetCVar("nameplateShowEnemies", 1);
-	SetCVar("nameplateShowEnemyPets", 1);
-	SetCVar("nameplateShowEnemyGuardians", 0);
-	SetCVar("nameplateShowEnemyTotems", 0);
-	SetCVar("nameplateShowEnemyMinus", 0);
-	SetCVar("nameplateShowFriends", 1);
-	SetCVar("nameplateShowFriendlyPets", 0);
-	SetCVar("nameplateShowFriendlyGuardians", 0);
-	SetCVar("nameplateShowFriendlyTotems", 0);
-
-	SetCVar("nameplateSelectedScale", 1.5);
-	SetCVar("nameplateShowAll", 1);
-
-	-- See InterfaceOptionsNPCNamesDropDown, we want these all off.
-	-- SetCVar("UnitNameFriendlySpecialNPCName", 0);	-- CVar removed in Classic 7.3.5
-	-- SetCVar("UnitNameHostleNPC", 0);					-- CVar removed in Classic 7.3.5
-	-- SetCVar("UnitNameInteractiveNPC", 0);			-- CVar removed in Classic 7.3.5
-	SetCVar("UnitNameNPC", 0);
-	
-	SetCVar("nameplateMotion", 0);
-		
-	SetCVar("showVKeyCastbar", 0);
-	
-	SetCVar("deselectOnClick", 1);
-
-	SetCVar("maxfpsbk", 0);
-
-	SetCVar("showSpectatorTeamCircles", 1);
-	
-	SetCVar("ShowClassColorInNameplate", "1");
-	SetCVar("ShowClassColorInFriendlyNameplate", "1");
-	
-	SetCVar("nameplateMinAlpha", ".75");
-	
-	SetCVar("nameplateOccludedAlphaMult", "1.0");
-	SetCVar("UnitNamePlayerGuild", "0");
-	SetCVar("UnitNameEnemyMinionName", "0");
-	SetCVar("UnitNameFriendlyMinionName", "0");
-	
-	SetCVar("chatStyle", "classic");
-
-	SetCVar("colorNameplateNameBySelection", 1);
-end
-
-function PvPCommentatorMixin:OnEvent(event, ...)
-	if event == "COMMENTATOR_ENTER_WORLD" then
-		local mapID = select(8, GetInstanceInfo());
-		local pos = C_Commentator.GetStartLocation(mapID);
-		if pos then
-			CommentatorFadeToBlackFrame:ReverseStart();
-			local SNAP_TO_POSITION = true;
-			C_Commentator.SetUseSmartCamera(true);
-			C_Commentator.SetSmartCameraLocked(false);
-			C_Commentator.SetCameraPosition(pos.x, pos.y, pos.z, SNAP_TO_POSITION);
-			C_Commentator.SnapCameraLookAtPoint();
-		end
-	elseif event == "COMMENTATOR_PLAYER_UPDATE" then
-		self:FullPlayerRefresh();
-	elseif event == "COMMENTATOR_PLAYER_NAME_OVERRIDE_UPDATE" then
-		self:FullPlayerRefresh();
-	elseif event == "PLAYER_ENTERING_WORLD" then
-		self:ResetCommentator();
-	elseif event == "PLAYER_LEAVING_WORLD" then
-		self:SetNeedsFullRefresh(true);
-	end
-end
-
-function PvPCommentatorMixin:ExitInstance()
-	if C_Commentator.CanUseCommentatorCheats() then
-		C_Commentator.ExitInstance();
-	else
-		ConfirmOrLeaveBattlefield();
-	end
-end
-
-do
-	local function UnitFrameComparator(left, right)
-		if left:IsValid() and right:IsValid() then
-			local leftRole = left:GetRole();
-			local rightRole = right:GetRole();
-			if leftRole ~= rightRole then
-				if leftRole == "HEALER" then
-					return true;
-				elseif rightRole == "HEALER" then
-					return false;
-				end
-
-				if leftRole == "TANK" then
-					return true;
-				elseif rightRole == "TANK" then
-					return false;
-				end
-			end
-
-			return strcmputf8i(left:GetPlayerName(), right:GetPlayerName()) < 0;
-		end
-		return left:IsValid();
-	end
-
-	function PvPCommentatorMixin:EnumerateSortedUnitFrames(teamIndex)
-		if not self.sortedUnitFrames[teamIndex] then
-			self.sortedUnitFrames[teamIndex] = {};
-
-			for playerIndex = 1, #self.unitFrames[teamIndex] do
-				self.sortedUnitFrames[teamIndex][playerIndex] = self.unitFrames[teamIndex][playerIndex];
-			end
-
-			table.sort(self.sortedUnitFrames[teamIndex], UnitFrameComparator);
-		end
-		
-		return ipairs(self.sortedUnitFrames[teamIndex]);
-	end
-end
-
-function PvPCommentatorMixin:LayoutTeamFrames()
-	if not self.needsFullFrameLayout then return end
-	self.needsFullFrameLayout = false;
-
-	local Y_START = self:IsVeryCompact() and -2 or self:IsCompact() and -50 or -25;
-	local Y_PADDING = self:IsExtremelyCompact() and -63 or self:IsVeryCompact() and -94 or self:IsCompact() and -145 or -230;
-	local X_OFFSET = self:IsExtremelyCompact() and 5 or self:IsVeryCompact() and 10 or 20;
-
-	for teamIndex = 1, #self.unitFrames do
-		local offsetY = Y_START;
-		local paddingY = Y_PADDING;
-		local offsetX = X_OFFSET;
-		local paddingX = 0;
-		for sortedIndex, unitFrame in self:EnumerateSortedUnitFrames(teamIndex) do
-			if (self.showUnitFrames) then
-				unitFrame:ClearAllPoints();
-
-				if unitFrame:IsValid() then
-					-- If we get over 15 frames, show 2 columns.
-					-- (There needs to be some cleanup to get this actually looking decent.)
-					if (self:IsExtremelyCompact()) then
-						if (sortedIndex == 16) then
-							offsetY = Y_START;
-							paddingY = Y_PADDING;
-							offsetX = X_OFFSET + 170;
-							paddingX = 0;
-						end
-					end
-
-					local newYOffset = offsetY + unitFrame:GetAdditionalYSpacing();
-			
-					if unitFrame.align == "right" then
-						unitFrame:SetPoint("TOPRIGHT", WorldFrame, -offsetX, newYOffset);
-					else
-						unitFrame:SetPoint("TOPLEFT", WorldFrame, offsetX, newYOffset);
-					end
-
-					offsetY = offsetY + paddingY;
-					offsetX = offsetX + paddingX;
-
-					unitFrame:Show();
-				end
-			else
-				unitFrame:Hide();
-			end
-		end
-	end
-end
-
-function PvPCommentatorMixin:RefreshTeamFrameLayout()
-	self.needsFullFrameLayout = true;
-end
-
-function PvPCommentatorMixin:FullPlayerRefresh()
-	self:SetNeedsFullRefresh(false);
-	
-	self.sortedUnitFrames = {};
-	local maxPlayersPerTeam = 0;
-
-	for teamIndex = 1, #self.unitFrames do
-		local playersOnTeam = 0;
-		for playerIndex = 1, #self.unitFrames[teamIndex] do
-			C_Commentator.RequestPlayerCooldownInfo(teamIndex, playerIndex);
-			local unitFrame = self.unitFrames[teamIndex][playerIndex];
-			unitFrame:SetTeamAndPlayer(teamIndex, playerIndex);
-			if unitFrame:IsValid() then
-				playersOnTeam = playersOnTeam + 1;
-			end
-		end
-
-		maxPlayersPerTeam = math.max(playersOnTeam, maxPlayersPerTeam);
-	end
-
-	if (maxPlayersPerTeam > MAX_PLAYERS_FOR_STANDARD) then
-		if (maxPlayersPerTeam > MAX_PLAYERS_FOR_COMPACT) then
-			if (maxPlayersPerTeam > MAX_PLAYERS_FOR_VERY_COMPACT) then
-				self.compactLevel = COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT;
-			else
-				self.compactLevel = COMMENTATOR_UNIT_FRAME_VERY_COMPACT;
-			end
-		else
-			self.compactLevel = COMMENTATOR_UNIT_FRAME_COMPACT;
-		end
-	else
-		self.compactLevel = COMMENTATOR_UNIT_FRAME_STANDARD;
-	end
-	
-	for teamIndex = 1, #self.unitFrames do
-		for playerIndex = 1, #self.unitFrames[teamIndex] do
-			self.unitFrames[teamIndex][playerIndex]:SetCompact(self.compactLevel);
-		end
-	end
-	
-	self:RefreshTeamFrameLayout();
-end
-
-function PvPCommentatorMixin:InvalidateAllPlayers()
-	self.sortedUnitFrames = {};
-
-	for teamIndex = 1, #self.unitFrames do
-		for playerIndex = 1, #self.unitFrames[teamIndex] do
-			self.unitFrames[teamIndex][playerIndex]:Invalidate();
-		end
-	end
-	
-	self:RefreshTeamFrameLayout();
-end
-
-function PvPCommentatorMixin:SetAllUnitFramesVisibilityState(visible)
-	for teamIndex = 1, #self.unitFrames do
-		for playerIndex = 1, #self.unitFrames[teamIndex] do
-			self.unitFrames[teamIndex][playerIndex]:SetVisibility(visible);
-		end
-	end
-end
-
-function PvPCommentatorMixin:CheckObserverState()
-	local isSpectating = C_Commentator.IsSpectating();
-
-	if self.state == TOURNAMENTARENA_ZONESTATE_TRANSFERRING_IN then
-		if isSpectating then
-			self:SetObserverState(TOURNAMENTARENA_ZONESTATE_PREMATCH);
-		end
-	elseif self.state == TOURNAMENTARENA_ZONESTATE_TRANSFERRING_OUT then
-		if not isSpectating then
-			self:SetObserverState(TOURNAMENTARENA_ZONESTATE_SCANNING);
-		end
-	elseif self.state == TOURNAMENTARENA_ZONESTATE_SCANNING then
-		if isSpectating then
-			if C_Commentator.GetTimeLeftInMatch() then
-				self:SetObserverState(TOURNAMENTARENA_ZONESTATE_OBSERVING);
-			else
-				self:SetObserverState(TOURNAMENTARENA_ZONESTATE_PREMATCH);
-			end
-		end
-	elseif self.state == TOURNAMENTARENA_ZONESTATE_PREMATCH then
-		if isSpectating then
-			if C_Commentator.GetTimeLeftInMatch() then
-				self:SetObserverState(TOURNAMENTARENA_ZONESTATE_OBSERVING);
-			end
-		else
-			self:SetObserverState(TOURNAMENTARENA_ZONESTATE_SCANNING);
-		end
-	elseif self.state == TOURNAMENTARENA_ZONESTATE_OBSERVING then
-		if not isSpectating then
-			self:SetObserverState(TOURNAMENTARENA_ZONESTATE_SCANNING);
-		end
-	elseif self.state == TOURNAMENTARENA_ZONESTATE_RESETTING then
-		if isSpectating then
-			C_Commentator.ResetFoVTarget();
-			if C_Commentator.GetTimeLeftInMatch() then
-				self:SetObserverState(TOURNAMENTARENA_ZONESTATE_OBSERVING);
-			else
-				self:SetObserverState(TOURNAMENTARENA_ZONESTATE_PREMATCH);
-			end
-		else
-			self:SetObserverState(TOURNAMENTARENA_ZONESTATE_SCANNING);
-		end
-	end
-end
-
-function PvPCommentatorMixin:SetObserverState(state)
-	if state ~= self.state then
-		local oldState = self.state;
-		self.state = state;
-		self:OnObserverStateChanged(oldState, state);
-	end
-end
-
-function PvPCommentatorMixin:OnObserverStateChanged(oldState, newState)
-	if newState == TOURNAMENTARENA_ZONESTATE_TRANSFERRING_IN or newState == TOURNAMENTARENA_ZONESTATE_TRANSFERRING_OUT then
-		self:InvalidateAllPlayers();
-
-		self:SetFrameLock(true);
-		SetSpectatorModeForOtherFrames(true);
-
-		ClearTarget();
-
-		CommentatorTeamDisplay:Hide();
-		self:SetAllUnitFramesVisibilityState(false);
-	elseif newState == TOURNAMENTARENA_ZONESTATE_OBSERVING or newState == TOURNAMENTARENA_ZONESTATE_PREMATCH then
-		CommentatorTeamDisplay:Show();
-		CommentatorTeamDisplay:RefreshPlayerNamesAndScores();
-
-		ClearTarget();
-
-		self:FullPlayerRefresh();
-		self:SetAllUnitFramesVisibilityState(true);
-
-		self.currentSpeedFactor = nil;
-
-		self:SetFrameLock(true);
-		SetSpectatorModeForOtherFrames(true);
-	elseif newState == TOURNAMENTARENA_ZONESTATE_SCANNING then
-		if C_Commentator.IsSpectating() then
-			C_Commentator.ExitInstance();
-		end
-		
-		self:SetFrameLock(false);
-		SetSpectatorModeForOtherFrames(false);
-
-		ClearTarget();
-
-		CommentatorTeamDisplay:Hide();
-		self:SetAllUnitFramesVisibilityState(false);
-	end
-end
-
-function PvPCommentatorMixin:CheckScoreboard()
-	local winningTeam = GetBattlefieldWinner();
-
-	if winningTeam then
-		self:SetObserverState(TOURNAMENTARENA_ZONESTATE_SCOREBOARD);
-		
-		local winningTeamIndex = winningTeam + 1;
-		if C_Commentator.AreTeamsSwapped() then
-			winningTeamIndex = winningTeamIndex == 1 and 2 or 1;
-		end
-		
-		local teamName = CommentatorTeamDisplay:GetTeamName(winningTeamIndex);
-		if teamName then
-			CommentatorFadeToBlackFrame:Start(0.1);
-			C_Timer.After(0.3, function()
-				CommentatorVictoryFanfareFrame:Show();
-				CommentatorVictoryFanfareFrame:PlayVictoryFanfare(COMMENTATOR_VICTORY_FANFARE_TEXT, teamName);
-			end);
-		end
-	end 
-end
-
-function PvPCommentatorMixin:JoinInstance()
-	self:SetObserverState(TOURNAMENTARENA_ZONESTATE_TRANSFERRING_IN);
-end
-
-function PvPCommentatorMixin:StopObserving()
-	self:SetObserverState(TOURNAMENTARENA_ZONESTATE_TRANSFERRING_OUT);
-
-	C_Commentator.ExitInstance();
-end
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.xml b/Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.xml
deleted file mode 100644
index be8967b977..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/PvPCommentator.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
-	<Script file="PvPCommentator.lua"/>
-	
-	<Frame name="PvPCommentator" frameStrata="LOW" hidden="false" setAllPoints="true" parent="WorldFrame" mixin="PvPCommentatorMixin">
-		<Scripts>
-			<OnLoad method="OnLoad"/>
-			<OnEvent method="OnEvent"/>
-			<OnUpdate method="OnUpdate"/>
-		</Scripts>
-	</Frame>
-</Ui>
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.lua b/Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.lua
deleted file mode 100644
index f666a9f78b..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.lua
+++ /dev/null
@@ -1,197 +0,0 @@
-
-g_TeamDefinitions = {};
-g_TeamDisplaySavedVars = { lastGame = nil, currentGame = nil, };
-
-local ADDON_NAME = ...;
-local MIN_SCORE = 0;
-local MAX_SCORE = 3;
-
-CommentatorTeamDisplayMixin = {};
-
-function CommentatorTeamDisplayMixin:OnLoad()
-	self:RegisterEvent("ADDON_LOADED");
-	
-	if TeamDefiner then
-		TeamDefiner:SetSavedVariable(g_TeamDefinitions);
-	end
-end
-
-function CommentatorTeamDisplayMixin:OnEvent(event, ...)
-	if event == "ADDON_LOADED" then
-		if ADDON_NAME == ... then
-			self:OnAddonLoaded();
-			self:UnregisterEvent("ADDON_LOADED");
-		end
-	end
-end
-
-function CommentatorTeamDisplayMixin:OnAddonLoaded()
-	self.loaded = true;
-
-	self.savedVars = g_TeamDisplaySavedVars;
-	if self.savedVars.currentGame then
-		self.savedVars.lastGame = self.savedVars.currentGame;
-	end
-	self.savedVars.currentGame = nil;
-
-	if C_Commentator.IsSpectating() then
-		self:RefreshPlayerNamesAndScores();
-	end
-end
-
-local function FindMostLikelyTeamName(teamIndex)
-	local teamNameCounts = {};
-	for playerIndex = 1, C_Commentator.GetNumPlayers(teamIndex) do
-		local unitToken, playerName = C_Commentator.GetPlayerInfo(teamIndex, playerIndex);
-
-		local teamName = g_TeamDefinitions[playerName];
-		if teamName then
-			teamNameCounts[teamName] = (teamNameCounts[teamName] or 0) + 1;
-		end
-	end
-
-	local highCount = 0;
-	local mostLikelyTeamName;
-	for teamName, count in pairs(teamNameCounts) do
-		if count > highCount then
-			highCount = count;
-			mostLikelyTeamName = teamName;
-		end
-	end
-
-	return mostLikelyTeamName;
-end
-
-function CommentatorTeamDisplayMixin:TryToMatchPreviousGame(teamName)
-	if teamName then
-		local gameData = self.savedVars.currentGame or self.savedVars.lastGame;
-		if gameData then
-			for teamIndex, teamData in ipairs(gameData) do
-				if teamData.teamName == teamName then
-					return teamData;
-				end
-			end
-		end
-	end
-end
-
-function CommentatorTeamDisplayMixin:RefreshPlayerNamesAndScores()
-	if not self.loaded or not C_Commentator.IsSpectating() then
-		return;
-	end
-	
-	local newTeams = {};
-	
-	for teamIndex = 1, C_Commentator.GetMaxNumTeams() do
-		local mostLikelyTeamName = FindMostLikelyTeamName(teamIndex);
-		local oldTeamData = self:TryToMatchPreviousGame(mostLikelyTeamName);
-
-		newTeams[#newTeams + 1] = { teamName = mostLikelyTeamName, score = oldTeamData and oldTeamData.score or 0 };
-	end
-
-	self.savedVars.currentGame = newTeams;
-	
-	self:RefreshDisplay();
-end
-
-function CommentatorTeamDisplayMixin:RefreshDisplay()
-	local currentGameData = self.savedVars.currentGame;
-	if currentGameData then
-		for teamIndex, teamData in ipairs(currentGameData) do
-			self.ScoreLabels[teamIndex]:SetText(teamData.score);
-			self.TeamNameLabels[teamIndex]:SetText(teamData.teamName);
-		end
-	end
-end
-
-function CommentatorTeamDisplayMixin:GetScore(teamIndex)
-	if self.savedVars.currentGame and self.savedVars.currentGame[teamIndex] then
-		return self.savedVars.currentGame[teamIndex].score;
-	end
-	return 0;
-end
-
-function CommentatorTeamDisplayMixin:SetScore(teamIndex, score)
-	score = Clamp(score, MIN_SCORE, MAX_SCORE);
-
-	if self.loaded and self.savedVars.currentGame and self.savedVars.currentGame[teamIndex] and self.savedVars.currentGame[teamIndex].score ~= score then
-		self.savedVars.currentGame[teamIndex].score = score;
-
-		self:RefreshDisplay();
-	end
-end
-
-function CommentatorTeamDisplayMixin:AddScore(teamIndex)
-	self:SetScore(teamIndex, self:GetScore(teamIndex) + 1);
-end
-
-function CommentatorTeamDisplayMixin:RemoveScore(teamIndex)
-	self:SetScore(teamIndex, self:GetScore(teamIndex) - 1);
-end
-
-function CommentatorTeamDisplayMixin:ResetScore()
-	for teamIndex = 1, C_Commentator.GetMaxNumTeams() do
-		self:SetScore(teamIndex, 0);
-	end
-end
-
-function CommentatorTeamDisplayMixin:SetDampeningValue(percent)
-	if percent and percent > 0 then
-		self.Dampening:SetText(COMMENTATOR_DAMPENING_PERCENT:format(percent));
-		self.Dampening:Show();
-		self.DampeningBg:Show();
-	else
-		self.Dampening:Hide();
-		self.DampeningBg:Hide();
-	end
-end
-
-do
-	local lastDampeningValue = nil;
-	function CommentatorTeamDisplayMixin:OnUpdate()
-		if not GetBattlefieldWinner() then
-			local percent = C_Commentator.GetDampeningPercent();
-			if percent ~= lastDampeningValue then
-				lastDampeningValue = percent;
-				self:SetDampeningValue(percent);
-			end
-		else
-			lastDampeningValue = nil;
-			self:SetDampeningValue(nil);
-		end
-	end
-end
-
-function CommentatorTeamDisplayMixin:GetTeamName(teamIndex)
-	if self.savedVars.currentGame and self.savedVars.currentGame[teamIndex] then
-		return self.savedVars.currentGame[teamIndex].teamName;
-	end
-	return nil;
-end
-
-function CommentatorTeamDisplayMixin:UpdateTeamName(teamIndex, newTeamName)
-	for i = 1, C_Commentator.GetMaxNumPlayersPerTeam() do
-		local playerName = select(2, C_Commentator.GetPlayerInfo(teamIndex, i));
-		if playerName then
-			g_TeamDefinitions[playerName] = newTeamName;
-		end
-	end
-	
-	if TeamDefiner then
-		for i = 1, C_Commentator.GetMaxNumPlayersPerTeam() do
-			local playerName = select(2, C_Commentator.GetPlayerInfo(teamIndex, i));
-			if playerName then
-				g_TeamDefinitionUI[teamIndex][i] = select(2, playerName);
-			end
-		end
-		
-		TeamDefiner:SetTeamName(teamIndex, newTeamName);
-	end
-	
-	self:RefreshPlayerNamesAndScores();
-end
-
-function CommentatorTeamDisplayMixin:AssignPlayerToTeam(playerName, teamName)
-	g_TeamDefinitions[playerName] = teamName;
-	self:RefreshPlayerNamesAndScores();
-end
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.xml b/Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.xml
deleted file mode 100644
index 6660f34972..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/TeamDisplay.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
-	<Script file="TeamDisplay.lua"/>
-
-	<Frame name="CommentatorTeamDisplay" enableMouse="false" hidden="true" parent="WorldFrame" toplevel="true" clampedToScreen="true" mixin="CommentatorTeamDisplayMixin">
-		<Size x="400" y="50" />
-		<Anchors>
-			<Anchor point="TOP" relativeTo="WorldFrame" />
-		</Anchors>
-		<Layers>
-			<Layer level="BACKGROUND">
-				<Texture parentKey="LeftBg" atlas="ScoreTeam">
-					<Size x="384" y="96" />
-					<Anchors>
-						<Anchor point="TOPRIGHT" relativeTo="WorldFrame" relativePoint="TOP" />
-					</Anchors>
-				</Texture>
-				<Texture parentKey="RightBg" atlas="ScoreTeam">
-					<Size x="384" y="96" />
-					<Anchors>
-						<Anchor point="TOPLEFT" relativeTo="WorldFrame" relativePoint="TOP" />
-					</Anchors>
-					<TexCoords left="1" right="0" top="0" bottom="1"/>
-				</Texture>
-			</Layer>
-
-			<Layer level="ARTWORK" textureSubLevel="1">
-				<Texture parentKey="Divider" atlas="ScoreDivider">
-					<Size x="48" y="96" />
-					<Anchors>
-						<Anchor point="TOP" relativeTo="WorldFrame" y="-3" />
-					</Anchors>
-				</Texture>
-			</Layer>
-
-			<Layer level="ARTWORK" textureSubLevel="2">
-				<Texture parentKey="DampeningBg" atlas="HealingDampening">
-					<Size x="192" y="96" />
-					<Anchors>
-						<Anchor point="TOP" relativeTo="WorldFrame" y="-3" />
-					</Anchors>
-				</Texture>
-			</Layer>
-
-			<Layer level="OVERLAY">
-				<FontString parentKey="Team1Score" inherits="CommentatorTeamScoreFont" parentArray="ScoreLabels" text="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeTo="WorldFrame" relativePoint="TOP" x="-250" y="-28" />
-					</Anchors>
-				</FontString>
-
-				<FontString parentKey="Team2Score" inherits="CommentatorTeamScoreFont" parentArray="ScoreLabels" text="0">
-					<Anchors>
-						<Anchor point="CENTER" relativeTo="WorldFrame" relativePoint="TOP" x="250" y="-28" />
-					</Anchors>
-				</FontString>
-
-				<FontString parentKey="Team1Name" inherits="CommentatorTeamNameFont" parentArray="TeamNameLabels" justifyH="LEFT" justifyV="MIDDLE">
-					<Size x="200" y="40" />
-					<Anchors>
-						<Anchor point="TOPRIGHT" relativeTo="WorldFrame" relativePoint="TOP" x="-20" y="-7" />
-					</Anchors>
-				</FontString>
-				
-				<FontString parentKey="Team2Name" inherits="CommentatorTeamNameFont" parentArray="TeamNameLabels" justifyH="RIGHT" justifyV="MIDDLE">
-					<Size x="200" y="40" />
-					<Anchors>
-						<Anchor point="TOPLEFT" relativeTo="WorldFrame" relativePoint="TOP" x="20" y="-7" />
-					</Anchors>
-				</FontString>
-
-				<FontString parentKey="Dampening" font="CommentatorDampeningFont">
-					<Anchors>
-						<Anchor point="TOP" relativeTo="WorldFrame" y="-58" />
-					</Anchors>
-					<Color r="1" g="0" b="0"/>
-				</FontString>
-			</Layer>
-		</Layers>
-		<Scripts>
-			<OnLoad method="OnLoad"/>
-			<OnEvent method="OnEvent"/>
-			<OnUpdate method="OnUpdate"/>
-		</Scripts>
-	</Frame>
-</Ui>
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrame.lua b/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrame.lua
deleted file mode 100644
index 4b308d864b..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrame.lua
+++ /dev/null
@@ -1,415 +0,0 @@
-
-local LEFT_ALIGNMENT = "left";
-local RIGHT_ALIGNMENT = "right";
-
-local IS_CAMERA_TARGET = true;
-local HAS_POWER = true;
-
-local MAX_AURA_INDEX_TO_CHECK = 40;
-
-COMMENTATOR_UNIT_FRAME_STANDARD = 0;
-COMMENTATOR_UNIT_FRAME_COMPACT = 1;
-COMMENTATOR_UNIT_FRAME_VERY_COMPACT = 2;
-COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT = 3;
-
-CommentatorUnitFrameMixin = {};
-
-function CommentatorUnitFrameMixin:Initialize(align)
-	self:SetScale(.8);
-	
-	self.align = align or LEFT_ALIGNMENT;
-	self.isCameraTarget = false;
-	self.compactLevel = COMMENTATOR_UNIT_FRAME_STANDARD;
-	self.canBeVisible = false;
-	
-	self:EvaluateRelayout();
-	
-	self.DeadText:SetFontObjectsToTry(CommentatorDeadFontDefault, CommentatorDeadFontMedium, CommentatorDeadFontSmall);
-end
-
-function CommentatorUnitFrameMixin:OnSizeChanged()
-	self.DeadText:ApplyFontObjects();
-end
-
-local LAYOUT_TABLE = {
-	[LEFT_ALIGNMENT] = {
-		[IS_CAMERA_TARGET] = {
-			[COMMENTATOR_UNIT_FRAME_STANDARD] = {
-				[HAS_POWER] = "team_left_power",
-				[not HAS_POWER] = "team_left",
-			},
-			[COMMENTATOR_UNIT_FRAME_COMPACT] = {
-				[HAS_POWER] = "team_left_compact_power",
-				[not HAS_POWER] = "team_left_compact",
-			},
-			[COMMENTATOR_UNIT_FRAME_VERY_COMPACT] = {
-				[HAS_POWER] = "team_left_veryCompact_power",
-				[not HAS_POWER] = "team_left_veryCompact",
-			},
-			[COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT] = {
-				[HAS_POWER] = "team_left_extremelyCompact_power",
-				[not HAS_POWER] = "team_left_extremelyCompact",
-			},
-		},
-		[not IS_CAMERA_TARGET] = {
-			[COMMENTATOR_UNIT_FRAME_STANDARD] = {
-				[HAS_POWER] = "team_left_power",
-				[not HAS_POWER] = "team_left",
-			},
-			[COMMENTATOR_UNIT_FRAME_COMPACT] = {
-				[HAS_POWER] = "team_left_compact_power",
-				[not HAS_POWER] = "team_left_compact",
-			},
-			[COMMENTATOR_UNIT_FRAME_VERY_COMPACT] = {
-				[HAS_POWER] = "team_left_veryCompact_power",
-				[not HAS_POWER] = "team_left_veryCompact",
-			},
-			[COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT] = {
-				[HAS_POWER] = "team_left_extremelyCompact_power",
-				[not HAS_POWER] = "team_left_extremelyCompact",
-			},
-		},
-	},
-
-	[RIGHT_ALIGNMENT] = {
-		[IS_CAMERA_TARGET] = {
-			[COMMENTATOR_UNIT_FRAME_STANDARD] = {
-				[HAS_POWER] = "team_right_power",
-				[not HAS_POWER] = "team_right",
-			},
-			[COMMENTATOR_UNIT_FRAME_COMPACT] = {
-				[HAS_POWER] = "team_right_compact_power",
-				[not HAS_POWER] = "team_right_compact",
-			},
-			[COMMENTATOR_UNIT_FRAME_VERY_COMPACT] = {
-				[HAS_POWER] = "team_right_veryCompact_power",
-				[not HAS_POWER] = "team_right_veryCompact",
-			},
-			[COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT] = {
-				[HAS_POWER] = "team_right_extremelyCompact_power",
-				[not HAS_POWER] = "team_right_extremelyCompact",
-			},
-		},
-		[not IS_CAMERA_TARGET] = {
-			[COMMENTATOR_UNIT_FRAME_STANDARD] = {
-				[HAS_POWER] = "team_right_power",
-				[not HAS_POWER] = "team_right",
-			},
-			[COMMENTATOR_UNIT_FRAME_COMPACT] = {
-				[HAS_POWER] = "team_right_compact_power",
-				[not HAS_POWER] = "team_right_compact",
-			},
-			[COMMENTATOR_UNIT_FRAME_VERY_COMPACT] = {
-				[HAS_POWER] = "team_right_veryCompact_power",
-				[not HAS_POWER] = "team_right_veryCompact",
-			},
-			[COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT] = {
-				[HAS_POWER] = "team_right_extremelyCompact_power",
-				[not HAS_POWER] = "team_right_extremelyCompact",
-			},
-		},
-	},
-};
-
-function CommentatorUnitFrameMixin:CalculateLayout()
-	local showPower = true; --not self:IsCompact() or self.role == "HEALER";
-	return LAYOUT_TABLE[self.align][self.isCameraTarget][self.compactLevel][showPower];
-end
-
-function CommentatorUnitFrameMixin:EvaluateRelayout()
-	local newLayout = self:CalculateLayout();
-
-	if self.layout ~= newLayout then
-		self.layout = newLayout;
-		self.isLayoutDirty = true;
-	end
-end
-
-function CommentatorUnitFrameMixin:GetAdditionalYSpacing()
-	local FOCUS_ADDITIONAL_PADDING = 0;
-	return self.isCameraTarget and FOCUS_ADDITIONAL_PADDING or 0;
-end
-
-function CommentatorUnitFrameMixin:AlignLeft()
-	self.align = LEFT_ALIGNMENT;
-	self:EvaluateRelayout();
-end
-
-function CommentatorUnitFrameMixin:AlignRight()
-	self.align = RIGHT_ALIGNMENT;
-	self:EvaluateRelayout();
-end
-
-function CommentatorUnitFrameMixin:SetCompact(compactLevel)
-	self.compactLevel = compactLevel;
-	self:EvaluateRelayout();
-end
-
-function CommentatorUnitFrameMixin:IsCompact()
-	return self.compactLevel >= COMMENTATOR_UNIT_FRAME_COMPACT;
-end
-
-function CommentatorUnitFrameMixin:IsVeryCompact()
-	return self.compactLevel >= COMMENTATOR_UNIT_FRAME_VERY_COMPACT;
-end
-
-function CommentatorUnitFrameMixin:IsExtremelyCompact()
-	return self.compactLevel >= COMMENTATOR_UNIT_FRAME_EXTREMELY_COMPACT;
-end
-
-function CommentatorUnitFrameMixin:AreUpdatesAllowed()
-	-- For now, stop updating when the game ends
-	return GetBattlefieldWinner() == nil;
-end
-
-function CommentatorUnitFrameMixin:OnUpdate(elapsed)
-	if self.isLayoutDirty then
-		self.isLayoutDirty = false;
-		self:ApplyLayout(self.layout);
-	end
-
-	if not self:AreUpdatesAllowed() then return end
-
-	local maxHealth = UnitHealthMax(self.token);
-	self:SetMaxHP(maxHealth);
-	local health = UnitHealth(self.token);
-	self:SetHP(health);
-
-	self:SetFlagInfo(C_Commentator.GetPlayerFlagInfo(self.teamIndex, self.playerIndex));
-
-	self:SetMaxPower(UnitPowerMax(self.token))
-	self:SetPower(UnitPower(self.token));
-
-	self:SetPowerType(select(2, UnitPowerType(self.token)));
-
-	self:SetLifeState(UnitIsFeignDeath(self.token), UnitIsDeadOrGhost(self.token));
-	self:UpdateCameraWeight(not UnitIsFeignDeath(self.token) and UnitIsDeadOrGhost(self.token));
-
-	self:UpdateCrowdControlAuras();
-	self:UpdateCrowdControlAurasText();
-
-	self.tokenChanging = false;
-end
-
-function CommentatorUnitFrameMixin:SetPlayerName(name)
-	self.Name:SetText(name);
-end
-
-function CommentatorUnitFrameMixin:GetPlayerName()
-	return self.Name:GetText() or "";
-end
-
-function CommentatorUnitFrameMixin:GetToken()
-	return self.token;
-end
-
-function CommentatorUnitFrameMixin:IsValid()
-	return self.token ~= nil;
-end
-
-function CommentatorUnitFrameMixin:GetGUID()
-	return self.guid;
-end
-
-function CommentatorUnitFrameMixin:SetClass(class)
-	if class and CLASS_ICON_TCOORDS[class] then
-		self.ClassIcon:SetTexCoord(unpack(CLASS_ICON_TCOORDS[class]));
-
-		local color = RAID_CLASS_COLORS[class];
-		if color then
-			self.HealthBar:SetStatusBarColor(color.r, color.g, color.b, 1.0);
-		else
-			self.HealthBar:SetStatusBarColor(0, 1.0, 0, 1.0);
-		end
-	end
-end
-
-function CommentatorUnitFrameMixin:SetTeamAndPlayer(teamIndex, playerIndex)
-	local token, playerName, faction, specID = C_Commentator.GetPlayerInfo(teamIndex, playerIndex);
-	
-	if token then
-		self.token = token;
-		self.tokenChanging = true;
-
-		self.Name:SetText(playerName);
-		self.Name:SetTextColor(C_Commentator.GetTeamHighlightColor(teamIndex));
-
-		self:SetClass(select(2, UnitClass(self.token)))
-
-		self.guid = UnitGUID(self.token);
-		self.playerIndex = playerIndex;
-		self.teamIndex = teamIndex;
-		self.specID = specID;
-	else
-		self.token = nil;
-		self.guid = nil;
-		self.playerIndex = nil;
-		self.teamIndex = nil;
-	end
-	
-	self.timeOfDeath = nil;
-	
-	self:UpdateVisibility();
-	self:EvaluateRelayout();
-end
-
-function CommentatorUnitFrameMixin:GetTeamAndPlayer()
-	return self.teamIndex, self.playerIndex;
-end
-
-function CommentatorUnitFrameMixin:OnLayoutApplied()
-	self.PowerBar:SetShown(self.PowerBar.enabled);
-end
-
-function CommentatorUnitFrameMixin:Invalidate()
-	if self:IsValid() then
-		self.token = nil;
-		self:UpdateVisibility();
-	end
-end
-
-function CommentatorUnitFrameMixin:SetVisibility(canBeVisible)
-	self.canBeVisible = canBeVisible;
-	self:UpdateVisibility();
-end
-
-function CommentatorUnitFrameMixin:UpdateVisibility()
-	self:SetShown(self.canBeVisible and self:IsValid());
-end
-
-function CommentatorUnitFrameMixin:ShouldResetAnimatedBars()
-	return self.tokenChanging;
-end
-
-function CommentatorUnitFrameMixin:SetHP(health)
-	if self:ShouldResetAnimatedBars() then
-		self.HealthBar:ResetSmoothedValue(health);
-	else
-		self.HealthBar:SetSmoothedValue(health);
-	end
-end
-
-function CommentatorUnitFrameMixin:SetMaxHP(healthMax)
-	self.HealthBar:SetMinMaxSmoothedValue(0, healthMax);
-	if self:ShouldResetAnimatedBars() then
-		self.HealthBar:ResetSmoothedValue();
-	end
-end
-
-function CommentatorUnitFrameMixin:SetFlagInfo(hasFlag)
-	self.FlagIcon:SetShown(hasFlag);
-	self.FlagIconHighlight:SetShown(hasFlag);
-	if hasFlag then
-		UIFrameFlash(self.FlagIconHighlight, 0.5, 0.5, -1);
-
-		if self.teamIndex == 2 then
-			-- TeamIndex 2 = Horde = Cap the Alliance Flag
-			self.FlagIcon:SetAtlas("tournamentarena-flag-large-blue");
-			self.FlagIconHighlight:SetAtlas("tournamentarena-flag-large-blue-flash");
-		else
-			-- TeamIndex 2 = Alliance = Cap the Horde Flag
-			self.FlagIcon:SetAtlas("tournamentarena-flag-large-red");
-			self.FlagIconHighlight:SetAtlas("tournamentarena-flag-large-red-flash");
-		end
-	else
-		UIFrameFlashStop(self.FlagIconHighlight);
-	end
-	self:UpdateFlagAnchors();
-end
-
-function CommentatorUnitFrameMixin:UpdateFlagAnchors()
-	if self.FlagIcon:IsShown() then
-		self.FlagIcon:ClearAllPoints();
-		local point, relPoint = "LEFT", "RIGHT";
-		local reverseAlign = self.align == RIGHT_ALIGNMENT;
-		local offsetXDirection = 1;
-		if reverseAlign then
-			point, relPoint = relPoint, point;
-			offsetXDirection = -1;
-		end
-		local offsetY = -2;
-		if self:IsCompact() then
-			offsetY = -5;
-		end
-		if self.CCIcon:IsShown() then
-			self.FlagIcon:SetPoint(point, self.CCIcon, relPoint, 5 * offsetXDirection, offsetY);
-		else
-			self.FlagIcon:SetPoint(point, self.CCIcon, point, 12 * offsetXDirection, offsetY);
-		end
-	end
-end
-
-function CommentatorUnitFrameMixin:UpdateCameraWeight(dead)
-	if dead then
-		if not self.timeOfDeath then
-			self.timeOfDeath = GetTime();
-		end
-
-		if GetTime() > self.timeOfDeath + 5.0 then
-			C_Commentator.SetAdditionalCameraWeight(self.teamIndex, self.playerIndex, 0.0);
-		end
-	else
-		self.timeOfDeath = nil;
-		C_Commentator.SetAdditionalCameraWeight(self.teamIndex, self.playerIndex, 1.0);
-	end
-end
-
-function CommentatorUnitFrameMixin:SetLifeState(feigned, dead)
-	self.DeadText:SetShown(not feigned and dead);
-	self.DeathIcon:SetShown(not feigned and dead);
-	self.DeathOverlay:SetShown(not feigned and dead);
-
-	self.FeignIcon:SetShown(feigned);
-end
-
-function CommentatorUnitFrameMixin:SetPower(power)
-	self.PowerBar:SetSmoothedValue(power, self:ShouldResetAnimatedBars());
-end
-
-function CommentatorUnitFrameMixin:SetMaxPower(powerMax)
-	self.PowerBar:SetMinMaxSmoothedValue(0, powerMax, self:ShouldResetAnimatedBars());
-end
-
-function CommentatorUnitFrameMixin:SetPowerType(powerType)
-	local color = PowerBarColor[powerType];
-	if color then
-		self.PowerBar:SetStatusBarColor(color.r, color.g, color.b);
-	end
-end
-
-function CommentatorUnitFrameMixin:GetRole()
-	return self.role;
-end
-
-function CommentatorUnitFrameMixin:UpdateCrowdControlAuras()
-	local spellID, expirationTime, duration = C_Commentator.GetPlayerCrowdControlInfo(self.teamIndex, self.playerIndex);
-	local icon = select(3, GetSpellInfo(spellID));
-	self.ccExpirationTime = expirationTime;
-
-	local isCCed = self.ccExpirationTime ~= nil;
-
-	self.CCIcon:SetShown(isCCed);
-	self.CCIconGlow:SetShown(isCCed);
-	self.CCOverlay:SetShown(isCCed);
-
-	if icon then
-		self.CCIcon:SetTexture(icon);
-	end
-
-	self:UpdateFlagAnchors();
-end
-
-function CommentatorUnitFrameMixin:UpdateCrowdControlAurasText()
-	if self.ccExpirationTime then
-		local now = GetTime();
-		local timeLeft = self.ccExpirationTime - now;
-		if timeLeft > 0 then
-			self.CCText:SetFormattedText("%.1f", timeLeft);
-			self.CCText:Show();
-		else
-			self.CCText:Hide();
-		end
-	else
-		self.CCText:Hide();
-	end
-end
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameLayoutData.lua b/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameLayoutData.lua
deleted file mode 100644
index c21b58f869..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameLayoutData.lua
+++ /dev/null
@@ -1,741 +0,0 @@
-
--- [[ All valid unit frame component names that can be controlled via the layout data below ]] --
-local UNIT_FRAME_COMPONENT_NAMES = {
-	"UnitFrame", -- special case that refers to the base unit frame
-
-	"FrameTexture",
-	"FlagIcon",
-	"FlagIconHighlight",
-
-	"HealthBar",
-	"PowerBar",
-	"CastingBar",
-
-	"ClassIcon",
-	"Name",
-	
-	"CCIcon",
-	"CCIconGlow",
-	"CCText",
-
-	"DeathIcon",
-	"FeignIcon",
-	"DeadText",
-
-	"CCOverlay",
-	"DeathOverlay",
-
-	"FrameUnderlay",
-}
-
-local function MergeTables(from, to)
-	for k, v in pairs(from) do
-		if type(v) == "table" then
-			to[k] = MergeTables(v, type(to[k]) == "table" and to[k] or {});
-		else
-			to[k] = v;
-		end
-	end
-	return to;
-end
-
-local function CreateLayoutTableThatInheritsFrom(...)
-	local layoutTable = {};
-	for i = 1, select("#", ...) do
-		layoutTable = MergeTables(select(i, ...), layoutTable);
-	end
-
-	return layoutTable;
-end
-
-local function CreatePoint(point, relComponent, relPoint, offsetX, offsetY)
-	return { point = point, relComponent = relComponent, relPoint = relPoint, offsetX = offsetX, offsetY = offsetY };
-end
-
-local BASE_LAYOUT = {
-	UnitFrame = {
-		width = 210,
-		height = 115,
-	},
-
-	Name = {
-		fontObject = "GameFontNormalLarge",
-		justifyH = "LEFT",
-
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 76, -26),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -6, 60),
-		},
-	},
-
-	HealthBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 71, -58),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -1, 22),
-		},
-	},
-
-	DeadText = {
-		justifyH = "CENTER",
-
-		points = {
-			CreatePoint("TOPLEFT", "HealthBar", "TOPLEFT", 6, 0),
-			CreatePoint("BOTTOMRIGHT", "HealthBar", "BOTTOMRIGHT", -42, 0),
-		},
-	},
-
-	PowerBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 71, -95),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -1, 4),
-		},
-		enabled = false,
-	},
-
-	FrameTexture = {
-		atlas = "UnitFrame-NoMana",
-
-		width = 256,
-		height = 128,
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 0, 0),
-		},
-	},
-
-	ClassIcon = {
-		width = 52,
-		height = 52,
-		keepTexCoords = true,
-		points = {
-			CreatePoint("CENTER", "UnitFrame", "TOPLEFT", 42, -41),
-		},
-	},
-
-	FrameUnderlay = {
-		points = {
-			CreatePoint("TOPLEFT", "HealthBar", "TOPLEFT", 0, 0),
-			CreatePoint("BOTTOMRIGHT", "HealthBar", "BOTTOMRIGHT", 0, 0),
-		},
-	},
-
-	FlagIcon = {
-		width = 128,
-		height = 64,
-	},
-
-	FlagIconHighlight = {
-		setAllPoints = "FlagIcon",
-	},
-
-	RoleIcon = {
-		width = 64,
-		height = 64,
-
-		points = {
-			CreatePoint("CENTER", "UnitFrame", "TOPLEFT", 70, -15),
-		},
-	},
-
-	CCIcon = {
-		width = 62,
-		height = 62,
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 0, -2),
-		},
-	},
-
-	CCIconGlow = {
-		width = 128,
-		height = 128,
-		points = {
-			CreatePoint("TOPLEFT", "CCIcon", "TOPLEFT", -12, 12),
-		},
-	},
-
-	CCOverlay = {
-		atlas = "UnitFrame_CCOverlay-NoMana",
-		setAllPoints = "FrameTexture",
-	},
-
-	DeathOverlay = {
-		atlas = "UnitFrame_DeathOverlay-NoMana",
-		setAllPoints = "FrameTexture",
-	},
-
-	CCText = {
-		points = {
-			CreatePoint("CENTER", "CCIcon", "CENTER", 0, 0),
-		},
-	},
-
-	FeignIcon = {
-		setAllPoints = "CCIcon",
-	},
-
-	DeathIcon = {
-		mirrorFileV = true,
-		width = 64,
-		height = 128,
-
-		points = {
-			CreatePoint("RIGHT", "UnitFrame", "BOTTOMRIGHT", 14, 2),
-		},
-	},
-
-	CastingBar = {
-		width = 150,
-		height = 30,
-
-		points = {
-			CreatePoint("LEFT", "HealthBar", "RIGHT", 52, -2),
-		},
-		enabled = true,
-	},
-}
-
-local POWER_LAYOUT = {
-	FrameTexture = {
-		atlas = "UnitFrame-NoTrinket",
-
-		width = 256,
-		height = 128,
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 0, 0),
-		},
-	},
-
-	PowerBar = {
-		enabled = true,
-	},
-
-	FrameUnderlay = {
-		points = {
-			CreatePoint("TOPLEFT", "HealthBar", "TOPLEFT", 0, 0),
-			CreatePoint("BOTTOMRIGHT", "PowerBar", "BOTTOMRIGHT", 0, 0),
-		},
-	},
-
-	CCIcon = {
-		width = 62,
-		height = 62,
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 0, -12),
-		},
-	},
-
-	CCOverlay = {
-		atlas = "UnitFrame_CCOverlay",
-	},
-
-	DeathOverlay = {
-		atlas = "UnitFrame_DeathOverlay",
-	},
-};
-
-local RIGHT_LAYOUT = {
-	FrameTexture = {
-		mirrorFileV = true,
-		mirrorPointsV = true,
-	},
-
-	ClassIcon = {
-		mirrorPointsV = true,
-	},
-
-	Name = {
-		justifyH = "RIGHT",
-		mirrorPointsV = true,
-	},
-
-	HealthBar = {
-		mirrorPointsV = true,
-	},
-
-	PowerBar = {
-		mirrorPointsV = true,
-	},
-
-	FlagIcon = {
-		mirrorFileV = true,
-	},
-
-	FlagIconHighlight = {
-		mirrorFileV = true,
-	},
-
-	CCIcon = {
-		mirrorPointsV = true,
-	},
-
-	CCOverlay = {
-		mirrorFileV = true,
-	},
-
-	DeathOverlay = {
-		mirrorFileV = true,
-	},
-
-	DeadText = {
-		mirrorPointsV = true,
-		justifyH = "CENTER",
-	},
-
-	DeathIcon = {
-		mirrorFileV = false,
-		mirrorPointsV = true,
-	},
-
-	CastingBar = {
-		points = {
-			CreatePoint("RIGHT", "HealthBar", "LEFT", -13, -2),
-		},
-	},
-};
-
-local COMPACT_LAYOUT = {
-	CastingBar = {
-		enabled = false,
-	},
-};
-
-local VERY_COMPACT_LAYOUT = {
-	UnitFrame = {
-		width = 158,
-		height = 86,
-	},
-	FrameTexture = {
-		atlas = "UnitFrame-NoMana",
-		width = 192,
-		height = 96,
-	},
-	ClassIcon = {
-		width = 39,
-		height = 39,
-		points = {
-			CreatePoint("CENTER", "UnitFrame", "TOPLEFT", 32, -31),
-		},
-	},
-	Name = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 57, -20),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -4, 45),
-		},
-	},
-	FlagIcon = {
-		width = 96,
-		height = 48,
-	},
-	CCIcon = {
-		width = 47,
-		height = 47,
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 0, -2),
-		},
-	},
-	CCIconGlow = {
-		width = 96,
-		height = 96,
-		points = {
-			CreatePoint("TOPLEFT", "CCIcon", "TOPLEFT", -9, 9),
-		},
-	},
-	DeathIcon = {
-		mirrorFileV = true,
-		width = 48,
-		height = 96,
-
-		points = {
-			CreatePoint("RIGHT", "UnitFrame", "BOTTOMRIGHT", 14, 2),
-		},
-	},
-};
-
-local EXTREMELY_COMPACT_LAYOUT = {
-	UnitFrame = {
-		width = 147,
-		height = 80,
-	},
-	FrameTexture = {
-		atlas = "UnitFrame-NoMana",
-
-		width = 179,
-		height = 90,
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 0, 0),
-		},
-	},
-	ClassIcon = {
-		width = 36,
-		height = 36,
-		points = {
-			CreatePoint("CENTER", "UnitFrame", "TOPLEFT", 29, -29),
-		},
-	},
-	FlagIcon = {
-		width = 89,
-		height = 44,
-	},
-	CCIcon = {
-		width = 44,
-		height = 44,
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 0, -2),
-		},
-	},
-	CCIconGlow = {
-		width = 89,
-		height = 89,
-		points = {
-			CreatePoint("TOPLEFT", "CCIcon", "TOPLEFT", -9, 8),
-		},
-	},
-	DeathIcon = {
-		mirrorFileV = true,
-		width = 44,
-		height = 89,
-
-		points = {
-			CreatePoint("RIGHT", "UnitFrame", "BOTTOMRIGHT", 14, 2),
-		},
-	},
-};
-
-local COMPACT_POWER_LAYOUT = {
-	FrameTexture = {
-		atlas = "UnitFrame-NoTrinket",
-	},
-}
-
-local VERY_COMPACT_POWER_LAYOUT = {
-	FrameTexture = {
-		atlas = "UnitFrame-NoMana",
-		width = 192,
-		height = 96,
-	},
-	HealthBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 53, -44),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -1, 24),
-		},
-	},
-	PowerBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 53, -64),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -1, 13),
-		},
-	},
-	CCIcon = {
-		width = 47,
-		height = 47,
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 0, -2),
-		},
-	},
-	CCOverlay = {
-		atlas = "UnitFrame_CCOverlay-NoMana",
-		setAllPoints = "FrameTexture",
-	},
-	DeathOverlay = {
-		atlas = "UnitFrame_DeathOverlay-NoMana",
-		setAllPoints = "FrameTexture",
-	},
-};
-
-local EXTREMELY_COMPACT_POWER_LAYOUT = {
-	FrameTexture = {
-		atlas = "UnitFrame-NoMana",
-
-		width = 179,
-		height = 90,
-	},
-	HealthBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 50, -41),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -1, 24),
-		},
-	},
-	PowerBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 49, -58),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", -1, 13),
-		},
-	},
-	CCIcon = {
-		width = 44,
-		height = 44,
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 0, -2),
-		},
-	},
-};
-
-local FOCUSED_LAYOUT = {
-	Name = {
-		fontObject = "GameFontNormalHuge3",
-
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 89, -29),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", 107, 53),
-		},
-	},
-
-	HealthBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 84, -66),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", 117, 2),
-		},
-	},
-
-	PowerBar = {
-		points = {
-			CreatePoint("TOPLEFT", "UnitFrame", "TOPLEFT", 84, -115),
-			CreatePoint("BOTTOMRIGHT", "UnitFrame", "BOTTOMRIGHT", 117, -21),
-		},
-	},
-
-	FrameTexture = {
-		atlas = "UnitFrame_CurrentPlayer-NoTrinket",
-
-		width = 512,
-		height = 256,
-	},
-
-	ClassIcon = {
-		width = 66,
-		height = 66,
-		points = {
-			CreatePoint("CENTER", "UnitFrame", "TOPLEFT", 49, -45),
-		},
-	},
-
-	CCIcon = {
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 121, -18),
-		},
-	},
-
-	CCOverlay = {
-		atlas = "UnitFrame_CurrentPlayer_CCOverlay",
-	},
-
-	DeathOverlay = {
-		atlas = "UnitFrame_CurrentPlayer_DeathOverlay",
-	},
-
-	DeathIcon = {
-		width = 80,
-		height = 160,
-
-		points = {
-			CreatePoint("RIGHT", "UnitFrame", "BOTTOMRIGHT", 144, -20),
-		},
-	},
-
-	CastingBar = {
-		points = {
-			CreatePoint("LEFT", "HealthBar", "RIGHT", 54, -2),
-		},
-	},
-};
-
-local FOCUSED_COMPACT_LAYOUT = {
-	CastingBar = {
-		enabled = true,
-		points = {
-			CreatePoint("LEFT", "HealthBar", "RIGHT", 52, -2),
-		},
-	},
-
-	FrameTexture = {
-		atlas = "UnitFrame_CurrentPlayer-NoMana",
-	},
-
-	CCIcon = {
-		points = {
-			CreatePoint("LEFT", "UnitFrame", "RIGHT", 121, -12),
-		},
-	},
-
-	CCOverlay = {
-		atlas = "UnitFrame_CurrentPlayer_CCOverlay-NoMana",
-	},
-
-	DeathOverlay = {
-		atlas = "UnitFrame_CurrentPlayer_DeathOverlay-NoMana",
-	},
-};
-
-local FOCUSED_COMPACT_POWER_LAYOUT = {
-	FrameTexture = {
-		atlas = "UnitFrame_CurrentPlayer-NoTrinket",
-
-		width = 512,
-		height = 256,
-	},
-
-	CCOverlay = {
-		atlas = "UnitFrame_CurrentPlayer_CCOverlay",
-	},
-
-	DeathOverlay = {
-		atlas = "UnitFrame_CurrentPlayer_DeathOverlay",
-	},
-}
-
-local FOCUSED_COMPACT_RIGHT_LAYOUT = {
-	CastingBar = {
-		points = {
-			CreatePoint("RIGHT", "HealthBar", "LEFT", -13, -2),
-		},
-	},
-}
-
-local LAYOUT_DATA = {
-	team_left = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT),
-	team_right = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT),
-
-	team_left_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, POWER_LAYOUT),
-	team_right_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, POWER_LAYOUT),
-
-	team_left_compact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, COMPACT_LAYOUT),
-	team_right_compact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, COMPACT_LAYOUT),
-
-	team_left_compact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, COMPACT_LAYOUT, POWER_LAYOUT, COMPACT_POWER_LAYOUT),
-	team_right_compact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, COMPACT_LAYOUT, POWER_LAYOUT, COMPACT_POWER_LAYOUT),
-
-	team_left_veryCompact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT),
-	team_right_veryCompact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT),
-
-	team_left_veryCompact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT, POWER_LAYOUT, COMPACT_POWER_LAYOUT, VERY_COMPACT_POWER_LAYOUT),
-	team_right_veryCompact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT, POWER_LAYOUT, COMPACT_POWER_LAYOUT, VERY_COMPACT_POWER_LAYOUT),
-
-	team_left_extremelyCompact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT, EXTREMELY_COMPACT_LAYOUT),
-	team_right_extremelyCompact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT, EXTREMELY_COMPACT_LAYOUT),
-
-	team_left_extremelyCompact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT, EXTREMELY_COMPACT_LAYOUT, POWER_LAYOUT, COMPACT_POWER_LAYOUT, VERY_COMPACT_POWER_LAYOUT, EXTREMELY_COMPACT_POWER_LAYOUT),
-	team_right_extremelyCompact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, COMPACT_LAYOUT, VERY_COMPACT_LAYOUT, EXTREMELY_COMPACT_LAYOUT, POWER_LAYOUT, COMPACT_POWER_LAYOUT, VERY_COMPACT_POWER_LAYOUT, EXTREMELY_COMPACT_POWER_LAYOUT),
-
-	team_left_focus = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, FOCUSED_LAYOUT),
-	team_right_focus = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, FOCUSED_LAYOUT),
-
-	team_left_focus_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, POWER_LAYOUT, FOCUSED_LAYOUT),
-	team_right_focus_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, POWER_LAYOUT, FOCUSED_LAYOUT),
-
-	team_left_focus_compact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, FOCUSED_LAYOUT, COMPACT_LAYOUT, FOCUSED_COMPACT_LAYOUT),
-	team_right_focus_compact = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, FOCUSED_LAYOUT, COMPACT_LAYOUT, FOCUSED_COMPACT_LAYOUT, FOCUSED_COMPACT_RIGHT_LAYOUT),
-
-	team_left_focus_compact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, POWER_LAYOUT, FOCUSED_LAYOUT, COMPACT_LAYOUT, FOCUSED_COMPACT_LAYOUT, FOCUSED_COMPACT_POWER_LAYOUT),
-	team_right_focus_compact_power = CreateLayoutTableThatInheritsFrom(BASE_LAYOUT, RIGHT_LAYOUT, POWER_LAYOUT, FOCUSED_LAYOUT, COMPACT_LAYOUT, POWER_LAYOUT, FOCUSED_COMPACT_LAYOUT, FOCUSED_COMPACT_POWER_LAYOUT, FOCUSED_COMPACT_RIGHT_LAYOUT),
-};
-
-local function GetComponent(UnitFrame, componentName)
-	if componentName == "UnitFrame" then
-		return UnitFrame;
-	end
-	if not UnitFrame[componentName] then
-		error(("Component %q missing from %q"):format(tostring(componentName), tostring(UnitFrame:GetName())));
-	end
-	return UnitFrame[componentName];
-end
-
-local function GetMirroredVPoint(point)
-	if point == "TOPLEFT" then
-		return "TOPRIGHT";
-	elseif point == "TOPRIGHT" then
-		return "TOPLEFT";
-	elseif point == "BOTTOMLEFT" then
-		return "BOTTOMRIGHT";
-	elseif point == "BOTTOMRIGHT" then
-		return "BOTTOMLEFT";
-	elseif point == "LEFT" then
-		return "RIGHT";
-	elseif point == "RIGHT" then
-		return "LEFT";
-	end
-
-	return point;
-end
-
-local function ApplyLayout(UnitFrame, component, layoutData)
-	if component and layoutData then
-		if layoutData.width then
-			component:SetWidth(layoutData.width);
-		end
-		if layoutData.height then
-			component:SetHeight(layoutData.height);
-		end
-
-		if layoutData.points then
-			for i, point in ipairs(layoutData.points) do
-				if layoutData.mirrorPointsV then
-					component:SetPoint(GetMirroredVPoint(point.point), GetComponent(UnitFrame, point.relComponent), GetMirroredVPoint(point.relPoint), -point.offsetX, point.offsetY);
-				else
-					component:SetPoint(point.point, GetComponent(UnitFrame, point.relComponent), point.relPoint, point.offsetX, point.offsetY);
-				end
-			end
-		end
-
-		if layoutData.setAllPoints then
-			component:SetAllPoints(GetComponent(UnitFrame, layoutData.setAllPoints));
-		end
-
-		if layoutData.atlas then
-			component:SetAtlas(layoutData.atlas);
-		end
-
-		if component.SetTexCoord and not layoutData.keepTexCoords then
-			if layoutData.mirrorFileV then
-				component:SetTexCoord(1, 0, 0, 1);
-			else
-				component:SetTexCoord(0, 1, 0, 1);
-			end
-		end
-
-		if layoutData.fontObject then
-			component:SetFontObject(layoutData.fontObject);
-		end
-
-		if layoutData.justifyH then
-			component:SetJustifyH(layoutData.justifyH);
-		end
-
-		if layoutData.justifyV then
-			component:SetJustifyV(layoutData.justifyV);
-		end
-
-		if layoutData.keyValues then
-			for k, v in pairs(layoutData.keyValues) do
-				component[k] = v;
-			end
-		end
-
-		component.enabled = layoutData.enabled;
-	end
-end
-
-function CommentatorUnitFrameLayout_GetLayout(layoutName)
-	return LAYOUT_DATA[layoutName];
-end
-
-function CommentatorUnitFrameMixin:ApplyLayout(layoutName)
-	local layoutTable = CommentatorUnitFrameLayout_GetLayout(layoutName);
-
-	for i, componentName in ipairs(UNIT_FRAME_COMPONENT_NAMES) do
-		local layoutData = layoutTable[componentName];
-		if layoutData and (layoutData.points or layoutData.setAllPoints) then
-			local component = GetComponent(self, componentName);
-			if component then
-				component:ClearAllPoints();
-			end
-		end
-	end
-
-	for i, componentName in ipairs(UNIT_FRAME_COMPONENT_NAMES) do
-		local component = GetComponent(self, componentName);
-		if component then
-			ApplyLayout(self, component, layoutTable[componentName]);
-		end
-	end
-
-	self:OnLayoutApplied();
-end
\ No newline at end of file
diff --git a/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameTemplates.xml b/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameTemplates.xml
deleted file mode 100644
index 93f0a4b36c..0000000000
--- a/Interface_Vanilla/AddOns/Blizzard_Commentator/UnitFrameTemplates.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
-
-<StatusBar name="CommentatorUnitFrameHealthStatusBar" drawLayer="BORDER" useParentLevel="true" virtual="true" mixin="SmoothStatusBarMixin">
-	<BarTexture file="Interface\RaidFrame\Raid-Bar-Hp-Fill" />
-</StatusBar>
-
-<StatusBar name="CommentatorUnitFramePowerStatusBar" inherits="CommentatorUnitFrameHealthStatusBar" virtual="true">
-	<BarTexture file="Interface\RaidFrame\Raid-Bar-Resource-Fill" />
-</StatusBar>
-
-<Frame name="CommentatorUnitFrameTemplate" frameStrata="LOW" hidden="true" mixin="CommentatorUnitFrameMixin" virtual="true">
-	<!-- Many sizes and anchors are setup in Lua, see UnitFrameLayoutData.lua -->
-	<Layers>
-		<Layer level="BACKGROUND" textureSubLevel="1">
-			<Texture parentKey="FrameUnderlay">
-				<Color r="0.0" g="0.0" b="0.0"/>
-			</Texture>
-		</Layer>
-		
-		<Layer level="BACKGROUND" textureSubLevel="2">
-			<Texture parentKey="FlagTexture" />
-		</Layer>
-		
-		<Layer level="BORDER">
-			<!-- Health/power bar is in this layer -->
-			<Texture parentKey="ClassIcon" file="Interface\TARGETINGFRAME\UI-Classes-circles" />
-		</Layer>
-
-		<Layer level="ARTWORK" textureSubLevel="1">
-			<Texture parentKey="FrameTexture"/>
-		</Layer>
-
-		<Layer level="ARTWORK" textureSubLevel="2">
-			<FontString parentKey="Name" inherits="GameFontNormalLarge" justifyV="MIDDLE">
-				<Color r="1.0" g="1.0" b="1.0"/>
-			</FontString>
-
-			<Texture parentKey="CCIconGlow" atlas="RedCCIconGlow" hidden="true" />
-		</Layer>
-
-		<Layer level="OVERLAY" textureSubLevel="0">
-			<Texture parentKey="FeignIcon" file="Interface\Icons\Ability_Rogue_FeignDeath" hidden="true" />
-			<Texture parentKey="FlagIcon" hidden="true" />
-		</Layer>
-
-		<Layer level="OVERLAY" textureSubLevel="1">
-			<Texture parentKey="CCIcon" hidden="true" />
-			<FontString parentKey="CCText" inherits="CommentatorCCFont" justifyH="CENTER" justifyV="MIDDLE" hidden="true">
-				<Color r="0.0" g="1.0" b="0.0"/>
-			</FontString>
-			<Texture parentKey="FlagIconHighlight" hidden="true" alphaMode="ADD" />
-		</Layer>
-
-		<Layer level="OVERLAY" textureSubLevel="2">
-			<Texture parentKey="CCOverlay" hidden="true" />
-			<Texture parentKey="DeathOverlay" hidden="true" />
-
-			<FontString parentKey="DeadText" inherits="CommentatorDeadFontDefault" mixin="ShrinkUntilTruncateFontStringMixin" maxLines="1" justifyV="MIDDLE" text="COMMENTATOR_UNITFRAME_DEAD_STR" hidden="true"/>
-		</Layer>
-
-		<Layer level="OVERLAY" textureSubLevel="3">
-			<Texture parentKey="DeathIcon" atlas="DeathIcon" hidden="true" />
-			<Texture parentKey="RoleIcon" hidden="true" />
-		</Layer>
-	</Layers>
-	<Frames>
-		<StatusBar parentKey="HealthBar" inherits="CommentatorUnitFrameHealthStatusBar" />
-		<StatusBar parentKey="PowerBar" inherits="CommentatorUnitFramePowerStatusBar" />
-
-		<StatusBar parentKey="CastingBar" minValue="0" maxValue="1" drawLayer="BORDER" useParentLevel="true" hidden="true">
-			<Layers>
-				<Layer level="BACKGROUND">
-					<Texture parentKey="FrameUnderlay">
-						<Color r="0.0" g="0.0" b="0.0"/>
-					</Texture>
-				</Layer>
-
-				<Layer level="BORDER" textureSubLevel="1">
-					<Texture parentKey="Border" atlas="CastBar">
-						<Size x="256" y="64" />
-						<Anchors>
-							<Anchor point="LEFT" x="-41" y="-10" />
-						</Anchors>
-					</Texture>
-				</Layer>
-				<Layer level="ARTWORK">
-					<FontString parentKey="Text" inherits="GameFontNormalLarge" maxLines="1" justifyH="CENTER" justifyV="MIDDLE">
-						<Size x="140" y="28" />
-						<Anchors>
-							<Anchor point="TOP" x="0" y="1" />
-						</Anchors>
-						<Color r="1.0" g="1.0" b="1.0"/>
-					</FontString>
-					<Texture parentKey="Icon">
-						<Size x="32" y="32" />
-						<Anchors>
-							<Anchor point="RIGHT" relativePoint="LEFT" x="-5" y="2" />
-						</Anchors>
-					</Texture>
-				</Layer>
-				<Layer level="OVERLAY">
-					<Texture file="Interface\CastingBar\UI-CastingBar-Spark" parentKey="Spark" alphaMode="ADD">
-						<Size x="32" y="32" />
-						<Anchors>
-							<Anchor point="CENTER"/>
-						</Anchors>
-					</Texture>
-					<Texture atlas="CastBar" parentKey="Flash" alphaMode="ADD">
-						<Size x="256" y="64" />
-						<Anchors>
-							<Anchor point="LEFT" x="-41" y="-10" />
-						</Anchors>
-					</Texture>
-				</Layer>
-			</Layers>
-
-			<BarTexture file="Interface\TargetingFrame\UI-StatusBar"/>
-			<BarColor r="1.0" g="0.7" b="0.0"/>
-		</StatusBar>
-	</Frames>
-	<Scripts>
-		<OnUpdate method="OnUpdate"/>
-		<OnSizeChanged method="OnSizeChanged"/>
-	</Scripts>
-</Frame>
-</Ui>
\ No newline at end of file
diff --git a/Interface_Vanilla/FrameXML/BNet.lua b/Interface_Vanilla/FrameXML/BNet.lua
index ce416e2dbb..d152291b57 100644
--- a/Interface_Vanilla/FrameXML/BNet.lua
+++ b/Interface_Vanilla/FrameXML/BNet.lua
@@ -23,6 +23,7 @@ BNET_CLIENT_WC3 = "W3";
 BNET_CLIENT_ARCADE = "RTRO";
 BNET_CLIENT_CRASH4 = "WLBY";
 BNET_CLIENT_D2 = "OSI";
+BNET_CLIENT_COD_VANGUARD = "FORE";
 
 WOW_PROJECT_MAINLINE = 1;
 WOW_PROJECT_CLASSIC = 2;
@@ -399,6 +400,8 @@ function BNet_GetClientEmbeddedTexture(client, width, height, xOffset, yOffset)
  		textureString = "Interface\\ChatFrame\\UI-ChatIcon-CrashBandicoot4";
  	elseif ( client == BNET_CLIENT_D2 ) then
  		textureString = "Interface\\ChatFrame\\UI-ChatIcon-DiabloIIResurrected";
+ 	elseif ( client == BNET_CLIENT_COD_VANGUARD ) then
+ 		textureString = "Interface\\ChatFrame\\UI-ChatIcon-CallOfDutyVanguard";
 	else
 		textureString = "Interface\\ChatFrame\\UI-ChatIcon-Battlenet";
 	end
@@ -438,6 +441,8 @@ function BNet_GetClientTexture(client)
  		return "Interface\\FriendsFrame\\Battlenet-CrashBandicoot4icon";
  	elseif ( client == BNET_CLIENT_D2 ) then
  		return "Interface\\FriendsFrame\\Battlenet-DiabloIIResurrectedicon";
+ 	elseif ( client == BNET_CLIENT_COD_VANGUARD ) then
+ 		return "Interface\\FriendsFrame\\Battlenet-CallOfDutyVanguardicon";
 	else
 		return "Interface\\FriendsFrame\\Battlenet-Battleneticon";
 	end
diff --git a/Interface_Vanilla/FrameXML/FriendsFrame.lua b/Interface_Vanilla/FrameXML/FriendsFrame.lua
index 8feb969207..4ffbf03908 100644
--- a/Interface_Vanilla/FrameXML/FriendsFrame.lua
+++ b/Interface_Vanilla/FrameXML/FriendsFrame.lua
@@ -191,7 +191,7 @@ function FriendsFrame_ClickSummonButton (self)
 	end
 end
 
-function FriendsFrame_ShowDropdown(name, connected, lineID, chatType, chatFrame, friendsList, isMobile, communityClubID, communityStreamID, communityEpoch, communityPosition, guid)
+function FriendsFrame_ShowDropdown(name, connected, lineID, chatType, chatFrame, friendsList, isMobile, communityClubID, communityStreamID, communityEpoch, communityPosition, guid, whoIndex)
 	HideDropDownMenu(1);
 	if ( connected or friendsList ) then
 		if ( connected ) then
@@ -214,6 +214,7 @@ function FriendsFrame_ShowDropdown(name, connected, lineID, chatType, chatFrame,
 		FriendsDropDown.bnetIDAccount = nil;
 		FriendsDropDown.isMobile = isMobile;
 		FriendsDropDown.guid = guid;
+		FriendsDropDown.whoIndex = whoIndex;
 		ToggleDropDownMenu(1, nil, FriendsDropDown, "cursor");
 	end
 end
@@ -742,6 +743,12 @@ function WhoList_Update()
 		-- The WHO_LIST_UPDATE handler also clears it, but that event doesn't fire if the Who Frame isn't shown.
 		WhoFrame.selectedWho = nil;
 	end
+	-- If we're in the process of reporting someone from the Who Frame, back out since their index might change.
+	HideDropDownMenu(1);
+	if (PlayerReportFrame and PlayerReportFrame.playerLocation and PlayerReportFrame.playerLocation:IsWhoIndex()) then
+		PlayerReportFrame:CancelReport();
+	end
+
 	WhoFrame.numWhos = numWhos;
 
 	local name, guild, level, race, class, zone;
@@ -1066,7 +1073,7 @@ function FriendsFrameWhoButton_OnClick(self, button)
 		WhoList_Update();
 	else
 		local name = _G["WhoFrameButton"..self:GetID().."Name"]:GetText();
-		FriendsFrame_ShowDropdown(name, 1);
+		FriendsFrame_ShowDropdown(name, 1, nil, nil, nil, nil , nil, nil, nil, nil, nil , nil, _G["WhoFrameButton"..self:GetID()].whoIndex);
 	end
 end
 
diff --git a/Interface_Vanilla/FrameXML/Minimap.lua b/Interface_Vanilla/FrameXML/Minimap.lua
index 2983d2bb0f..1dfb8997b8 100644
--- a/Interface_Vanilla/FrameXML/Minimap.lua
+++ b/Interface_Vanilla/FrameXML/Minimap.lua
@@ -475,7 +475,6 @@ function BattlefieldFrame_UpdateStatus(tooltipOnly)
 				-- Have been accepted show enter battleground dialog
 				tooltip = format(BATTLEFIELD_QUEUE_CONFIRM, mapName, SecondsToTime(GetBattlefieldPortExpiration(i)));
 				if ( not tooltipOnly ) then
-					PlaySound(SOUNDKIT.PVP_THROUGH_QUEUE);
 					MiniMapBattlefieldFrame:Show();
 				end
 				showRightClickText = 1;
diff --git a/Interface_Vanilla/FrameXML/UnitPopup.lua b/Interface_Vanilla/FrameXML/UnitPopup.lua
index 8f926f47e3..6ed9c2fa0c 100644
--- a/Interface_Vanilla/FrameXML/UnitPopup.lua
+++ b/Interface_Vanilla/FrameXML/UnitPopup.lua
@@ -681,6 +681,8 @@ local function UnitPopup_TryCreatePlayerLocation(menu, guid)
 		return PlayerLocation:CreateFromGUID(guid);
 	elseif menu.unit then
 		return PlayerLocation:CreateFromUnit(menu.unit);
+	elseif menu.whoIndex then
+		return PlayerLocation:CreateFromWhoIndex(menu.whoIndex);
 	end
 
 	return nil;