diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/events.lua b/2/3/4/5/6/7/ElvUI/Libraries/oUF/events.lua
index 413891c..9a0f9c6 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/oUF/events.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/events.lua
@@ -11,16 +11,8 @@ local registerEvent = frame_metatable.__index.RegisterEvent
 local unregisterEvent = frame_metatable.__index.UnregisterEvent
 
 function Private.UpdateUnits(frame, unit, realUnit)
-	if(unit == realUnit) then
-		realUnit = nil
-	end
 
-	if(frame.unit ~= unit or frame.realUnit ~= realUnit) then
-		frame.unit = unit
-		frame.realUnit = realUnit
-		frame.id = string.match(unit, '^.-(%d+)')
-		return true
-	end
+	return true
 end
 
 local function onEvent()
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/oUF.xml b/2/3/4/5/6/7/ElvUI/Libraries/oUF/oUF.xml
index b238637..f954b51 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/oUF/oUF.xml
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/oUF.xml
@@ -1,4 +1,7 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="templates.lua"/>
+	<Include file="templates.xml"/>
+	
 	<Script file="init.lua"/>
 	<Script file="private.lua"/>
 	<Script file="ouf.lua"/>
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/ouf.lua b/2/3/4/5/6/7/ElvUI/Libraries/oUF/ouf.lua
index 4697051..8da754d 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/oUF/ouf.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/ouf.lua
@@ -14,64 +14,6 @@ local callback, units, objects, headers = {}, {}, {}, {}
 local elements = {}
 local activeElements = {}
 
-local pairs = pairs
-
-local unitExistsWatchers = {}
-local unitExistsCache = setmetatable({},{
-	__index = function(t, k)
-		local v = UnitExists(k) or false
-		t[k] = v
-		return v
-	end
-})
-
-local function updateUnitWatch(frame)
-    local unit = frame.unit
-    local exists = (unit and unitExistsCache[unit])
-	if exists then
-		frame:Show()
-	else
-		frame:Hide()
-	end
-end
-
-local unitWatch = CreateFrame("Frame")
-unitWatch:Hide()
-
-local timer = 0
-unitWatch:SetScript("OnUpdate", function()
-	timer = timer - arg1
-    if timer <= 0 then
-        timer = 0.2
-
-        for k in pairs(unitExistsCache) do
-            unitExistsCache[k] = nil
-        end
-        for frame in pairs(unitExistsWatchers) do
-            updateUnitWatch(frame)
-        end
-    end
-end)
-unitWatch:SetScript("OnEvent", function() timer = 0 end)
-
-unitWatch:RegisterEvent("PLAYER_TARGET_CHANGED")
-unitWatch:RegisterEvent("PLAYER_FOCUS_CHANGED")
-unitWatch:RegisterEvent("PLAYER_REGEN_DISABLED")
-unitWatch:RegisterEvent("PLAYER_REGEN_ENABLED")
-unitWatch:RegisterEvent("UNIT_PET")
-unitWatch:RegisterEvent("RAID_ROSTER_UPDATE")
-unitWatch:RegisterEvent("PARTY_MEMBERS_CHANGED")
-
-local function RegisterUnitWatch(frame)
-	unitExistsWatchers[frame] = true
-	unitWatch:Show()
-	updateUnitWatch(frame)
-end
-
-local function UnregisterUnitWatch(frame)
-    unitExistsWatchers[frame] = nil
-end
-
 -- updating of "invalid" units.
 local function enableTargetUpdate(object)
 	object.onUpdateFrequency = object.onUpdateFrequency or .5
@@ -267,6 +209,12 @@ for k, v in next, {
 			self:PostUpdate(event)
 		end
 	end,
+
+	SetUnit = function(self, unit)
+		if unit ~= unit then
+			self.unit = unit
+		end
+	end,
 } do
 	frame_metatable.__index[k] = v
 end
@@ -335,7 +283,7 @@ local function initObject(unit, style, styleFunc, header, ...)
 	for i = 1, num do
 		local object = arg[i]
 		local objectUnit = object.guessUnit or unit
-		local suffix = "ery"
+		local suffix = string.match(objectUnit or unit, '%w+target')
 
 		object.__elements = {}
 		object.__registeredEvents = {}
@@ -352,19 +300,21 @@ local function initObject(unit, style, styleFunc, header, ...)
 			-- No header means it's a frame created through :Spawn().
 			object.menu = togglemenu
 			object:SetScript("OnClick", function()
-				TargetUnit(unit)
+				TargetUnit(object.unit)
 			end)
 
 			-- Other target units are handled by :HandleUnit().
 			if(suffix == 'target') then
 				enableTargetUpdate(object)
 			else
-				oUF:HandleUnit(object)
+				oUF:HandleUnit(object, unit)
 			end
 		else
 			-- Used to update frames when they change position in a group.
 			object:RegisterEvent('RAID_ROSTER_UPDATE', object.UpdateAllElements)
-
+			object:SetScript("OnClick", function()
+				TargetUnit(object.unit)
+			end)
 			if(num > 1) then
 				if(object:GetParent() == header) then
 					object.hasChildren = true
@@ -410,7 +360,7 @@ local function walkObject(object, unit)
 	-- Check if we should leave the main frame blank.
 	if(object.onlyProcessChildren) then
 		object.hasChildren = true
-		object:SetScript('OnAttributeChanged', onAttributeChanged)
+		--object:SetScript('OnAttributeChanged', onAttributeChanged)
 		return initObject(unit, style, styleFunc, header, object:GetChildren())
 	end
 
@@ -581,56 +531,47 @@ do
 	-- There has to be an easier way to do this.
 	local initialConfigFunction = function(self)
 		local header = self:GetParent()
-		for i = 1, select('#', self), 1 do
-			local frame = select(i, self)
-			local unit
-			-- There's no need to do anything on frames with onlyProcessChildren
-			if(not frame.onlyProcessChildren) then
-				-- Attempt to guess what the header is set to spawn.
-				local groupFilter = header:GetAttribute('groupFilter')
 
-				if(type(groupFilter) == 'string' and groupFilter:match('MAIN[AT]')) then
-					local role = groupFilter:match('MAIN([AT])')
-					if(role == 'T') then
-						unit = 'maintank'
-					else
-						unit = 'mainassist'
-					end
-				elseif(header:GetAttribute('showRaid')) then
-					unit = 'raid'
-				elseif(header:GetAttribute('showParty')) then
-					unit = 'party'
-				end
+		local unit
+		if(not self.onlyProcessChildren) then
+			local groupFilter = header:GetAttribute('groupFilter')
 
-				local headerType = header.headerType
-				local suffix = frame:GetAttribute('unitsuffix')
-				if(unit and suffix) then
-					if(headerType == 'pet' and suffix == 'target') then
-						unit = unit .. headerType .. suffix
-					else
-						unit = unit .. suffix
-					end
-				elseif(unit and headerType == 'pet') then
-					unit = unit .. headerType
-				end
-
-				frame.menu = togglemenu
-				frame:SetAttribute('type1', 'target')
-				frame:SetAttribute('type2', 'menu')
-				frame.guessUnit = unit
+			if(header:GetAttribute('showRaid')) then
+				unit = 'raid'
+			elseif(header:GetAttribute('showParty')) then
+				unit = 'party'
 			end
+		
+			self.menu = togglemenu
+			--self:SetAttribute('type1', 'target')
+			--self:SetAttribute('type2', 'menu')
+			self.guessUnit = unit
+			self.unit = "player"
+		--	self.onlyProcessChildren =true
 		end
 
-		header:styleFunction(self:GetName())
+		styleProxy(nil, self:GetName())
 	end
 
