function GGF.Theme.GetLargeGroupFramePosition(x,y,currentpos)
	pos = 1
	pos = pos + math.floor( x / (GGF.Theme.themes['LargeGroup']['Width'] + GGF.SavedVars['LargeGroup_Padding']) ) * GGF.SavedVars['LargeGroup_Units_Per_Column']
	pos = pos + math.floor( y / (GGF.Theme.themes['LargeGroup']['Height'] + GGF.SavedVars['LargeGroup_Padding']) )
	
	if x < -20 or x > GGF.Theme.themes['LargeGroupContainer']['Width']+20 then pos = currentpos end 
	if y < -20 or y > GGF.Theme.themes['LargeGroupContainer']['Height']+20 then pos = currentpos end
	if pos < 1 then pos = 1 end
	if pos > GGF.UnitManager.groupSize then pos = GGF.UnitManager.groupSize end
	return pos
end

  self.frames.main.baseTemplate = self.baseTemplate --added for Raid Reorganize
  self.frames.main.number = self.number  --added for Raid Reorganize - couldn't work with all the name concatenations in the arrays :/
  -- ^removable if the unitName + a substr can be done in the handler for which self self.frames.main which doesn't heritate the unitName property
  
	  -- Click Handler for Raid reodering
	if self.baseTemplate == "LargeGroupBase" then
		self.frames.main:SetMovable(true)
		self.frames.main:SetMouseEnabled(true)

		-- mouse click (release/up) handler
		self.frames.main:SetHandler("OnMouseUp", function(self, btn, upInside)
			if (self.isMoving) then 										-- only if there was dragging
				self:StopMovingOrResizing()
				local relY = self:GetTop() - self:GetParent():GetTop()  	--calculate relative Y position
				local relX = self:GetLeft() - self:GetParent():GetLeft()	--calculate relative X position
				local currentOrder = GGF.UnitManager.unit['LargeGroup'..self.number].order
				newOrder = GGF.Theme.GetLargeGroupFramePosition(relX, relY, currentOrder) -- get the information from the Theme Module
				GGF.UnitManager.ReOrder(self.number, newOrder) 				-- Reorder the raid unit in the UnitManager and redraw
				self.isMoving=false											-- reset the flag				
				SetGameCameraUIMode(true)
			end
		end )
		
		self.frames.main:SetHandler("OnReceiveDrag", function(self)
			self.isMoving = true 	--just a flag for the raid unit frame dragging when releasing mouseclick
			--self:StartMoving() --unnecessary and causing underlying problem at click release (other frame get stickied to the mouse)
		end )
		
		self.frames.main:SetHandler("OnDragStart", function(self)
			self.isMoving = true 	-- needed as there was issues with releasing the drag while still clicking, maybe unnessary
		end )
	end
end

function GGF.Unit:RefreshPosition() --gave up trying to update the template and reload controls, never worked, this is much simpler, and less modification from original
-- code from the theme manager :
  local groupSize = GGF.SavedVars['LargeGroup_Units_Per_Column']
  local OffsetX = GGF.Theme.themes['LargeGroup']['Width'] * math.floor((self.order-1)/groupSize) + (math.floor((self.order-1)/groupSize)*GGF.SavedVars['LargeGroup_Padding'])
  local OffsetY = GGF.Theme.themes['LargeGroup']['Height'] * ((self.order-1) % groupSize) + (((self.order-1)%groupSize)*GGF.SavedVars['LargeGroup_Padding'])
-- code from the windows creation function  
  self.frames.main:ClearAnchors()
  self.frames.main:SetAnchor((self.template.MyAnchor or TOPLEFT), self.parent, (self.template.ParentAnchor or TOPLEFT), OffsetX, OffsetY)
-- voila, offsetting correctly based on the windows position
end

function GGF.Unit:New(unitName, baseTemplate, parent, unitNumber, order)
  local self = ZO_Object.New( self )
  self.unitName = unitName
  self.baseTemplate = baseTemplate
  self.parent = parent
  self.frames = {}
  self.order = order
  self.number = unitNumber  
  self:Controls()
  return self
end

GGF.UnitManager.LargeGroupOrder = {}

function GGF.UnitManager.ReOrder(unitNumber, newPosition)
--meh... probably a better way to do a reodering exists, cann't think straight this late !
	--d("reorder")
	oldPosition = GGF.UnitManager.unit['LargeGroup'..unitNumber].order
	if oldPosition ~= newPosition then
		tmpOrder={}
		for i = 1, GGF.UnitManager.groupSize do			
			if newPosition < oldPosition then --move up
				if GGF.UnitManager.LargeGroupOrder[i] < newPosition then 
					tmpOrder[i] = GGF.UnitManager.LargeGroupOrder[i] --nothing to do
				else
					if GGF.UnitManager.LargeGroupOrder[i] <= oldPosition then
						tmpOrder[i] = GGF.UnitManager.LargeGroupOrder[i] + 1 -- moving down until old position
					else
						tmpOrder[i] = GGF.UnitManager.LargeGroupOrder[i]  --nothing to do
					end
				end
			else	--moving down
				if GGF.UnitManager.LargeGroupOrder[i] < oldPosition then 
					tmpOrder[i] = GGF.UnitManager.LargeGroupOrder[i] --nothing to do before 
				else
					if GGF.UnitManager.LargeGroupOrder[i] <= newPosition then
						tmpOrder[i] = GGF.UnitManager.LargeGroupOrder[i] - 1 -- moving up until new position
					else
						tmpOrder[i] = GGF.UnitManager.LargeGroupOrder[i]  --nothing to do
					end
				end
			end			
		end
		tmpOrder[unitNumber] = newPosition -- just setting the new position

		for i = 1, GGF.UnitManager.groupSize do	
			GGF.UnitManager.LargeGroupOrder[i] = tmpOrder[i] --recopy the array...
			GGF.UnitManager.unit['LargeGroup'..i].order = tmpOrder[i] -- update the object
		end
	end
	--GGF.UnitManager.RefreshControls()	
	for i = 1, GGF.UnitManager.groupSize do		
		GGF.UnitManager.unit['LargeGroup'..i]:RefreshPosition()
	end
end

function GGF.UnitManager.Initialize()
  GGF.UnitManager.frames = {}
  GGF.UnitManager.Controls()

  -- Create Unit Frames
  GGF.UnitManager.unit['Player'] = GGF.Unit:New('Player', nil, GGF.UnitManager.frames.player,1,1)
  GGF.UnitManager.unit['Target'] = GGF.Unit:New('Target', nil, GGF.UnitManager.frames.target,1,1)
  for i = 1, 4 do 
    GGF.UnitManager.unit['Group'..i] = GGF.Unit:New('Group'..i, nil, GGF.UnitManager.frames.group,i,i) 
  end
  for i = 1, 24 do 
	GGF.UnitManager.LargeGroupOrder[i] = i -- for raid reordering
    GGF.UnitManager.unit['LargeGroup'..i] = GGF.Unit:New('LargeGroup'..i, "LargeGroupBase", GGF.UnitManager.frames.largeGroup, i, i) 
  end

  -- Route & Load Player