+	local setAttribute = function(self, name, value)
+		if self.attributes[name] ~= value then
+			self.attributes[name] = value
+
+			if self:IsVisible() then
+				SecureGroupHeader_Update(self)
+			end
+		end
+	end
+	local getAttribute = function(self, name)
+		return self.attributes[name]
+	end
 	--[[ oUF:SpawnHeader(overrideName, template, visibility, ...)
 	Used to create a group header and apply the currently active style to it.
 
 	* self         - the global oUF object
 	* overrideName - unique global name to be used for the header. Defaults to an auto-generated name based on the name
 	                 of the active style and other arguments passed to `:SpawnHeader` (string?)
-	* template     - name of a template to be used for creating the header. Defaults to `'SecureGroupHeaderTemplate'`
+	* template     - name of a template to be used for creating the header. Defaults to `'oUF_GroupHeaderTemplate'`
 	                 (string?)
 	* visibility   - macro conditional(s) which define when to display the header (string).
 	* ...          - further argument pairs. Consult [Group Headers](http://wowprogramming.com/docs/secure_template/Group_Headers)
@@ -646,16 +587,22 @@ do
 	function oUF:SpawnHeader(overrideName, template, visibility, ...)
 		if(not style) then return error('Unable to create frame. No styles have been registered.') end
 
-		template = (template or 'SecureGroupHeaderTemplate')
+		template = (template or 'oUF_GroupHeaderTemplate')
 
 		local isPetHeader = string.match(template, 'PetHeader')
 		local name = overrideName or generateName(nil, unpack(arg))
 		local header = CreateFrame('Frame', name, UIParent, template)
+		header:Hide()
 
-		header:SetAttribute('template', 'SecureUnitButtonTemplate')
-		for i = 1, select('#', arg), 2 do
+		header.attributes = {}
+		header.SetAttribute = setAttribute
+		header.GetAttribute = getAttribute
+		
+		--header:SetAttribute('template', 'SecureUnitButtonTemplate')
+		for i = 1, getn(arg), 2 do
 			local att, val = select(i, unpack(arg))
 			if(not att) then break end
+
 			header:SetAttribute(att, val)
 		end
 
@@ -673,7 +620,8 @@ do
 			self:DisableBlizzard('party')
 		end
 
-		if(visibility) then
+
+		--[[if(visibility) then
 			local type, list = string.split(' ', visibility, 2)
 			if(list and type == 'custom') then
 				RegisterStateDriver(header, 'visibility', list)
@@ -683,7 +631,7 @@ do
 				RegisterStateDriver(header, 'visibility', condition)
 				header.visibility = condition
 			end
-		end
+		end]]
 
 		return header
 	end
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/templates.lua b/2/3/4/5/6/7/ElvUI/Libraries/oUF/templates.lua
new file mode 100644
index 0000000..06c0ba2
--- /dev/null
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/templates.lua
@@ -0,0 +1,461 @@
+local pairs = pairs
+local ipairs = ipairs
+
+local unitExistsWatchers = {}
+local unitExistsCache = setmetatable({},{
+	__index = function(t, k)
+		local v = UnitExists(k) or false
+		t[k] = v
+		return v
+	end
+})
+
+local function updateUnitWatch(frame)
+	local unit = frame.unit
+	local exists = (unit and unitExistsCache[unit])
+	if exists then
+		if not frame:IsShown() then
+			frame:Show()
+		else
+		--	frame:UpdateAllElements('RefreshUnit')
+		end
+	elseif frame:IsShown() then
+		frame:Hide()
+	end
+end
+
+local unitWatch = CreateFrame("Frame")
+unitWatch:Hide()
+
+local timer = 0
+unitWatch:SetScript("OnUpdate", function()
+	timer = timer - arg1
+	if timer <= 0 then
+		timer = 0.2
+
+		for k in pairs(unitExistsCache) do
+			unitExistsCache[k] = nil
+		end
+		for frame in pairs(unitExistsWatchers) do
+			updateUnitWatch(frame)
+		end
+	end
+end)
+unitWatch:SetScript("OnEvent", function() timer = 0 end)
+
+unitWatch:RegisterEvent("PLAYER_TARGET_CHANGED")
+unitWatch:RegisterEvent("PLAYER_REGEN_DISABLED")
+unitWatch:RegisterEvent("PLAYER_REGEN_ENABLED")
+unitWatch:RegisterEvent("UNIT_PET")
+unitWatch:RegisterEvent("RAID_ROSTER_UPDATE")
+unitWatch:RegisterEvent("PARTY_MEMBERS_CHANGED")
+
+function RegisterUnitWatch(frame)
+	unitExistsWatchers[frame] = true
+	unitWatch:Show()
+	updateUnitWatch(frame)
+end
+
+function UnregisterUnitWatch(frame)
+	unitExistsWatchers[frame] = nil
+end
+
+--[[
+List of the various configuration attributes
+======================================================
+showRaid = [BOOLEAN] -- true if the header should be shown while in a raid
+showParty = [BOOLEAN] -- true if the header should be shown while in a party and not in a raid
+showPlayer = [BOOLEAN] -- true if the header should show the player when not in a raid
+showSolo = [BOOLEAN] -- true if the header should be shown while not in a group (implies showPlayer)
+nameList = [STRING] -- a comma separated list of player names (not used if 'groupFilter' is set)
+groupFilter = [1-8, STRING] -- a comma seperated list of raid group numbers and/or uppercase class names and/or uppercase roles
+strictFiltering = [BOOLEAN] - if true, then characters must match both a group and a class from the groupFilter list
+point = [STRING] -- a valid XML anchoring point (Default: "TOP")
+xOffset = [NUMBER] -- the x-Offset to use when anchoring the unit buttons (Default: 0)
+yOffset = [NUMBER] -- the y-Offset to use when anchoring the unit buttons (Default: 0)
+sortMethod = ["INDEX", "NAME"] -- defines how the group is sorted (Default: "INDEX")
+sortDir = ["ASC", "DESC"] -- defines the sort order (Default: "ASC")
+template = [STRING] -- the XML template to use for the unit buttons
+templateType = [STRING] - specifies the frame type of the managed subframes (Default: "Button")
+groupBy = [nil, "GROUP", "CLASS", "ROLE"] - specifies a "grouping" type to apply before regular sorting (Default: nil)
+groupingOrder = [STRING] - specifies the order of the groupings (ie. "1,2,3,4,5,6,7,8")
+maxColumns = [NUMBER] - maximum number of columns the header will create (Default: 1)
+unitsPerColumn = [NUMBER or nil] - maximum units that will be displayed in a singe column, nil is infinate (Default: nil)
+startingIndex = [NUMBER] - the index in the final sorted unit list at which to start displaying units (Default: 1)
+columnSpacing = [NUMBER] - the ammount of space between the rows/columns (Default: 0)
+columnAnchorPoint = [STRING] - the anchor point of each new column (ie. use LEFT for the columns to grow to the right)
+--]]
+
+function SecureGroupHeader_OnEvent()
+	if (event == "PARTY_MEMBERS_CHANGED" or event == "RAID_ROSTER_UPDATE") and this:IsVisible() then
+		SecureGroupHeader_Update(this)
+	end
+end
+
+-- relativePoint, xMultiplier, yMultiplier = getRelativePointAnchor( point )
+-- Given a point return the opposite point and which axes the point
+-- depends on.
+local function getRelativePointAnchor( point )
+	if not point then return end
+
+	point = strupper(point)
+	if point == "TOP" then
+		return "BOTTOM", 0, -1;
+	elseif point == "BOTTOM" then
+		return "TOP", 0, 1
+	elseif point == "LEFT" then
+		return "RIGHT", 1, 0
+	elseif point == "RIGHT" then
+		return "LEFT", -1, 0
+	elseif point == "TOPLEFT" then
+		return "BOTTOMRIGHT", 1, -1
+	elseif point == "TOPRIGHT" then
+		return "BOTTOMLEFT", -1, -1
+	elseif point == "BOTTOMLEFT" then
+		return "TOPRIGHT", 1, 1
+	elseif point == "BOTTOMRIGHT" then
+		return "TOPLEFT", -1, 1
+	else
+		return "CENTER", 0, 0
+	end
+end
+
+function ApplyUnitButtonConfiguration( frame )
+   -- for i = 1, getn(arg), 1 do
+	--	  local frame = arg[i];
+
+		--if ( unitWatch ) then
+	   --	  if ( unitWatch == "state" ) then
+		--		  RegisterUnitWatch(frame, true);
+		--	  else
+				RegisterUnitWatch(frame);
+	   --	  end
+		--end
+
+		-- call this function recursively for the current frame's children
+   --	  ApplyUnitButtonConfiguration(frame:GetChildren());
+   -- end
+end
+
+local function ApplyConfig(header, newChild, defaultConfigFunction)
+	local configFunction = header.initialConfigFunction or defaultConfigFunction
+	if type(configFunction) == "function" then
+		configFunction(newChild)
+		return true
+	end
+end
+
+function SetupUnitButtonConfiguration(header, newChild, defaultConfigFunction)
+	if ApplyConfig(header, newChild, defaultConfigFunction) then
+		ApplyUnitButtonConfiguration(newChild)
+	end
+end
+
+-- empties tbl and assigns the value true to each key passed as part of ...
+local function fillTable(tbl, ...)
+	for key in pairs(tbl) do
+		tbl[key] = nil
+	end
+	for i = 1, getn(arg), 1 do
+		local key = arg[i]
+		key = tonumber(key) or key
+		tbl[key] = true
+	end
+end
+
+-- same as fillTable() except that each key is also stored in
+-- the array portion of the table in order
+local function doubleFillTable(tbl, ...)
+	fillTable(tbl, unpack(arg))
+	for i = 1, getn(arg), 1 do
+		tbl[i] = arg[i]
+	end
+end
+
+--working tables
+local tokenTable = {}
+local sortingTable = {}
+local groupingTable = {}
+local tempTable = {}
+
+-- creates child frames and finished configuring them
+local function configureChildren(self)
+	local point = self:GetAttribute("point") or "TOP" --default anchor point of "TOP"
+	local relativePoint, xOffsetMult, yOffsetMult = getRelativePointAnchor(point)
+	local xMultiplier, yMultiplier =  abs(xOffsetMult), abs(yOffsetMult)
+	local xOffset = self:GetAttribute("xOffset") or 0 --default of 0
+	local yOffset = self:GetAttribute("yOffset") or 0 --default of 0
+	local sortDir = self:GetAttribute("sortDir") or "ASC"; --sort ascending by default
+	local columnSpacing = self:GetAttribute("columnSpacing") or 0
+	local startingIndex = self:GetAttribute("startingIndex") or 1
+
+	local unitCount = getn(sortingTable)
+	local numDisplayed = unitCount - (startingIndex - 1)
+	local unitsPerColumn = self:GetAttribute("unitsPerColumn")
+	local numColumns
+	if unitsPerColumn and numDisplayed > unitsPerColumn then
+		numColumns = min(ceil(numDisplayed / unitsPerColumn), (self:GetAttribute("maxColumns") or 1))
+	else
+		unitsPerColumn = numDisplayed
+		numColumns = 1
+	end
+	local loopStart = startingIndex
+	local loopFinish = min((startingIndex - 1) + unitsPerColumn * numColumns, unitCount)
+	local step = 1
+
+	numDisplayed = loopFinish - (loopStart - 1)
+
+	if sortDir == "DESC" then
+		loopStart = unitCount - (startingIndex - 1)
+		loopFinish = loopStart - (numDisplayed - 1)
+		step = -1
+	end
+
+	-- ensure there are enough buttons
+	local needButtons = max(1, numDisplayed)
+	if not self:GetAttribute("child"..needButtons) then
+		local name = self:GetName()
+		if not name then
+			self:Hide()
+			return
+		end
+		for i = 1, needButtons, 1 do
+			local childAttr = "child"..i
+			if not self:GetAttribute(childAttr) then
+				local newButton = CreateFrame("Button", name.."UnitButton"..i, self)
+				SetupUnitButtonConfiguration(self, newButton)
+				self:SetAttribute(childAttr, newButton)
+			end
+		end
+	end
+
+	local columnAnchorPoint, columnRelPoint, colxMulti, colyMulti
+	if numColumns > 1 then
+		columnAnchorPoint = self:GetAttribute("columnAnchorPoint")
+		columnRelPoint, colxMulti, colyMulti = getRelativePointAnchor(columnAnchorPoint)
+	end
+
+	local buttonNum = 0
+	local columnNum = 1
+	local columnUnitCount = 0
+	local currentAnchor = self
+
+	for i = loopStart, loopFinish, step do
+		buttonNum = buttonNum + 1
+		columnUnitCount = columnUnitCount + 1
+		if columnUnitCount > unitsPerColumn then
+			columnUnitCount = 1
+			columnNum = columnNum + 1
+		end
+
+		local unitButton = self:GetAttribute("child"..buttonNum);
+		unitButton:Hide()
+		unitButton:ClearAllPoints()
+		if buttonNum == 1 then
+			unitButton:SetPoint(point, currentAnchor, point, 0, 0)
+			if columnAnchorPoint then
+				unitButton:SetPoint(columnAnchorPoint, currentAnchor, columnAnchorPoint, 0, 0)
+			end
+		elseif columnUnitCount == 1 then
+			local columnAnchor = self:GetAttribute("child"..(buttonNum - unitsPerColumn))
+			unitButton:SetPoint(columnAnchorPoint, columnAnchor, columnRelPoint, colxMulti * columnSpacing, colyMulti * columnSpacing)
+		else
+			unitButton:SetPoint(point, currentAnchor, relativePoint, xMultiplier * xOffset, yMultiplier * yOffset)
+		end
+		unitButton.unit = sortingTable[sortingTable[i]]
+		unitButton:Show()
+
+		currentAnchor = unitButton
+	end
+	repeat
+		buttonNum = buttonNum + 1
+		local unitButton = self:GetAttribute("child"..buttonNum)
+		if unitButton then
+			unitButton:Hide()
+			unitButton.unit = nil
+		end
+	until not unitButton
+
+	local unitButton = self:GetAttribute("child1")
+	local unitButtonWidth = unitButton:GetWidth()
+	local unitButtonHeight = unitButton:GetHeight()
+	if numDisplayed > 0 then
+		local width = xMultiplier * (unitsPerColumn - 1) * unitButtonWidth + ((unitsPerColumn - 1) * (xOffset * xOffsetMult)) + unitButtonWidth
+		local height = yMultiplier * (unitsPerColumn - 1) * unitButtonHeight + ((unitsPerColumn - 1) * (yOffset * yOffsetMult)) + unitButtonHeight
+
+		if numColumns > 1 then
+			width = width + ((numColumns -1) * abs(colxMulti) * (width + columnSpacing))
+			height = height + ((numColumns -1) * abs(colyMulti) * (height + columnSpacing))
+		end
+
+		self:SetWidth(width)
+		self:SetHeight(height)
+	else
+		local minWidth = self:GetAttribute("minWidth") or (yMultiplier * unitButtonWidth)
+		local minHeight = self:GetAttribute("minHeight") or (xMultiplier * unitButtonHeight)
+		self:SetWidth(max(minWidth, 0.1))
+		self:SetHeight(max(minHeight, 0.1))
+	end
+end
+
+local function GetGroupHeaderType(self)
+	local type, start, stop
+
+	local nRaid = GetNumRaidMembers()
+	local nParty = GetNumPartyMembers()
+	if nRaid > 0 and self:GetAttribute("showRaid") then
+		type = "RAID";
+	elseif (nRaid > 0 or nParty > 0) and self:GetAttribute("showParty") then
+		type = "PARTY"
+	elseif self:GetAttribute("showSolo") then
+		type = "SOLO"
+	end
+	if type then
+		if type == "RAID" then
+			start = 1
+			stop = nRaid
+		else
+			if type == "SOLO" or self:GetAttribute("showPlayer") then
+				start = 0
+			else
+				start = 1
+			end
+			stop = nParty
+		end
+	end
+
+	return type, start, stop
+end
+
+local function GetGroupRosterInfo(type, index)
+	local _, unit, name, subgroup, className
+	if type == "RAID" then
+		unit = "raid"..index
+		name, _, subgroup, _, _, className = GetRaidRosterInfo(index)
+	else
+		if index > 0 then
+			unit = "party"..index
+		else
+			unit = "player"
+		end
+		if UnitExists(unit) then
+			name = UnitName(unit)
+			_, className = UnitClass(unit)
+		end
+		subgroup = 1
+	end
+	return unit, name, subgroup, className
+end
+
+function SecureGroupHeader_Update(self)
+	local nameList = self:GetAttribute("nameList")
+	local groupFilter = self:GetAttribute("groupFilter")
+	local sortMethod = self:GetAttribute("sortMethod")
+	local groupBy = self:GetAttribute("groupBy")
+
+	for key in pairs(sortingTable) do
+		sortingTable[key] = nil
+	end
+	table.setn(sortingTable, 0)
+
+	-- See if this header should be shown
+	local type, start, stop = GetGroupHeaderType(self)
+	if not type then
+		configureChildren(self)
+		return
+	end
+
+	if not groupFilter and not nameList then
+		groupFilter = "1,2,3,4,5,6,7,8";
+	end
+
+	if groupFilter then
+		-- filtering by a list of group numbers and/or classes
+		fillTable(tokenTable, strsplit(",", groupFilter));
+		local strictFiltering = self:GetAttribute("strictFiltering"); -- non-strict by default
+		for i = start, stop, 1 do
+			local unit, name, subgroup, className = GetGroupRosterInfo(type, i)
+			if name and ((not strictFiltering) and (tokenTable[subgroup] or tokenTable[className])) or (tokenTable[subgroup] and tokenTable[className]) then
+				tinsert(sortingTable, name)
+				sortingTable[name] = unit
+				if groupBy == "GROUP" then
+					groupingTable[name] = subgroup
+				elseif groupBy == "CLASS" then
+					groupingTable[name] = className
+				end
+			end
+		end
+
+		if groupBy then
+			local groupingOrder = self:GetAttribute("groupingOrder")
+			doubleFillTable(tokenTable, strsplit(",", groupingOrder))
+			for k in pairs(tempTable) do
+				tempTable[k] = nil
+			end
+			for _, grouping in ipairs(tokenTable) do
+				grouping = tonumber(grouping) or grouping
+				for k in ipairs(groupingTable) do
+					groupingTable[k] = nil
+				end
+				table.setn(groupingTable, 0)
+				for index, name in ipairs(sortingTable) do
+					if groupingTable[name] == grouping then
+						tinsert(groupingTable, name)
+						tempTable[name] = true
+					end
+				end
+				if sortMethod == "NAME" then -- sort by ID by default
+					table.sort(groupingTable)
+				end
+				for _, name in ipairs(groupingTable) do
+					tinsert(tempTable, name)
+				end
+			end
+			-- handle units whose group didn't appear in groupingOrder
+			for k in ipairs(groupingTable) do
+				groupingTable[k] = nil
+			end
+			table.setn(groupingTable, 0)
+
+			for index, name in ipairs(sortingTable) do
+				if not tempTable[name] then
+					tinsert(groupingTable, name)
+				end
+			end
+			if sortMethod == "NAME" then -- sort by ID by default
+				table.sort(groupingTable)
+			end
+			for _, name in ipairs(groupingTable) do
+				tinsert(tempTable, name)
+			end
+
+			--copy the names back to sortingTable
+			for index, name in ipairs(tempTable) do
+				sortingTable[index] = name
+			end
+
+		elseif sortMethod == "NAME" then -- sort by ID by default
+			table.sort(sortingTable)
+		end
+	else
+		-- filtering via a list of names
+		doubleFillTable(sortingTable, strsplit(",", nameList))
+		for i = start, stop, 1 do
+			local unit, name = GetGroupRosterInfo(type, i)
+			if sortingTable[name] then
+				sortingTable[name] = unit
+			end
+		end
+		for i = getn(sortingTable), 1, -1 do
+			local name = sortingTable[i]
+			if sortingTable[name] == true then
+				tremove(sortingTable, i)
+			end
+		end
+		if sortMethod == "NAME" then
+			table.sort(sortingTable)
+		end
+	end
+
+	configureChildren(self)
+end
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/templates.xml b/2/3/4/5/6/7/ElvUI/Libraries/oUF/templates.xml
new file mode 100644
index 0000000..2fd459d
--- /dev/null
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/templates.xml
@@ -0,0 +1,16 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Frame name="oUF_GroupHeaderTemplate" hidden="true" virtual="true">
+		<Scripts>
+			<OnLoad>
+				this:RegisterEvent("PARTY_MEMBERS_CHANGED")
+				this:RegisterEvent("RAID_ROSTER_UPDATE")
+			</OnLoad>
+			<OnEvent>
+				SecureGroupHeader_OnEvent(this, event)
+			</OnEvent>
+			<OnShow>
+				SecureGroupHeader_Update(this)
+			</OnShow>
+		</Scripts>
+	</Frame>
+</Ui>
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/units.lua b/2/3/4/5/6/7/ElvUI/Libraries/oUF/units.lua
index 3586799..55f216d 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/oUF/units.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/units.lua
@@ -12,8 +12,6 @@ function oUF:HandleUnit(object, unit)
 		object:RegisterEvent('PLAYER_TARGET_CHANGED', object.UpdateAllElements)
 	elseif(unit == 'mouseover') then
 		object:RegisterEvent('UPDATE_MOUSEOVER_UNIT', object.UpdateAllElements)
-	elseif(unit == 'focus') then
-		object:RegisterEvent('PLAYER_FOCUS_CHANGED', object.UpdateAllElements)
 	elseif(string.match(unit, '%w+target')) then
 		enableTargetUpdate(object)
 	end
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua
index 554a4a1..981c7ef 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua
@@ -61,7 +61,7 @@ function LoadSkin()
 		skinPulloutFrames()
 	end)
 
-	hooksecurefunc("RaidPullout_Update", function(pullOutFrame)
+	--[[hooksecurefunc("RaidPullout_Update", function(pullOutFrame)
 		local pfName = pullOutFrame:GetName()
 		for i = 1, pullOutFrame.numPulloutButtons do
 			local pfBName = pfName.."Button"..i
@@ -88,7 +88,7 @@ function LoadSkin()
 				_G[pfBName.."TargetTargetFrame"].backdrop:SetPoint("BOTTOMRIGHT", -(E.PixelMode and 10 or 9), E.PixelMode and 8 or 7)
 			end
 		end
-	end)
+	end)]]
 
 	-- ReadyCheckFrame
 	E:StripTextures(ReadyCheckFrame)
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua b/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua
index 0ad2399..870cb7e 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua
@@ -4,8 +4,11 @@ local TT = E:NewModule("Tooltip", "AceHook-3.0", "AceEvent-3.0");
 --Cache global variables
 --Lua functions
 local unpack = unpack
+local twipe, tinsert, tconcat = table.wipe, table.insert, table.concat
 --WoW API / Variables
 
+local targetList, inspectCache = {}, {}
+
 local classification = {
 	worldboss = format("|cffAF5050 %s|r", BOSS),
 	rareelite = format("|cffAF5050+ %s|r", ITEM_QUALITY3_DESC),
@@ -149,6 +152,37 @@ function TT:UPDATE_MOUSEOVER_UNIT(_, unit)
 		end
 	end
 
+	local unitTarget = unit.."target"
+	if self.db.targetInfo and unit ~= "player" and UnitExists(unitTarget) then
+		local targetColor;
+		if UnitIsPlayer(unitTarget) then
+			local _, class = UnitClass(unitTarget);
+			targetColor = CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[class] or RAID_CLASS_COLORS[class];
+		else
+			local reaction = UnitReaction(unitTarget, "player") or 4
+			targetColor = E.db.tooltip.useCustomFactionColors and E.db.tooltip.factionColors[reaction] or FACTION_BAR_COLORS[reaction]
+		end
+
+		GameTooltip:AddDoubleLine(format("%s:", TARGET), format("|cff%02x%02x%02x%s|r", targetColor.r * 255, targetColor.g * 255, targetColor.b * 255, UnitName(unitTarget)))
+	end
+
+	local numParty, numRaid = GetNumPartyMembers(), GetNumRaidMembers()
+	if self.db.targetInfo and (numParty > 0 or numRaid > 0) then
+		for i = 1, (numRaid > 0 and numRaid or numParty) do
+			local groupUnit = (numRaid > 0 and "raid"..i or "party"..i)
+			if UnitIsUnit(groupUnit.."target", unit) and (not UnitIsUnit(groupUnit,"player")) then
+				local _, class = UnitClass(groupUnit)
+				local color = CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[class] or RAID_CLASS_COLORS[class]
+				tinsert(targetList, format("%s%s", E:RGBToHex(color.r, color.g, color.b), UnitName(groupUnit)))
+			end
+		end
+		local numList = getn(targetList)
+		if numList > 0 then
+			GameTooltip:AddLine(format("%s (|cffffffff%d|r): %s", L["Targeted By:"], numList, tconcat(targetList, ", ")), nil, nil, nil, true)
+			twipe(targetList)
+		end
+	end
+
 	if color then
 		GameTooltipStatusBar:SetStatusBarColor(color.r, color.g, color.b)
 	else
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Load_Groups.xml b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Load_Groups.xml
new file mode 100644
index 0000000..22ccc83
--- /dev/null
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Load_Groups.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="Party.lua"/>
+	<Script file="Raid.lua"/>
+</Ui>
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Party.lua b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Party.lua
new file mode 100644
index 0000000..dad1bba
--- /dev/null
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Party.lua
@@ -0,0 +1,149 @@
+local E, L, V, P, G = unpack(ElvUI)
+local UF = E:GetModule("UnitFrames")
+
+local _G = _G
+local tinsert = table.insert
+
+local CreateFrame = CreateFrame;
+local InCombatLockdown = InCombatLockdown;
+local UnregisterStateDriver = UnregisterStateDriver;
+local RegisterStateDriver = RegisterStateDriver;
+local IsInInstance = IsInInstance;
+
+local ns = oUF
+local ElvUF = ns.oUF
+assert(ElvUF, "ElvUI was unable to locate oUF.")
+
+function UF:Construct_PartyFrames()
+	self:SetScript("OnEnter", UnitFrame_OnEnter)
+	self:SetScript("OnLeave", UnitFrame_OnLeave)
+
+	self.RaisedElementParent = CreateFrame("Frame", nil, self)
+	self.RaisedElementParent.TextureParent = CreateFrame("Frame", nil, self.RaisedElementParent)
+	self.RaisedElementParent:SetFrameLevel(self:GetFrameLevel() + 100)
+	self.BORDER = E.Border
+	self.SPACING = E.Spacing
+	self.SHADOW_SPACING = 3
+
+	self.Health = UF:Construct_HealthBar(self, true, true, "RIGHT");
+	self.Power = UF:Construct_PowerBar(self, true, true, "LEFT");
+	self.Power.frequentUpdates = false;
+	self.Portrait3D = UF:Construct_Portrait(self, "model");
+	self.Portrait2D = UF:Construct_Portrait(self, "texture");
+	self.InfoPanel = UF:Construct_InfoPanel(self);
+	self.Name = UF:Construct_NameText(self);
+
+	self.unitframeType = "party"
+
+	UF:Update_StatusBars()
+	UF:Update_FontStrings()
+
+	UF:Update_PartyFrames(self, UF.db["units"]["party"])
+
+	return self;
+end
+
+function UF:Update_PartyHeader(header, db)
+	header.db = db
+
+	if not header.positioned then
+		header:ClearAllPoints()
+		header:SetPoint("BOTTOMLEFT", E.UIParent, "BOTTOMLEFT", 4, 195)
+
+		E:CreateMover(header, header:GetName().."Mover", L["Party Frames"], nil, nil, nil, "ALL,PARTY,ARENA")
+		header.positioned = true
+
+		header:RegisterEvent("PLAYER_LOGIN")
+		header:RegisterEvent("ZONE_CHANGED_NEW_AREA")
+		header:SetScript("OnEvent", UF["PartySmartVisibility"])
+	end
+
+	UF.PartySmartVisibility(header)
+end
+
+function UF:PartySmartVisibility(event)
+	--if(not self.db or (self.db and not self.db.enable) or (UF.db and not UF.db.smartRaidFilter) or self.isForced) then
+	--	self.blockVisibilityChanges = false;
+	--	return;
+	--end
+
+	--if(event == "PLAYER_REGEN_ENABLED") then self:UnregisterEvent("PLAYER_REGEN_ENABLED"); end
+--self.blockVisibilityChanges = true;
+	--if(not InCombatLockdown()) then
+	--	local inInstance, instanceType = IsInInstance();
+	--	if(inInstance and (instanceType == "raid" or instanceType == "pvp")) then
+		--	UnregisterStateDriver(self, "visibility");
+		--	self:Hide();
+	--		self.blockVisibilityChanges = true;
+	--	elseif(self.db.visibility) then
+		--	RegisterStateDriver(self, "visibility", self.db.visibility);
+	--		self.blockVisibilityChanges = false;
+	--	end
+	--else
+	--	self:RegisterEvent("PLAYER_REGEN_ENABLED");
+	--end
+end
+
+function UF:Update_PartyFrames(frame, db)
+	frame.db = db
+
+	frame.Portrait = db.portrait.style == "2D" and frame.Portrait2D or frame.Portrait3D
+	frame.colors = ElvUF.colors
+	frame:RegisterForClicks(self.db.targetOnMouseDown and "LeftButtonDown" or "LeftButtonUp", self.db.targetOnMouseDown and "RightButtonDown" or "RightButtonUp")
+
+	do
+		if self.thinBorders then
+			frame.SPACING = 0
+			frame.BORDER = E.mult
+		else
+			frame.BORDER = E.Border
+			frame.SPACING = E.Spacing
+		end
+
+		frame.ORIENTATION = db.orientation
+		frame.UNIT_WIDTH = db.width
+		frame.UNIT_HEIGHT = db.infoPanel.enable and (db.height + db.infoPanel.height) or db.height
+
+		frame.USE_POWERBAR = db.power.enable
+		frame.POWERBAR_DETACHED = db.power.detachFromFrame
+		frame.USE_INSET_POWERBAR = not frame.POWERBAR_DETACHED and db.power.width == "inset" and frame.USE_POWERBAR
+		frame.USE_MINI_POWERBAR = (not frame.POWERBAR_DETACHED and db.power.width == "spaced" and frame.USE_POWERBAR)
+		frame.USE_POWERBAR_OFFSET = db.power.offset ~= 0 and frame.USE_POWERBAR and not frame.POWERBAR_DETACHED
+		frame.POWERBAR_OFFSET = frame.USE_POWERBAR_OFFSET and db.power.offset or 0
+
+		frame.POWERBAR_HEIGHT = not frame.USE_POWERBAR and 0 or db.power.height
+		frame.POWERBAR_WIDTH = frame.USE_MINI_POWERBAR and (frame.UNIT_WIDTH - (frame.BORDER*2))/2 or (frame.POWERBAR_DETACHED and db.power.detachedWidth or (frame.UNIT_WIDTH - ((frame.BORDER+frame.SPACING)*2)))
+
+		frame.USE_PORTRAIT = db.portrait and db.portrait.enable
+		frame.USE_PORTRAIT_OVERLAY = frame.USE_PORTRAIT and (db.portrait.overlay or frame.ORIENTATION == "MIDDLE")
+		frame.PORTRAIT_WIDTH = (frame.USE_PORTRAIT_OVERLAY or not frame.USE_PORTRAIT) and 0 or db.portrait.width
+
+		frame.CLASSBAR_WIDTH = 0
+		frame.CLASSBAR_YOFFSET = 0
+
+		frame.USE_INFO_PANEL = not frame.USE_MINI_POWERBAR and not frame.USE_POWERBAR_OFFSET and db.infoPanel.enable
+		frame.INFO_PANEL_HEIGHT = frame.USE_INFO_PANEL and db.infoPanel.height or 0
+
+		frame.BOTTOM_OFFSET = UF:GetHealthBottomOffset(frame)
+
+		frame.VARIABLES_SET = true
+	end
+
+	frame:SetWidth(frame.UNIT_WIDTH)
+	frame:SetHeight(frame.UNIT_HEIGHT)
+
+	UF:Configure_InfoPanel(frame)
+
+	UF:Configure_HealthBar(frame)
+
+	UF:UpdateNameSettings(frame)
+
+	UF:Configure_Power(frame)
+
+	UF:Configure_Portrait(frame)
+
+
+	frame:UpdateAllElements("ElvUI_UpdateAllElements");
+end
+
+UF["headerstoload"]["party"] = true
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Raid.lua b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Raid.lua
new file mode 100644
index 0000000..d5e1236
--- /dev/null
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Groups/Raid.lua
@@ -0,0 +1,167 @@
+local E, L, V, P, G = unpack(ElvUI)
+local UF = E:GetModule("UnitFrames")
+
+local tinsert = table.insert;
+
+local CreateFrame = CreateFrame
+local InCombatLockdown = InCombatLockdown
+local IsInInstance = IsInInstance
+local GetInstanceInfo = GetInstanceInfo
+local UnregisterStateDriver = UnregisterStateDriver
+local RegisterStateDriver = RegisterStateDriver
+
+local ns = oUF
+local ElvUF = ns.oUF
+assert(ElvUF, "ElvUI was unable to locate oUF.")
+
+function UF:Construct_RaidFrames()
+	self:SetScript("OnEnter", UnitFrame_OnEnter)
+	self:SetScript("OnLeave", UnitFrame_OnLeave)
+
+	self.RaisedElementParent = CreateFrame("Frame", nil, self)
+	self.RaisedElementParent.TextureParent = CreateFrame("Frame", nil, self.RaisedElementParent)
+	self.RaisedElementParent:SetFrameLevel(self:GetFrameLevel() + 100)
+
+	self.Health = UF:Construct_HealthBar(self, true, true, "RIGHT");
+	self.Power = UF:Construct_PowerBar(self, true, true, "LEFT");
+	self.Power.frequentUpdates = false;
+	self.Portrait3D = UF:Construct_Portrait(self, "model");
+	self.Portrait2D = UF:Construct_Portrait(self, "texture");
+	self.Name = UF:Construct_NameText(self);
+
+	self.InfoPanel = UF:Construct_InfoPanel(self);
+	UF:Update_StatusBars();
+	UF:Update_FontStrings();
+	self.unitframeType = "raid";
+
+	UF:Update_RaidFrames(self, UF.db["units"]["raid"]);
+
+	return self;
+end
+
+function UF:RaidSmartVisibility(event)
+	--[[if(not self.db or (self.db and not self.db.enable) or (UF.db and not UF.db.smartRaidFilter) or self.isForced) then
+		self.blockVisibilityChanges = false;
+		return;
+	end
+
+	if(event == "PLAYER_REGEN_ENABLED") then self:UnregisterEvent("PLAYER_REGEN_ENABLED"); end
+
+	if(not InCombatLockdown()) then
+		self.isInstanceForced = nil;
+		local inInstance, instanceType = IsInInstance();
+		if(inInstance and (instanceType == "raid" or instanceType == "pvp")) then
+			local _, _, _, _, maxPlayers = GetInstanceInfo();
+			local mapID = GetCurrentMapAreaID();
+			if(UF.mapIDs[mapID]) then
+				maxPlayers = UF.mapIDs[mapID];
+			end
+
+			UnregisterStateDriver(self, "visibility");
+
+			if(maxPlayers < 40) then
+				self:Show();
+				self.isInstanceForced = true;
+				self.blockVisibilityChanges = false;
+				if(ElvUF_Raid.numGroups ~= E:Round(maxPlayers/5) and event) then
+					UF:CreateAndUpdateHeaderGroup("raid");
+				end
+			else
+				self:Hide();
+				self.blockVisibilityChanges = true;
+			end
+		elseif(self.db.visibility) then
+			RegisterStateDriver(self, "visibility", self.db.visibility);
+			self.blockVisibilityChanges = false;
+			if(ElvUF_Raid.numGroups ~= self.db.numGroups) then
+				UF:CreateAndUpdateHeaderGroup("raid");
+			end
+		end
+	else
+		self:RegisterEvent("PLAYER_REGEN_ENABLED");
+		return;
+	end]]
+end
+
+function UF:Update_RaidHeader(header, db)
+	header.db = db;
+
+	if not header.positioned then
+		header:ClearAllPoints()
+		header:SetPoint("BOTTOMLEFT", E.UIParent, "BOTTOMLEFT", 4, 195)
+
+		E:CreateMover(header, header:GetName().."Mover", L["Raid Frames"], nil, nil, nil, "ALL,RAID")
+
+	--	header:RegisterEvent("PLAYER_LOGIN")
+	--	header:RegisterEvent("ZONE_CHANGED_NEW_AREA")
+	--	header:SetScript("OnEvent", UF["RaidSmartVisibility"])
+		header.positioned = true
+	end
+
+	--UF.RaidSmartVisibility(header)
+end
+
+function UF:Update_RaidFrames(frame, db)
+	frame.db = db
+
+	frame.Portrait = frame.Portrait or (db.portrait.style == "2D" and frame.Portrait2D or frame.Portrait3D)
+	frame.colors = ElvUF.colors
+	--frame:RegisterForClicks(self.db.targetOnMouseDown and "AnyDown" or "AnyUp")
+
+	do
+		if self.thinBorders then
+			frame.SPACING = 0
+			frame.BORDER = E.mult
+		else
+			frame.BORDER = E.Border
+			frame.SPACING = E.Spacing
+		end
+
+		frame.SHADOW_SPACING = 3
+		frame.ORIENTATION = db.orientation
+
+		frame.UNIT_WIDTH = db.width
+		frame.UNIT_HEIGHT = db.infoPanel.enable and (db.height + db.infoPanel.height) or db.height
+
+		frame.USE_POWERBAR = db.power.enable
+		frame.POWERBAR_DETACHED = db.power.detachFromFrame
+		frame.USE_INSET_POWERBAR = not frame.POWERBAR_DETACHED and db.power.width == "inset" and frame.USE_POWERBAR
+		frame.USE_MINI_POWERBAR = (not frame.POWERBAR_DETACHED and db.power.width == "spaced" and frame.USE_POWERBAR)
+		frame.USE_POWERBAR_OFFSET = db.power.offset ~= 0 and frame.USE_POWERBAR and not frame.POWERBAR_DETACHED
+		frame.POWERBAR_OFFSET = frame.USE_POWERBAR_OFFSET and db.power.offset or 0
+
+		frame.POWERBAR_HEIGHT = not frame.USE_POWERBAR and 0 or db.power.height
+		frame.POWERBAR_WIDTH = frame.USE_MINI_POWERBAR and (frame.UNIT_WIDTH - (frame.BORDER*2))/2 or (frame.POWERBAR_DETACHED and db.power.detachedWidth or (frame.UNIT_WIDTH - ((frame.BORDER+frame.SPACING)*2)))
+
+		frame.USE_PORTRAIT = db.portrait and db.portrait.enable
+		frame.USE_PORTRAIT_OVERLAY = frame.USE_PORTRAIT and (db.portrait.overlay or frame.ORIENTATION == "MIDDLE")
+		frame.PORTRAIT_WIDTH = (frame.USE_PORTRAIT_OVERLAY or not frame.USE_PORTRAIT) and 0 or db.portrait.width
+
+		frame.CLASSBAR_WIDTH = 0
+		frame.CLASSBAR_YOFFSET = 0
+
+		frame.USE_INFO_PANEL = not frame.USE_MINI_POWERBAR and not frame.USE_POWERBAR_OFFSET and db.infoPanel.enable
+		frame.INFO_PANEL_HEIGHT = frame.USE_INFO_PANEL and db.infoPanel.height or 0
+
+		frame.BOTTOM_OFFSET = UF:GetHealthBottomOffset(frame)
+
+		frame.VARIABLES_SET = true
+	end
+
+	frame:SetWidth(frame.UNIT_WIDTH)
+	frame:SetHeight(frame.UNIT_HEIGHT)
+
+	UF:Configure_InfoPanel(frame)
+
+	UF:Configure_HealthBar(frame)
+
+	UF:UpdateNameSettings(frame)
+
+	UF:Configure_Power(frame)
+
+	UF:Configure_Portrait(frame)
+
+	frame:UpdateAllElements("ElvUI_UpdateAllElements")
+end
+
+UF["headerstoload"]["raid"] = true
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Load_UnitFrames.xml b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Load_UnitFrames.xml
index 48db7ca..ecbb659 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Load_UnitFrames.xml
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Load_UnitFrames.xml
@@ -3,4 +3,5 @@
 	<Script file="Tags.lua"/>
 	<Include file="Elements\Load_Elements.xml"/>
 	<Include file="Units\Load_Units.xml"/>
+	<Include file="Groups\Load_Groups.xml"/>
 </Ui>
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/UnitFrames.lua b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/UnitFrames.lua
index 67f6ca4..1e6f26c 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/UnitFrames.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/UnitFrames.lua
@@ -65,11 +65,6 @@ UF["headerGroupBy"] = {
 		header:SetAttribute("sortMethod", "NAME")
 		header:SetAttribute("groupBy", "CLASS")
 	end,
-	["MTMA"] = function(header)
-		header:SetAttribute("groupingOrder", "MAINTANK,MAINASSIST,NONE")
-		header:SetAttribute("sortMethod", "NAME")
-		header:SetAttribute("groupBy", "ROLE")
-	end,
 	["NAME"] = function(header)
 		header:SetAttribute("groupingOrder", "1,2,3,4,5,6,7,8")
 		header:SetAttribute("sortMethod", "NAME")
@@ -577,11 +572,12 @@ function UF.groupPrototype:Configure_Groups(self)
 
 	if self.mover then
 		self.mover.positionOverride = DIRECTION_TO_GROUP_ANCHOR_POINT[direction]
-		E:UpdatePositionOverride(self.mover:GetName())
-		self:GetScript("OnSizeChanged")(self) --Mover size is not updated if frame is hidden, so call an update manually
+		--E:UpdatePositionOverride(self.mover:GetName())
+		--self:GetScript("OnSizeChanged")(self) --Mover size is not updated if frame is hidden, so call an update manually
 	end
 
-	self:SetSize(width - db.horizontalSpacing, height - db.verticalSpacing)
+	self:SetWidth(width - db.horizontalSpacing)
+	self:SetHeight(height - db.verticalSpacing)
 end
 
 function UF.groupPrototype:Update(self)
@@ -603,7 +599,7 @@ function UF.groupPrototype:AdjustVisibility(self)
 				group:Show()
 			else
 				if group.forceShow then
-					group:Hide()
+					--group:Hide()
 					UF:UnshowChildUnits(group, group:GetChildren())
 					group:SetAttribute("startingIndex", 1)
 				else
@@ -650,7 +646,7 @@ function UF.headerPrototype:Update(isForced)
 end
 
 function UF.headerPrototype:Reset()
-	self:Hide()
+	--self:Hide()
 
 	self:SetAttribute("showPlayer", true)
 
@@ -685,7 +681,7 @@ function UF:CreateHeader(parent, groupFilter, overrideName, template, groupName,
 			"groupFilter", groupFilter,
 			"showParty", true,
 			"showRaid", true,
-			"showSolo", true,
+			"showSolo", false,
 			template and "template", template)
 
 	header.groupName = group
@@ -761,7 +757,7 @@ function UF:CreateAndUpdateHeaderGroup(group, groupFilter, template, headerUpdat
 		if headerUpdate or not self[group].mover then
 			UF["headerFunctions"][group]:Configure_Groups(self[group])
 			if not self[group].isForced and not self[group].blockVisibilityChanges then
-				RegisterStateDriver(self[group], "visibility", db.visibility)
+			--	RegisterStateDriver(self[group], "visibility", db.visibility)
 			end
 		else
 			UF["headerFunctions"][group]:Configure_Groups(self[group])
@@ -774,8 +770,8 @@ function UF:CreateAndUpdateHeaderGroup(group, groupFilter, template, headerUpdat
 				E:EnableMover(self[group].mover:GetName())
 			end
 		else
-			UnregisterStateDriver(self[group], "visibility")
-			self[group]:Hide()
+		--	UnregisterStateDriver(self[group], "visibility")
+		--	self[group]:Hide()
 			if self[group].mover then
 				E:DisableMover(self[group].mover:GetName())
 			end
@@ -789,7 +785,7 @@ function UF:CreateAndUpdateHeaderGroup(group, groupFilter, template, headerUpdat
 			local db = UF.db["units"][group]
 			if db.enable ~= true then
 				UnregisterStateDriver(UF[group], "visibility")
-				UF[group]:Hide()
+				--UF[group]:Hide()
 				if(UF[group].mover) then
 					E:DisableMover(UF[group].mover:GetName())
 				end
@@ -904,10 +900,11 @@ function UF:UpdateAllHeaders(event)
 			shouldUpdateHeader = true
 		end
 		self:CreateAndUpdateHeaderGroup(group, nil, nil, shouldUpdateHeader)
-
+header:Hide()
+header:Show()
 		if group == "party" or group == "raid" or group == "raid40" then
 			--Update BuffIndicators on profile change as they might be using profile specific data
-			self:UpdateAuraWatchFromHeader(group)
+			--self:UpdateAuraWatchFromHeader(group)
 		end
 	end
 end
diff --git a/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua b/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua
index 339b415..8f0c84c 100644
--- a/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua
+++ b/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua
@@ -4636,2135 +4636,7 @@ E.Options.args.unitframe.args.arena = {
 	},
 }
 
-local groupPoints = {
-	["TOP"] = "TOP",
-	["BOTTOM"] = "BOTTOM",
-	["LEFT"] = "LEFT",
-	["RIGHT"] = "RIGHT",
-}
 
---Party Frames
-E.Options.args.unitframe.args.party = {
-	name = L["Party Frames"],
-	type = "group",
-	order = 1100,
-	childGroups = "tab",
-	get = function(info) return E.db.unitframe.units["party"][ info[getn(info)] ] end,
-	set = function(info, value) E.db.unitframe.units["party"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-	disabled = function() return not E.UnitFrames; end,
-	args = {
-		configureToggle = {
-			order = 1,
-			type = "execute",
-			name = L["Display Frames"],
-			func = function()
-				UF:HeaderConfig(ElvUF_Party, ElvUF_Party.forceShow ~= true or nil)
-			end,
-		},
-		resetSettings = {
-			type = "execute",
-			order = 2,
-			name = L["Restore Defaults"],
-			func = function(info, value) UF:ResetUnitSettings("party"); E:ResetMovers(L["Party Frames"]) end,
-		},
-		copyFrom = {
-			type = "select",
-			order = 3,
-			name = L["Copy From"],
-			desc = L["Select a unit to copy settings from."],
-			values = {
-				["raid"] = L["Raid Frames"],
-				["raid40"] = L["Raid40 Frames"],
-			},
-			set = function(info, value) UF:MergeUnitSettings(value, "party", true); end,
-		},
-		customText = GetOptionsTable_CustomText(UF.CreateAndUpdateHeaderGroup, "party", nil, 4),
-		generalGroup = {
-			order = 5,
-			type = "group",
-			name = L["General"],
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["General"],
-				},
-				enable = {
-					type = "toggle",
-					order = 2,
-					name = L["Enable"],
-				},
-				hideonnpc = {
-					type = "toggle",
-					order = 3,
-					name = L["Text Toggle On NPC"],
-					desc = L["Power text will be hidden on NPC targets, in addition the name text will be repositioned to the power texts anchor point."],
-					get = function(info) return E.db.unitframe.units["party"]["power"].hideonnpc end,
-					set = function(info, value) E.db.unitframe.units["party"]["power"].hideonnpc = value; UF:CreateAndUpdateHeaderGroup("party"); end,
-				},
-				rangeCheck = {
-					order = 4,
-					name = L["Range Check"],
-					desc = L["Check if you are in range to cast spells on this specific unit."],
-					type = "toggle",
-				},
-				healPrediction = {
-					order = 5,
-					name = L["Heal Prediction"],
-					desc = L["Show an incoming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."],
-					type = "toggle",
-				},
-				threatStyle = {
-					type = "select",
-					order = 6,
-					name = L["Threat Display Mode"],
-					values = threatValues,
-				},
-				colorOverride = {
-					order = 7,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-				orientation = {
-					order = 8,
-					type = "select",
-					name = L["Frame Orientation"],
-					desc = L["Set the orientation of the UnitFrame."],
-					values = {
-						--["AUTOMATIC"] = L["Automatic"], not sure if i will use this yet
-						["LEFT"] = L["Left"],
-						["MIDDLE"] = L["Middle"],
-						["RIGHT"] = L["Right"],
-					},
-				},
-				targetGlow = {
-					order = 9,
-					type = "toggle",
-					name = L["Target Glow"],
-				},
-				positionsGroup = {
-					order = 100,
-					name = L["Size and Positions"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["party"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party", nil, nil, true) end,
-					args = {
-						width = {
-							order = 1,
-							name = L["Width"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["party"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-						},
-						height = {
-							order = 2,
-							name = L["Height"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["party"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-						},
-						spacer = {
-							order = 3,
-							name = "",
-							type = "description",
-							width = "full",
-						},
-						growthDirection = {
-							order = 4,
-							name = L["Growth Direction"],
-							desc = L["Growth direction from the first unitframe."],
-							type = "select",
-							values = {
-								DOWN_RIGHT = format(L["%s and then %s"], L["Down"], L["Right"]),
-								DOWN_LEFT = format(L["%s and then %s"], L["Down"], L["Left"]),
-								UP_RIGHT = format(L["%s and then %s"], L["Up"], L["Right"]),
-								UP_LEFT = format(L["%s and then %s"], L["Up"], L["Left"]),
-								RIGHT_DOWN = format(L["%s and then %s"], L["Right"], L["Down"]),
-								RIGHT_UP = format(L["%s and then %s"], L["Right"], L["Up"]),
-								LEFT_DOWN = format(L["%s and then %s"], L["Left"], L["Down"]),
-								LEFT_UP = format(L["%s and then %s"], L["Left"], L["Up"]),
-							},
-						},
-						numGroups = {
-							order = 7,
-							type = "range",
-							name = L["Number of Groups"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["party"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("party")
-								if ElvUF_Party.isForced then
-									UF:HeaderConfig(ElvUF_Party)
-									UF:HeaderConfig(ElvUF_Party, true)
-								end
-							end,
-						},
-						groupsPerRowCol = {
-							order = 8,
-							type = "range",
-							name = L["Groups Per Row/Column"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["party"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("party")
-								if ElvUF_Party.isForced then
-									UF:HeaderConfig(ElvUF_Party)
-									UF:HeaderConfig(ElvUF_Party, true)
-								end
-							end,
-						},
-						horizontalSpacing = {
-							order = 9,
-							type = "range",
-							name = L["Horizontal Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-						verticalSpacing = {
-							order = 10,
-							type = "range",
-							name = L["Vertical Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-					},
-				},
-				visibilityGroup = {
-					order = 200,
-					name = L["Visibility"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["party"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party", nil, nil, true) end,
-					args = {
-						showPlayer = {
-							order = 1,
-							type = "toggle",
-							name = L["Display Player"],
-							desc = L["When true, the header includes the player when not in a raid."],
-						},
-						visibility = {
-							order = 2,
-							type = "input",
-							name = L["Visibility"],
-							desc = L["The following macro must be true in order for the group to be shown, in addition to any filter that may already be set."],
-							width = "full",
-						},
-					},
-				},
-				sortingGroup = {
-					order = 300,
-					type = "group",
-					guiInline = true,
-					name = L["Grouping & Sorting"],
-					set = function(info, value) E.db.unitframe.units["party"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party", nil, nil, true) end,
-					args = {
-						groupBy = {
-							order = 1,
-							name = L["Group By"],
-							desc = L["Set the order that the group will sort."],
-							type = "select",
-							values = {
-								["CLASS"] = CLASS,
-								["NAME"] = NAME,
-								["MTMA"] = L["Main Tanks / Main Assist"],
-								["GROUP"] = GROUP,
-							},
-						},
-						sortDir = {
-							order = 2,
-							name = L["Sort Direction"],
-							desc = L["Defines the sort order of the selected sort method."],
-							type = "select",
-							values = {
-								["ASC"] = L["Ascending"],
-								["DESC"] = L["Descending"]
-							},
-						},
-						spacer = {
-							order = 3,
-							type = "description",
-							width = "full",
-							name = " "
-						},
-						raidWideSorting = {
-							order = 4,
-							name = L["Raid-Wide Sorting"],
-							desc = L["Enabling this allows raid-wide sorting however you will not be able to distinguish between groups."],
-							type = "toggle",
-						},
-						invertGroupingOrder = {
-							order = 5,
-							name = L["Invert Grouping Order"],
-							desc = L["Enabling this inverts the grouping order when the raid is not full, this will reverse the direction it starts from."],
-							disabled = function() return not E.db.unitframe.units["party"].raidWideSorting end,
-							type = "toggle",
-						},
-						startFromCenter = {
-							order = 6,
-							name = L["Start Near Center"],
-							desc = L["The initial group will start near the center and grow out."],
-							disabled = function() return not E.db.unitframe.units["party"].raidWideSorting end,
-							type = "toggle",
-						},
-					},
-				},
-			},
-		},
-		buffIndicator = {
-			order = 701,
-			type = "group",
-			name = L["Buff Indicator"],
-			get = function(info) return E.db.unitframe.units["party"]["buffIndicator"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["party"]["buffIndicator"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Buff Indicator"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				size = {
-					type = "range",
-					name = L["Size"],
-					desc = L["Size of the indicator icon."],
-					order = 3,
-					min = 4, max = 50, step = 1,
-				},
-				fontSize = {
-					type = "range",
-					name = FONT_SIZE,
-					order = 4,
-					min = 7, max = 22, step = 1,
-				},
-				profileSpecific = {
-					type = "toggle",
-					name = L["Profile Specific"],
-					desc = L["Use the profile specific filter 'Buff Indicator (Profile)' instead of the global filter 'Buff Indicator'."],
-					order = 5,
-				},
-				configureButton = {
-					type = "execute",
-					name = L["Configure Auras"],
-					func = function()
-						if E.db.unitframe.units["party"]["buffIndicator"].profileSpecific then
-							E:SetToFilterConfig("Buff Indicator (Profile)")
-						else
-							E:SetToFilterConfig("Buff Indicator")
-						end
-					end,
-					order = 6
-				},
-			},
-		},
-		roleIcon = {
-			order = 702,
-			type = "group",
-			name = L["Role Icon"],
-			get = function(info) return E.db.unitframe.units["party"]["roleIcon"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["party"]["roleIcon"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Role Icon"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				position = {
-					type = "select",
-					order = 3,
-					name = L["Position"],
-					values = positionValues,
-				},
-				attachTo = {
-					type = "select",
-					order = 4,
-					name = L["Attach To"],
-					values = {
-						["Health"] = L["Health"],
-						["Power"] = L["Power"],
-						["InfoPanel"] = L["Information Panel"],
-						["Frame"] = L["Frame"],
-					},
-				},
-				xOffset = {
-					order = 5,
-					type = "range",
-					name = L["xOffset"],
-					min = -300, max = 300, step = 1,
-				},
-				yOffset = {
-					order = 6,
-					type = "range",
-					name = L["yOffset"],
-					min = -300, max = 300, step = 1,
-				},
-				size = {
-					type = "range",
-					order = 7,
-					name = L["Size"],
-					min = 4, max = 100, step = 1,
-				},
-			},
-		},
-		raidRoleIcons = {
-			order = 703,
-			type = "group",
-			name = L["RL / ML Icons"],
-			get = function(info) return E.db.unitframe.units["party"]["raidRoleIcons"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["party"]["raidRoleIcons"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["RL / ML Icons"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				position = {
-					type = "select",
-					order = 3,
-					name = L["Position"],
-					values = {
-						["TOPLEFT"] = "TOPLEFT",
-						["TOPRIGHT"] = "TOPRIGHT",
-					},
-				},
-			},
-		},
-		health = GetOptionsTable_Health(true, UF.CreateAndUpdateHeaderGroup, "party"),
-		infoPanel = GetOptionsTable_InformationPanel(UF.CreateAndUpdateHeaderGroup, "party"),
-		power = GetOptionsTable_Power(false, UF.CreateAndUpdateHeaderGroup, "party"),
-		name = GetOptionsTable_Name(UF.CreateAndUpdateHeaderGroup, "party"),
-		portrait = GetOptionsTable_Portrait(UF.CreateAndUpdateHeaderGroup, "party"),
-		--buffs = GetOptionsTable_Auras(true, "buffs", true, UF.CreateAndUpdateHeaderGroup, "party"),
-		--debuffs = GetOptionsTable_Auras(true, "debuffs", true, UF.CreateAndUpdateHeaderGroup, "party"),
-		rdebuffs = GetOptionsTable_RaidDebuff(UF.CreateAndUpdateHeaderGroup, "party"),
-		petsGroup = {
-			order = 850,
-			type = "group",
-			name = L["Party Pets"],
-			get = function(info) return E.db.unitframe.units["party"]["petsGroup"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["party"]["petsGroup"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Party Pets"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				width = {
-					order = 3,
-					name = L["Width"],
-					type = "range",
-					min = 10, max = 500, step = 1,
-				},
-				height = {
-					order = 4,
-					name = L["Height"],
-					type = "range",
-					min = 10, max = 250, step = 1,
-				},
-				anchorPoint = {
-					type = "select",
-					order = 5,
-					name = L["Anchor Point"],
-					desc = L["What point to anchor to the frame you set to attach to."],
-					values = petAnchors,
-				},
-				xOffset = {
-					order = 6,
-					type = "range",
-					name = L["xOffset"],
-					desc = L["An X offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				yOffset = {
-					order = 7,
-					type = "range",
-					name = L["yOffset"],
-					desc = L["An Y offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				name = {
-					order = 8,
-					type = "group",
-					guiInline = true,
-					get = function(info) return E.db.unitframe.units["party"]["petsGroup"]["name"][ info[getn(info)] ] end,
-					set = function(info, value) E.db.unitframe.units["party"]["petsGroup"]["name"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-					name = L["Name"],
-					args = {
-						position = {
-							type = "select",
-							order = 1,
-							name = L["Text Position"],
-							values = positionValues,
-						},
-						xOffset = {
-							order = 2,
-							type = "range",
-							name = L["Text xOffset"],
-							desc = L["Offset position for text."],
-							min = -300, max = 300, step = 1,
-						},
-						yOffset = {
-							order = 3,
-							type = "range",
-							name = L["Text yOffset"],
-							desc = L["Offset position for text."],
-							min = -300, max = 300, step = 1,
-						},
-						text_format = {
-							order = 100,
-							name = L["Text Format"],
-							type = "input",
-							width = "full",
-							desc = L["TEXT_FORMAT_DESC"],
-						},
-					},
-				},
-			},
-		},
-		targetsGroup = {
-			order = 900,
-			type = "group",
-			name = L["Party Targets"],
-			get = function(info) return E.db.unitframe.units["party"]["targetsGroup"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["party"]["targetsGroup"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Party Targets"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				width = {
-					order = 3,
-					name = L["Width"],
-					type = "range",
-					min = 10, max = 500, step = 1,
-				},
-				height = {
-					order = 4,
-					name = L["Height"],
-					type = "range",
-					min = 10, max = 250, step = 1,
-				},
-				anchorPoint = {
-					type = "select",
-					order = 5,
-					name = L["Anchor Point"],
-					desc = L["What point to anchor to the frame you set to attach to."],
-					values = petAnchors,
-				},
-				xOffset = {
-					order = 6,
-					type = "range",
-					name = L["xOffset"],
-					desc = L["An X offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				yOffset = {
-					order = 7,
-					type = "range",
-					name = L["yOffset"],
-					desc = L["An Y offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				name = {
-					order = 8,
-					type = "group",
-					guiInline = true,
-					get = function(info) return E.db.unitframe.units["party"]["targetsGroup"]["name"][ info[getn(info)] ] end,
-					set = function(info, value) E.db.unitframe.units["party"]["targetsGroup"]["name"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("party") end,
-					name = L["Name"],
-					args = {
-						position = {
-							type = "select",
-							order = 1,
-							name = L["Text Position"],
-							values = positionValues,
-						},
-						xOffset = {
-							order = 2,
-							type = "range",
-							name = L["Text xOffset"],
-							desc = L["Offset position for text."],
-							min = -300, max = 300, step = 1,
-						},
-						yOffset = {
-							order = 3,
-							type = "range",
-							name = L["Text yOffset"],
-							desc = L["Offset position for text."],
-							min = -300, max = 300, step = 1,
-						},
-						text_format = {
-							order = 100,
-							name = L["Text Format"],
-							type = "input",
-							width = "full",
-							desc = L["TEXT_FORMAT_DESC"],
-						},
-					},
-				},
-			},
-		},
-		raidicon = GetOptionsTable_RaidIcon(UF.CreateAndUpdateHeaderGroup, "party"),
-		readycheckIcon = GetOptionsTable_ReadyCheckIcon(UF.CreateAndUpdateHeaderGroup, "party"),
-		GPSArrow = GetOptionsTable_GPS("party"),
-	},
-}
-
---Raid Frames
-E.Options.args.unitframe.args.raid = {
-	name = L["Raid Frames"],
-	type = "group",
-	order = 1100,
-	childGroups = "tab",
-	get = function(info) return E.db.unitframe.units["raid"][ info[getn(info)] ] end,
-	set = function(info, value) E.db.unitframe.units["raid"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid") end,
-	disabled = function() return not E.UnitFrames; end,
-	args = {
-		configureToggle = {
-			order = 1,
-			type = "execute",
-			name = L["Display Frames"],
-			func = function()
-				UF:HeaderConfig(_G["ElvUF_Raid"], _G["ElvUF_Raid"].forceShow ~= true or nil)
-			end,
-		},
-		resetSettings = {
-			type = "execute",
-			order = 2,
-			name = L["Restore Defaults"],
-			func = function(info, value) UF:ResetUnitSettings("raid"); E:ResetMovers("Raid Frames") end,
-		},
-		copyFrom = {
-			type = "select",
-			order = 3,
-			name = L["Copy From"],
-			desc = L["Select a unit to copy settings from."],
-			values = {
-				["party"] = L["Party Frames"],
-				["raid40"] = L["Raid40 Frames"],
-			},
-			set = function(info, value) UF:MergeUnitSettings(value, "raid", true); end,
-		},
-		customText = GetOptionsTable_CustomText(UF.CreateAndUpdateHeaderGroup, "raid", nil, 4),
-		generalGroup = {
-			order = 5,
-			type = "group",
-			name = L["General"],
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["General"],
-				},
-				enable = {
-					type = "toggle",
-					order = 2,
-					name = L["Enable"],
-				},
-				hideonnpc = {
-					type = "toggle",
-					order = 3,
-					name = L["Text Toggle On NPC"],
-					desc = L["Power text will be hidden on NPC targets, in addition the name text will be repositioned to the power texts anchor point."],
-					get = function(info) return E.db.unitframe.units["raid"]["power"].hideonnpc end,
-					set = function(info, value) E.db.unitframe.units["raid"]["power"].hideonnpc = value; UF:CreateAndUpdateHeaderGroup("raid"); end,
-				},
-				rangeCheck = {
-					order = 4,
-					name = L["Range Check"],
-					desc = L["Check if you are in range to cast spells on this specific unit."],
-					type = "toggle",
-				},
-				healPrediction = {
-					order = 5,
-					name = L["Heal Prediction"],
-					desc = L["Show an incoming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."],
-					type = "toggle",
-				},
-				threatStyle = {
-					type = "select",
-					order = 6,
-					name = L["Threat Display Mode"],
-					values = threatValues,
-				},
-				colorOverride = {
-					order = 7,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-				orientation = {
-					order = 8,
-					type = "select",
-					name = L["Frame Orientation"],
-					desc = L["Set the orientation of the UnitFrame."],
-					values = {
-						--["AUTOMATIC"] = L["Automatic"], not sure if i will use this yet
-						["LEFT"] = L["Left"],
-						["MIDDLE"] = L["Middle"],
-						["RIGHT"] = L["Right"],
-					},
-				},
-				targetGlow = {
-					order = 9,
-					type = "toggle",
-					name = L["Target Glow"],
-				},
-				positionsGroup = {
-					order = 100,
-					name = L["Size and Positions"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["raid"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid", nil, nil, true) end,
-					args = {
-						width = {
-							order = 1,
-							name = L["Width"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["raid"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid") end,
-						},
-						height = {
-							order = 2,
-							name = L["Height"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["raid"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid") end,
-						},
-						spacer = {
-							order = 3,
-							name = "",
-							type = "description",
-							width = "full",
-						},
-						growthDirection = {
-							order = 4,
-							name = L["Growth Direction"],
-							desc = L["Growth direction from the first unitframe."],
-							type = "select",
-							values = {
-								DOWN_RIGHT = format(L["%s and then %s"], L["Down"], L["Right"]),
-								DOWN_LEFT = format(L["%s and then %s"], L["Down"], L["Left"]),
-								UP_RIGHT = format(L["%s and then %s"], L["Up"], L["Right"]),
-								UP_LEFT = format(L["%s and then %s"], L["Up"], L["Left"]),
-								RIGHT_DOWN = format(L["%s and then %s"], L["Right"], L["Down"]),
-								RIGHT_UP = format(L["%s and then %s"], L["Right"], L["Up"]),
-								LEFT_DOWN = format(L["%s and then %s"], L["Left"], L["Down"]),
-								LEFT_UP = format(L["%s and then %s"], L["Left"], L["Up"]),
-							},
-						},
-						numGroups = {
-							order = 7,
-							type = "range",
-							name = L["Number of Groups"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["raid"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("raid")
-								if _G["ElvUF_Raid"].isForced then
-									UF:HeaderConfig(_G["ElvUF_Raid"])
-									UF:HeaderConfig(_G["ElvUF_Raid"], true)
-								end
-							end,
-						},
-						groupsPerRowCol = {
-							order = 8,
-							type = "range",
-							name = L["Groups Per Row/Column"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["raid"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("raid")
-								if _G["ElvUF_Raid"].isForced then
-									UF:HeaderConfig(_G["ElvUF_Raid"])
-									UF:HeaderConfig(_G["ElvUF_Raid"], true)
-								end
-							end,
-						},
-						horizontalSpacing = {
-							order = 9,
-							type = "range",
-							name = L["Horizontal Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-						verticalSpacing = {
-							order = 10,
-							type = "range",
-							name = L["Vertical Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-					},
-				},
-				visibilityGroup = {
-					order = 200,
-					name = L["Visibility"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["raid"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid", nil, nil, true) end,
-					args = {
-						showPlayer = {
-							order = 1,
-							type = "toggle",
-							name = L["Display Player"],
-							desc = L["When true, the header includes the player when not in a raid."],
-						},
-						visibility = {
-							order = 2,
-							type = "input",
-							name = L["Visibility"],
-							desc = L["The following macro must be true in order for the group to be shown, in addition to any filter that may already be set."],
-							width = "full",
-						},
-					},
-				},
-				sortingGroup = {
-					order = 300,
-					type = "group",
-					guiInline = true,
-					name = L["Grouping & Sorting"],
-					set = function(info, value) E.db.unitframe.units["raid"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid", nil, nil, true) end,
-					args = {
-						groupBy = {
-							order = 1,
-							name = L["Group By"],
-							desc = L["Set the order that the group will sort."],
-							type = "select",
-							values = {
-								["CLASS"] = CLASS,
-								["NAME"] = NAME,
-								["MTMA"] = L["Main Tanks / Main Assist"],
-								["GROUP"] = GROUP,
-							},
-						},
-						sortDir = {
-							order = 2,
-							name = L["Sort Direction"],
-							desc = L["Defines the sort order of the selected sort method."],
-							type = "select",
-							values = {
-								["ASC"] = L["Ascending"],
-								["DESC"] = L["Descending"]
-							},
-						},
-						spacer = {
-							order = 3,
-							type = "description",
-							width = "full",
-							name = " "
-						},
-						raidWideSorting = {
-							order = 4,
-							name = L["Raid-Wide Sorting"],
-							desc = L["Enabling this allows raid-wide sorting however you will not be able to distinguish between groups."],
-							type = "toggle",
-						},
-						invertGroupingOrder = {
-							order = 5,
-							name = L["Invert Grouping Order"],
-							desc = L["Enabling this inverts the grouping order when the raid is not full, this will reverse the direction it starts from."],
-							disabled = function() return not E.db.unitframe.units["raid"].raidWideSorting end,
-							type = "toggle",
-						},
-						startFromCenter = {
-							order = 6,
-							name = L["Start Near Center"],
-							desc = L["The initial group will start near the center and grow out."],
-							disabled = function() return not E.db.unitframe.units["raid"].raidWideSorting end,
-							type = "toggle",
-						},
-					},
-				},
-			},
-		},
-		health = GetOptionsTable_Health(true, UF.CreateAndUpdateHeaderGroup, "raid"),
-		infoPanel = GetOptionsTable_InformationPanel(UF.CreateAndUpdateHeaderGroup, "raid"),
-		power = GetOptionsTable_Power(false, UF.CreateAndUpdateHeaderGroup, "raid"),
-		name = GetOptionsTable_Name(UF.CreateAndUpdateHeaderGroup, "raid"),
-		portrait = GetOptionsTable_Portrait(UF.CreateAndUpdateHeaderGroup, "raid"),
-		--buffs = GetOptionsTable_Auras(true, "buffs", true, UF.CreateAndUpdateHeaderGroup, "raid"),
-		--debuffs = GetOptionsTable_Auras(true, "debuffs", true, UF.CreateAndUpdateHeaderGroup, "raid"),
-		buffIndicator = {
-			order = 701,
-			type = "group",
-			name = L["Buff Indicator"],
-			get = function(info) return E.db.unitframe.units["raid"]["buffIndicator"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raid"]["buffIndicator"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Buff Indicator"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				size = {
-					type = "range",
-					name = L["Size"],
-					desc = L["Size of the indicator icon."],
-					order = 3,
-					min = 4, max = 50, step = 1,
-				},
-				fontSize = {
-					type = "range",
-					name = FONT_SIZE,
-					order = 4,
-					min = 7, max = 22, step = 1,
-				},
-				profileSpecific = {
-					type = "toggle",
-					name = L["Profile Specific"],
-					desc = L["Use the profile specific filter 'Buff Indicator (Profile)' instead of the global filter 'Buff Indicator'."],
-					order = 5,
-				},
-				configureButton = {
-					type = "execute",
-					name = L["Configure Auras"],
-					func = function()
-						if E.db.unitframe.units["raid"]["buffIndicator"].profileSpecific then
-							E:SetToFilterConfig("Buff Indicator (Profile)")
-						else
-							E:SetToFilterConfig("Buff Indicator")
-						end
-					end,
-					order = 6
-				},
-			},
-		},
-		roleIcon = {
-			order = 702,
-			type = "group",
-			name = L["Role Icon"],
-			get = function(info) return E.db.unitframe.units["raid"]["roleIcon"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raid"]["roleIcon"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Role Icon"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				position = {
-					type = "select",
-					order = 3,
-					name = L["Position"],
-					values = positionValues,
-				},
-				attachTo = {
-					type = "select",
-					order = 4,
-					name = L["Attach To"],
-					values = {
-						["Health"] = L["Health"],
-						["Power"] = L["Power"],
-						["InfoPanel"] = L["Information Panel"],
-						["Frame"] = L["Frame"],
-					},
-				},
-				xOffset = {
-					order = 5,
-					type = "range",
-					name = L["xOffset"],
-					min = -300, max = 300, step = 1,
-				},
-				yOffset = {
-					order = 6,
-					type = "range",
-					name = L["yOffset"],
-					min = -300, max = 300, step = 1,
-				},
-				size = {
-					type = "range",
-					order = 7,
-					name = L["Size"],
-					min = 4, max = 100, step = 1,
-				},
-			},
-		},
-		raidRoleIcons = {
-			order = 703,
-			type = "group",
-			name = L["RL / ML Icons"],
-			get = function(info) return E.db.unitframe.units["raid"]["raidRoleIcons"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raid"]["raidRoleIcons"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["RL / ML Icons"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				position = {
-					type = "select",
-					order = 3,
-					name = L["Position"],
-					values = {
-						["TOPLEFT"] = "TOPLEFT",
-						["TOPRIGHT"] = "TOPRIGHT",
-					},
-				},
-			},
-		},
-		rdebuffs = GetOptionsTable_RaidDebuff(UF.CreateAndUpdateHeaderGroup, "raid"),
-		raidicon = GetOptionsTable_RaidIcon(UF.CreateAndUpdateHeaderGroup, "raid"),
-		readycheckIcon = GetOptionsTable_ReadyCheckIcon(UF.CreateAndUpdateHeaderGroup, "raid"),
-		GPSArrow = GetOptionsTable_GPS("raid"),
-	},
-}
-
---Raid-40 Frames
-E.Options.args.unitframe.args.raid40 = {
-	name = L["Raid-40 Frames"],
-	type = "group",
-	order = 1100,
-	childGroups = "tab",
-	get = function(info) return E.db.unitframe.units["raid40"][ info[getn(info)] ] end,
-	set = function(info, value) E.db.unitframe.units["raid40"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40") end,
-	disabled = function() return not E.UnitFrames; end,
-	args = {
-		configureToggle = {
-			order = 1,
-			type = "execute",
-			name = L["Display Frames"],
-			func = function()
-				UF:HeaderConfig(_G["ElvUF_Raid40"], _G["ElvUF_Raid40"].forceShow ~= true or nil)
-			end,
-		},
-		resetSettings = {
-			type = "execute",
-			order = 2,
-			name = L["Restore Defaults"],
-			func = function(info, value) UF:ResetUnitSettings("raid40"); E:ResetMovers("Raid Frames") end,
-		},
-		copyFrom = {
-			type = "select",
-			order = 3,
-			name = L["Copy From"],
-			desc = L["Select a unit to copy settings from."],
-			values = {
-				["party"] = L["Party Frames"],
-				["raid"] = L["Raid Frames"],
-			},
-			set = function(info, value) UF:MergeUnitSettings(value, "raid40", true); end,
-		},
-		customText = GetOptionsTable_CustomText(UF.CreateAndUpdateHeaderGroup, "raid40", nil, 4),
-		generalGroup = {
-			order = 5,
-			type = "group",
-			name = L["General"],
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["General"],
-				},
-				enable = {
-					type = "toggle",
-					order = 2,
-					name = L["Enable"],
-				},
-				hideonnpc = {
-					type = "toggle",
-					order = 3,
-					name = L["Text Toggle On NPC"],
-					desc = L["Power text will be hidden on NPC targets, in addition the name text will be repositioned to the power texts anchor point."],
-					get = function(info) return E.db.unitframe.units["raid40"]["power"].hideonnpc end,
-					set = function(info, value) E.db.unitframe.units["raid40"]["power"].hideonnpc = value; UF:CreateAndUpdateHeaderGroup("raid40"); end,
-				},
-				rangeCheck = {
-					order = 4,
-					name = L["Range Check"],
-					desc = L["Check if you are in range to cast spells on this specific unit."],
-					type = "toggle",
-				},
-				healPrediction = {
-					order = 5,
-					name = L["Heal Prediction"],
-					desc = L["Show an incoming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."],
-					type = "toggle",
-				},
-				threatStyle = {
-					type = "select",
-					order = 6,
-					name = L["Threat Display Mode"],
-					values = threatValues,
-				},
-				colorOverride = {
-					order = 7,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-				orientation = {
-					order = 8,
-					type = "select",
-					name = L["Frame Orientation"],
-					desc = L["Set the orientation of the UnitFrame."],
-					values = {
-						--["AUTOMATIC"] = L["Automatic"], not sure if i will use this yet
-						["LEFT"] = L["Left"],
-						["MIDDLE"] = L["Middle"],
-						["RIGHT"] = L["Right"],
-					},
-				},
-				targetGlow = {
-					order = 9,
-					type = "toggle",
-					name = L["Target Glow"],
-				},
-				positionsGroup = {
-					order = 100,
-					name = L["Size and Positions"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["raid40"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40", nil, nil, true) end,
-					args = {
-						width = {
-							order = 1,
-							name = L["Width"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["raid40"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40") end,
-						},
-						height = {
-							order = 2,
-							name = L["Height"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["raid40"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40") end,
-						},
-						spacer = {
-							order = 3,
-							name = "",
-							type = "description",
-							width = "full",
-						},
-						growthDirection = {
-							order = 4,
-							name = L["Growth Direction"],
-							desc = L["Growth direction from the first unitframe."],
-							type = "select",
-							values = {
-								DOWN_RIGHT = format(L["%s and then %s"], L["Down"], L["Right"]),
-								DOWN_LEFT = format(L["%s and then %s"], L["Down"], L["Left"]),
-								UP_RIGHT = format(L["%s and then %s"], L["Up"], L["Right"]),
-								UP_LEFT = format(L["%s and then %s"], L["Up"], L["Left"]),
-								RIGHT_DOWN = format(L["%s and then %s"], L["Right"], L["Down"]),
-								RIGHT_UP = format(L["%s and then %s"], L["Right"], L["Up"]),
-								LEFT_DOWN = format(L["%s and then %s"], L["Left"], L["Down"]),
-								LEFT_UP = format(L["%s and then %s"], L["Left"], L["Up"]),
-							},
-						},
-						numGroups = {
-							order = 7,
-							type = "range",
-							name = L["Number of Groups"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["raid40"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("raid40")
-								if _G["ElvUF_Raid"].isForced then
-									UF:HeaderConfig(_G["ElvUF_Raid40"])
-									UF:HeaderConfig(_G["ElvUF_Raid40"], true)
-								end
-							end,
-						},
-						groupsPerRowCol = {
-							order = 8,
-							type = "range",
-							name = L["Groups Per Row/Column"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["raid40"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("raid40")
-								if _G["ElvUF_Raid"].isForced then
-									UF:HeaderConfig(_G["ElvUF_Raid40"])
-									UF:HeaderConfig(_G["ElvUF_Raid40"], true)
-								end
-							end,
-						},
-						horizontalSpacing = {
-							order = 9,
-							type = "range",
-							name = L["Horizontal Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-						verticalSpacing = {
-							order = 10,
-							type = "range",
-							name = L["Vertical Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-					},
-				},
-				visibilityGroup = {
-					order = 200,
-					name = L["Visibility"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["raid40"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40", nil, nil, true) end,
-					args = {
-						showPlayer = {
-							order = 1,
-							type = "toggle",
-							name = L["Display Player"],
-							desc = L["When true, the header includes the player when not in a raid."],
-						},
-						visibility = {
-							order = 2,
-							type = "input",
-							name = L["Visibility"],
-							desc = L["The following macro must be true in order for the group to be shown, in addition to any filter that may already be set."],
-							width = "full",
-						},
-					},
-				},
-				sortingGroup = {
-					order = 300,
-					type = "group",
-					guiInline = true,
-					name = L["Grouping & Sorting"],
-					set = function(info, value) E.db.unitframe.units["raid40"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40", nil, nil, true) end,
-					args = {
-						groupBy = {
-							order = 1,
-							name = L["Group By"],
-							desc = L["Set the order that the group will sort."],
-							type = "select",
-							values = {
-								["CLASS"] = CLASS,
-								["NAME"] = NAME,
-								["MTMA"] = L["Main Tanks / Main Assist"],
-								["GROUP"] = GROUP,
-							},
-						},
-						sortDir = {
-							order = 2,
-							name = L["Sort Direction"],
-							desc = L["Defines the sort order of the selected sort method."],
-							type = "select",
-							values = {
-								["ASC"] = L["Ascending"],
-								["DESC"] = L["Descending"]
-							},
-						},
-						spacer = {
-							order = 3,
-							type = "description",
-							width = "full",
-							name = " "
-						},
-						raidWideSorting = {
-							order = 4,
-							name = L["Raid-Wide Sorting"],
-							desc = L["Enabling this allows raid-wide sorting however you will not be able to distinguish between groups."],
-							type = "toggle",
-						},
-						invertGroupingOrder = {
-							order = 5,
-							name = L["Invert Grouping Order"],
-							desc = L["Enabling this inverts the grouping order when the raid is not full, this will reverse the direction it starts from."],
-							disabled = function() return not E.db.unitframe.units["raid40"].raidWideSorting end,
-							type = "toggle",
-						},
-						startFromCenter = {
-							order = 6,
-							name = L["Start Near Center"],
-							desc = L["The initial group will start near the center and grow out."],
-							disabled = function() return not E.db.unitframe.units["raid40"].raidWideSorting end,
-							type = "toggle",
-						},
-					},
-				},
-			},
-		},
-		health = GetOptionsTable_Health(true, UF.CreateAndUpdateHeaderGroup, "raid40"),
-		infoPanel = GetOptionsTable_InformationPanel(UF.CreateAndUpdateHeaderGroup, "raid40"),
-		power = GetOptionsTable_Power(false, UF.CreateAndUpdateHeaderGroup, "raid40"),
-		name = GetOptionsTable_Name(UF.CreateAndUpdateHeaderGroup, "raid40"),
-		portrait = GetOptionsTable_Portrait(UF.CreateAndUpdateHeaderGroup, "raid40"),
-		--buffs = GetOptionsTable_Auras(true, "buffs", true, UF.CreateAndUpdateHeaderGroup, "raid40"),
-		--debuffs = GetOptionsTable_Auras(true, "debuffs", true, UF.CreateAndUpdateHeaderGroup, "raid40"),
-		buffIndicator = {
-			order = 701,
-			type = "group",
-			name = L["Buff Indicator"],
-			get = function(info) return E.db.unitframe.units["raid40"]["buffIndicator"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raid40"]["buffIndicator"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Buff Indicator"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				size = {
-					type = "range",
-					name = L["Size"],
-					desc = L["Size of the indicator icon."],
-					order = 3,
-					min = 4, max = 50, step = 1,
-				},
-				fontSize = {
-					type = "range",
-					name = FONT_SIZE,
-					order = 4,
-					min = 7, max = 22, step = 1,
-				},
-				profileSpecific = {
-					type = "toggle",
-					name = L["Profile Specific"],
-					desc = L["Use the profile specific filter 'Buff Indicator (Profile)' instead of the global filter 'Buff Indicator'."],
-					order = 5,
-				},
-				configureButton = {
-					type = "execute",
-					name = L["Configure Auras"],
-					func = function()
-						if E.db.unitframe.units["raid40"]["buffIndicator"].profileSpecific then
-							E:SetToFilterConfig("Buff Indicator (Profile)")
-						else
-							E:SetToFilterConfig("Buff Indicator")
-						end
-					end,
-					order = 6
-				},
-			},
-		},
-		roleIcon = {
-			order = 702,
-			type = "group",
-			name = L["Role Icon"],
-			get = function(info) return E.db.unitframe.units["raid40"]["roleIcon"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raid40"]["roleIcon"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Role Icon"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				position = {
-					type = "select",
-					order = 3,
-					name = L["Position"],
-					values = positionValues,
-				},
-				attachTo = {
-					type = "select",
-					order = 4,
-					name = L["Attach To"],
-					values = {
-						["Health"] = L["Health"],
-						["Power"] = L["Power"],
-						["InfoPanel"] = L["Information Panel"],
-						["Frame"] = L["Frame"],
-					},
-				},
-				xOffset = {
-					order = 5,
-					type = "range",
-					name = L["xOffset"],
-					min = -300, max = 300, step = 1,
-				},
-				yOffset = {
-					order = 6,
-					type = "range",
-					name = L["yOffset"],
-					min = -300, max = 300, step = 1,
-				},
-				size = {
-					type = "range",
-					order = 7,
-					name = L["Size"],
-					min = 4, max = 100, step = 1,
-				},
-			},
-		},
-		raidRoleIcons = {
-			order = 703,
-			type = "group",
-			name = L["RL / ML Icons"],
-			get = function(info) return E.db.unitframe.units["raid40"]["raidRoleIcons"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raid40"]["raidRoleIcons"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raid40") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["RL / ML Icons"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				position = {
-					type = "select",
-					order = 3,
-					name = L["Position"],
-					values = {
-						["TOPLEFT"] = "TOPLEFT",
-						["TOPRIGHT"] = "TOPRIGHT",
-					},
-				},
-			},
-		},
-		rdebuffs = GetOptionsTable_RaidDebuff(UF.CreateAndUpdateHeaderGroup, "raid40"),
-		raidicon = GetOptionsTable_RaidIcon(UF.CreateAndUpdateHeaderGroup, "raid40"),
-		readycheckIcon = GetOptionsTable_ReadyCheckIcon(UF.CreateAndUpdateHeaderGroup, "raid40"),
-		GPSArrow = GetOptionsTable_GPS("raid40"),
-	},
-}
-
---Raid Pet Frames
-E.Options.args.unitframe.args.raidpet = {
-	order = 1200,
-	type = "group",
-	name = L["Raid Pet Frames"],
-	childGroups = "tab",
-	get = function(info) return E.db.unitframe.units["raidpet"][ info[getn(info)] ] end,
-	set = function(info, value) E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet") end,
-	disabled = function() return not E.UnitFrames; end,
-	args = {
-		configureToggle = {
-			order = 1,
-			type = "execute",
-			name = L["Display Frames"],
-			func = function()
-				UF:HeaderConfig(ElvUF_Raidpet, ElvUF_Raidpet.forceShow ~= true or nil)
-			end,
-		},
-		resetSettings = {
-			type = "execute",
-			order = 2,
-			name = L["Restore Defaults"],
-			func = function(info, value) UF:ResetUnitSettings("raidpet"); E:ResetMovers(L["Raid Pet Frames"]); UF:CreateAndUpdateHeaderGroup("raidpet", nil, nil, true); end,
-		},
-		copyFrom = {
-			type = "select",
-			order = 3,
-			name = L["Copy From"],
-			desc = L["Select a unit to copy settings from."],
-			values = {
-				["party"] = L["Party Frames"],
-				["raid"] = L["Raid Frames"],
-			},
-			set = function(info, value) UF:MergeUnitSettings(value, "raidpet", true); end,
-		},
-		customText = GetOptionsTable_CustomText(UF.CreateAndUpdateHeaderGroup, "raidpet", nil, 4),
-		generalGroup = {
-			order = 5,
-			type = "group",
-			name = L["General"],
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["General"],
-				},
-				enable = {
-					type = "toggle",
-					order = 2,
-					name = L["Enable"],
-				},
-				rangeCheck = {
-					order = 3,
-					name = L["Range Check"],
-					desc = L["Check if you are in range to cast spells on this specific unit."],
-					type = "toggle",
-				},
-				healPrediction = {
-					order = 4,
-					name = L["Heal Prediction"],
-					desc = L["Show an incoming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."],
-					type = "toggle",
-				},
-				threatStyle = {
-					type = "select",
-					order = 5,
-					name = L["Threat Display Mode"],
-					values = threatValues,
-				},
-				colorOverride = {
-					order = 6,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-				orientation = {
-					order = 7,
-					type = "select",
-					name = L["Frame Orientation"],
-					desc = L["Set the orientation of the UnitFrame."],
-					values = {
-						--["AUTOMATIC"] = L["Automatic"], not sure if i will use this yet
-						["LEFT"] = L["Left"],
-						["MIDDLE"] = L["Middle"],
-						["RIGHT"] = L["Right"],
-					},
-				},
-				positionsGroup = {
-					order = 100,
-					name = L["Size and Positions"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet", nil, nil, true) end,
-					args = {
-						width = {
-							order = 1,
-							name = L["Width"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet") end,
-						},
-						height = {
-							order = 2,
-							name = L["Height"],
-							type = "range",
-							min = 10, max = 500, step = 1,
-							set = function(info, value) E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet") end,
-						},
-						spacer = {
-							order = 3,
-							name = "",
-							type = "description",
-							width = "full",
-						},
-						growthDirection = {
-							order = 4,
-							name = L["Growth Direction"],
-							desc = L["Growth direction from the first unitframe."],
-							type = "select",
-							values = {
-								DOWN_RIGHT = format(L["%s and then %s"], L["Down"], L["Right"]),
-								DOWN_LEFT = format(L["%s and then %s"], L["Down"], L["Left"]),
-								UP_RIGHT = format(L["%s and then %s"], L["Up"], L["Right"]),
-								UP_LEFT = format(L["%s and then %s"], L["Up"], L["Left"]),
-								RIGHT_DOWN = format(L["%s and then %s"], L["Right"], L["Down"]),
-								RIGHT_UP = format(L["%s and then %s"], L["Right"], L["Up"]),
-								LEFT_DOWN = format(L["%s and then %s"], L["Left"], L["Down"]),
-								LEFT_UP = format(L["%s and then %s"], L["Left"], L["Up"]),
-							},
-						},
-						numGroups = {
-							order = 7,
-							type = "range",
-							name = L["Number of Groups"],
-							min = 1, max = 8, step = 1,
-								set = function(info, value)
-									E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value;
-									UF:CreateAndUpdateHeaderGroup("raidpet")
-									if ElvUF_Raidpet.isForced then
-										UF:HeaderConfig(ElvUF_Raidpet)
-										UF:HeaderConfig(ElvUF_Raidpet, true)
-									end
-								end,
-						},
-						groupsPerRowCol = {
-							order = 8,
-							type = "range",
-							name = L["Groups Per Row/Column"],
-							min = 1, max = 8, step = 1,
-							set = function(info, value)
-								E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value;
-								UF:CreateAndUpdateHeaderGroup("raidpet")
-								if ElvUF_Raidpet.isForced then
-									UF:HeaderConfig(ElvUF_Raidpet)
-									UF:HeaderConfig(ElvUF_Raidpet, true)
-								end
-							end,
-						},
-						horizontalSpacing = {
-							order = 9,
-							type = "range",
-							name = L["Horizontal Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-						verticalSpacing = {
-							order = 10,
-							type = "range",
-							name = L["Vertical Spacing"],
-							min = -1, max = 50, step = 1,
-						},
-					},
-				},
-				visibilityGroup = {
-					order = 200,
-					name = L["Visibility"],
-					type = "group",
-					guiInline = true,
-					set = function(info, value) E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet", nil, nil, true) end,
-					args = {
-						visibility = {
-							order = 2,
-							type = "input",
-							name = L["Visibility"],
-							desc = L["The following macro must be true in order for the group to be shown, in addition to any filter that may already be set."],
-							width = "full",
-						},
-					},
-				},
-				sortingGroup = {
-					order = 300,
-					type = "group",
-					guiInline = true,
-					name = L["Grouping & Sorting"],
-					set = function(info, value) E.db.unitframe.units["raidpet"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet", nil, nil, true) end,
-					args = {
-						groupBy = {
-							order = 1,
-							name = L["Group By"],
-							desc = L["Set the order that the group will sort."],
-							type = "select",
-							values = {
-								["NAME"] = L["Owners Name"],
-								["PETNAME"] = L["Pet Name"],
-								["GROUP"] = GROUP,
-							},
-						},
-						sortDir = {
-							order = 2,
-							name = L["Sort Direction"],
-							desc = L["Defines the sort order of the selected sort method."],
-							type = "select",
-							values = {
-								["ASC"] = L["Ascending"],
-								["DESC"] = L["Descending"]
-							},
-						},
-						spacer = {
-							order = 3,
-							type = "description",
-							width = "full",
-							name = " "
-						},
-						raidWideSorting = {
-							order = 4,
-							name = L["Raid-Wide Sorting"],
-							desc = L["Enabling this allows raid-wide sorting however you will not be able to distinguish between groups."],
-							type = "toggle",
-						},
-						invertGroupingOrder = {
-							order = 5,
-							name = L["Invert Grouping Order"],
-							desc = L["Enabling this inverts the grouping order when the raid is not full, this will reverse the direction it starts from."],
-							disabled = function() return not E.db.unitframe.units["raidpet"].raidWideSorting end,
-							type = "toggle",
-						},
-						startFromCenter = {
-							order = 6,
-							name = L["Start Near Center"],
-							desc = L["The initial group will start near the center and grow out."],
-							disabled = function() return not E.db.unitframe.units["raidpet"].raidWideSorting end,
-							type = "toggle",
-						},
-					},
-				},
-			},
-		},
-		health = GetOptionsTable_Health(true, UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		name = GetOptionsTable_Name(UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		portrait = GetOptionsTable_Portrait(UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		--buffs = GetOptionsTable_Auras(true, "buffs", true, UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		--debuffs = GetOptionsTable_Auras(true, "debuffs", true, UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		rdebuffs = GetOptionsTable_RaidDebuff(UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		raidicon = GetOptionsTable_RaidIcon(UF.CreateAndUpdateHeaderGroup, "raidpet"),
-		buffIndicator = {
-			order = 701,
-			type = "group",
-			name = L["Buff Indicator"],
-			get = function(info) return E.db.unitframe.units["raidpet"]["buffIndicator"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["raidpet"]["buffIndicator"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("raidpet") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Buff Indicator"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				size = {
-					type = "range",
-					name = L["Size"],
-					desc = L["Size of the indicator icon."],
-					order = 3,
-					min = 4, max = 50, step = 1,
-				},
-				fontSize = {
-					type = "range",
-					name = FONT_SIZE,
-					order = 4,
-					min = 7, max = 22, step = 1,
-				},
-				configureButton = {
-					type = "execute",
-					name = L["Configure Auras"],
-					func = function() E:SetToFilterConfig("Buff Indicator") end,
-					order = 5
-				},
-			},
-		},
-	},
-}
-
---Tank Frames
-E.Options.args.unitframe.args.tank = {
-	name = L["Tank Frames"],
-	type = "group",
-	order = 1300,
-	childGroups = "tab",
-	get = function(info) return E.db.unitframe.units["tank"][ info[getn(info)] ] end,
-	set = function(info, value) E.db.unitframe.units["tank"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("tank") end,
-	disabled = function() return not E.UnitFrames; end,
-	args = {
-		resetSettings = {
-			type = "execute",
-			order = 1,
-			name = L["Restore Defaults"],
-			func = function(info, value) UF:ResetUnitSettings("tank") end,
-		},
-		generalGroup = {
-			order = 2,
-			type = "group",
-			name = L["General"],
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["General"],
-				},
-				enable = {
-					type = "toggle",
-					order = 2,
-					name = L["Enable"],
-				},
-				width = {
-					order = 3,
-					name = L["Width"],
-					type = "range",
-					min = 50, max = 500, step = 1,
-				},
-				height = {
-					order = 4,
-					name = L["Height"],
-					type = "range",
-					min = 10, max = 250, step = 1,
-				},
-				verticalSpacing = {
-					order = 5,
-					type = "range",
-					name = L["Vertical Spacing"],
-					min = 0, max = 100, step = 1,
-				},
-				disableDebuffHighlight = {
-					order = 6,
-					type = "toggle",
-					name = L["Disable Debuff Highlight"],
-					desc = L["Forces Debuff Highlight to be disabled for these frames"],
-					disabled = function() return E.db.unitframe.debuffHighlighting == "NONE" end,
-				},
-				orientation = {
-					order = 7,
-					type = "select",
-					name = L["Frame Orientation"],
-					desc = L["Set the orientation of the UnitFrame."],
-					values = {
-						--["AUTOMATIC"] = L["Automatic"], not sure if i will use this yet
-						["LEFT"] = L["Left"],
-						["MIDDLE"] = L["Middle"],
-						["RIGHT"] = L["Right"],
-					},
-				},
-				colorOverride = {
-					order = 8,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-			},
-		},
-		targetsGroup = {
-			order = 700,
-			type = "group",
-			name = L["Tank Target"],
-			get = function(info) return E.db.unitframe.units["tank"]["targetsGroup"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["tank"]["targetsGroup"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("tank") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Tank Target"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				width = {
-					order = 3,
-					name = L["Width"],
-					type = "range",
-					min = 10, max = 500, step = 1,
-				},
-				height = {
-					order = 4,
-					name = L["Height"],
-					type = "range",
-					min = 10, max = 250, step = 1,
-				},
-				anchorPoint = {
-					type = "select",
-					order = 5,
-					name = L["Anchor Point"],
-					desc = L["What point to anchor to the frame you set to attach to."],
-					values = petAnchors,
-				},
-				xOffset = {
-					order = 6,
-					type = "range",
-					name = L["xOffset"],
-					desc = L["An X offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				yOffset = {
-					order = 7,
-					type = "range",
-					name = L["yOffset"],
-					desc = L["An Y offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				colorOverride = {
-					order = 8,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-			},
-		},
-		--buffs = GetOptionsTable_Auras(true, "buffs", true, UF.CreateAndUpdateHeaderGroup, "tank"),
-		--debuffs = GetOptionsTable_Auras(true, "debuffs", true, UF.CreateAndUpdateHeaderGroup, "tank"),
-		rdebuffs = GetOptionsTable_RaidDebuff(UF.CreateAndUpdateHeaderGroup, "tank"),
-		buffIndicator = {
-			order = 701,
-			type = "group",
-			name = L["Buff Indicator"],
-			get = function(info) return E.db.unitframe.units["tank"]["buffIndicator"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["tank"]["buffIndicator"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("tank") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Buff Indicator"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				size = {
-					type = "range",
-					name = L["Size"],
-					desc = L["Size of the indicator icon."],
-					order = 3,
-					min = 4, max = 50, step = 1,
-				},
-				fontSize = {
-					type = "range",
-					name = FONT_SIZE,
-					order = 4,
-					min = 7, max = 22, step = 1,
-				},
-				profileSpecific = {
-					type = "toggle",
-					name = L["Profile Specific"],
-					desc = L["Use the profile specific filter 'Buff Indicator (Profile)' instead of the global filter 'Buff Indicator'."],
-					order = 5,
-				},
-				configureButton = {
-					type = "execute",
-					name = L["Configure Auras"],
-					func = function()
-						if E.db.unitframe.units["tank"]["buffIndicator"].profileSpecific then
-							E:SetToFilterConfig("Buff Indicator (Profile)")
-						else
-							E:SetToFilterConfig("Buff Indicator")
-						end
-					end,
-					order = 6
-				},
-			},
-		},
-	},
-}
-
---Assist Frames
-E.Options.args.unitframe.args.assist = {
-	name = L["Assist Frames"],
-	type = "group",
-	order = 1300,
-	childGroups = "tab",
-	get = function(info) return E.db.unitframe.units["assist"][ info[getn(info)] ] end,
-	set = function(info, value) E.db.unitframe.units["assist"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("assist") end,
-	disabled = function() return not E.UnitFrames; end,
-	args = {
-		resetSettings = {
-			type = "execute",
-			order = 1,
-			name = L["Restore Defaults"],
-			func = function(info, value) UF:ResetUnitSettings("assist") end,
-		},
-		generalGroup = {
-			order = 2,
-			type = "group",
-			name = L["General"],
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["General"],
-				},
-				enable = {
-					type = "toggle",
-					order = 2,
-					name = L["Enable"],
-				},
-				width = {
-					order = 3,
-					name = L["Width"],
-					type = "range",
-					min = 50, max = 500, step = 1,
-				},
-				height = {
-					order = 4,
-					name = L["Height"],
-					type = "range",
-					min = 10, max = 250, step = 1,
-				},
-				verticalSpacing = {
-					order = 5,
-					type = "range",
-					name = L["Vertical Spacing"],
-					min = 0, max = 100, step = 1,
-				},
-				disableDebuffHighlight = {
-					order = 6,
-					type = "toggle",
-					name = L["Disable Debuff Highlight"],
-					desc = L["Forces Debuff Highlight to be disabled for these frames"],
-					disabled = function() return E.db.unitframe.debuffHighlighting == "NONE" end,
-				},
-				orientation = {
-					order = 7,
-					type = "select",
-					name = L["Frame Orientation"],
-					desc = L["Set the orientation of the UnitFrame."],
-					values = {
-						--["AUTOMATIC"] = L["Automatic"], not sure if i will use this yet
-						["LEFT"] = L["Left"],
-						["MIDDLE"] = L["Middle"],
-						["RIGHT"] = L["Right"],
-					},
-				},
-				colorOverride = {
-					order = 8,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-			},
-		},
-		targetsGroup = {
-			order = 701,
-			type = "group",
-			name = L["Assist Target"],
-			get = function(info) return E.db.unitframe.units["assist"]["targetsGroup"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["assist"]["targetsGroup"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("assist") end,
-			args = {
-				header = {
-					order = 1,
-					type = "header",
-					name = L["Assist Target"],
-				},
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 2,
-				},
-				width = {
-					order = 3,
-					name = L["Width"],
-					type = "range",
-					min = 10, max = 500, step = 1,
-				},
-				height = {
-					order = 4,
-					name = L["Height"],
-					type = "range",
-					min = 10, max = 250, step = 1,
-				},
-				anchorPoint = {
-					type = "select",
-					order = 5,
-					name = L["Anchor Point"],
-					desc = L["What point to anchor to the frame you set to attach to."],
-					values = petAnchors,
-				},
-				xOffset = {
-					order = 6,
-					type = "range",
-					name = L["xOffset"],
-					desc = L["An X offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				yOffset = {
-					order = 7,
-					type = "range",
-					name = L["yOffset"],
-					desc = L["An Y offset (in pixels) to be used when anchoring new frames."],
-					min = -500, max = 500, step = 1,
-				},
-				colorOverride = {
-					order = 8,
-					name = L["Class Color Override"],
-					desc = L["Override the default class color setting."],
-					type = "select",
-					values = {
-						["USE_DEFAULT"] = L["Use Default"],
-						["FORCE_ON"] = L["Force On"],
-						["FORCE_OFF"] = L["Force Off"],
-					},
-				},
-			},
-		},
-		--buffs = GetOptionsTable_Auras(true, "buffs", true, UF.CreateAndUpdateHeaderGroup, "assist"),
-		--debuffs = GetOptionsTable_Auras(true, "debuffs", true, UF.CreateAndUpdateHeaderGroup, "assist"),
-		rdebuffs = GetOptionsTable_RaidDebuff(UF.CreateAndUpdateHeaderGroup, "assist"),
-		buffIndicator = {
-			order = 702,
-			type = "group",
-			name = L["Buff Indicator"],
-			get = function(info) return E.db.unitframe.units["assist"]["buffIndicator"][ info[getn(info)] ] end,
-			set = function(info, value) E.db.unitframe.units["assist"]["buffIndicator"][ info[getn(info)] ] = value; UF:CreateAndUpdateHeaderGroup("assist") end,
-			args = {
-				enable = {
-					type = "toggle",
-					name = L["Enable"],
-					order = 1,
-				},
-				size = {
-					type = "range",
-					name = L["Size"],
-					desc = L["Size of the indicator icon."],
-					order = 3,
-					min = 4, max = 50, step = 1,
-				},
-				fontSize = {
-					type = "range",
-					name = FONT_SIZE,
-					order = 4,
-					min = 7, max = 22, step = 1,
-				},
-				profileSpecific = {
-					type = "toggle",
-					name = L["Profile Specific"],
-					desc = L["Use the profile specific filter 'Buff Indicator (Profile)' instead of the global filter 'Buff Indicator'."],
-					order = 5,
-				},
-				configureButton = {
-					type = "execute",
-					name = L["Configure Auras"],
-					func = function()
-						if E.db.unitframe.units["assist"]["buffIndicator"].profileSpecific then
-							E:SetToFilterConfig("Buff Indicator (Profile)")
-						else
-							E:SetToFilterConfig("Buff Indicator")
-						end
-					end,
-					order = 6
-				},
-			},
-		},
-	},
-}
 
 --MORE COLORING STUFF YAY
 E.Options.args.unitframe.args.generalOptionsGroup.args.allColorsGroup.args.classResourceGroup = {