diff --git a/Moose Development/Moose/Base.lua b/Moose Development/Moose/Base.lua
index 4c089958d..1b1a7f9e7 100644
--- a/Moose Development/Moose/Base.lua	
+++ b/Moose Development/Moose/Base.lua	
@@ -331,8 +331,8 @@ function BASE:SetState( Object, StateName, State )
   if not self.States[ClassNameAndID] then
     self.States[ClassNameAndID] = {}
   end
-  
   self.States[ClassNameAndID][StateName] = State
+  self:E( { ClassNameAndID, StateName, State } )
   
   return self.States[ClassNameAndID][StateName]
 end
@@ -340,8 +340,11 @@ end
 function BASE:GetState( Object, StateName )
 
   local ClassNameAndID = Object:GetClassNameAndID()
+  self:E( { ClassNameAndID } )
   if self.States[ClassNameAndID] then
-    return self.States[ClassNameAndID][StateName]
+    local State = self.States[ClassNameAndID][StateName]
+    self:E( { ClassNameAndID, StateName, State } )
+    return State
   end
   
   return nil
diff --git a/Moose Development/Moose/Database.lua b/Moose Development/Moose/Database.lua
index ca8dfa7f2..c74cbdd64 100644
--- a/Moose Development/Moose/Database.lua	
+++ b/Moose Development/Moose/Database.lua	
@@ -54,9 +54,6 @@ DATABASE = {
     ClientsByName = {},
     ClientsByID = {},
   },
-  DCSUnits = {},
-  DCSGroups = {},
-  DCSStatics = {},
   UNITS = {},
   STATICS = {},
   GROUPS = {},
@@ -125,10 +122,13 @@ end
 
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddUnit( DCSUnit, DCSUnitName )
+function DATABASE:AddUnit( DCSUnitName )
 
-  self.DCSUnits[DCSUnitName] = DCSUnit 
-  self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
+  if not  self.UNITS[DCSUnitName] then
+    self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
+  end
+  
+  return self.UNITS[DCSUnitName]
 end
 
 
@@ -136,15 +136,16 @@ end
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
 
-  self.DCSUnits[DCSUnitName] = nil 
+  --self.UNITS[DCSUnitName] = nil 
 end
 
 --- Adds a Static based on the Static Name in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddStatic( DCSStatic, DCSStaticName )
+function DATABASE:AddStatic( DCSStaticName )
 
-  self.DCSStatics[DCSStaticName] = DCSStatic 
-  self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+  if not self.STATICS[DCSStaticName] then
+    self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+  end
 end
 
 
@@ -152,7 +153,7 @@ end
 -- @param #DATABASE self
 function DATABASE:DeleteStatic( DCSStaticName )
 
-  self.DCSStatics[DCSStaticName] = nil 
+  --self.STATICS[DCSStaticName] = nil 
 end
 
 --- Finds a STATIC based on the StaticName.
@@ -181,8 +182,11 @@ end
 -- @param #DATABASE self
 function DATABASE:AddClient( ClientName )
 
-  self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
-  self:E( self.CLIENTS[ClientName]:GetClassNameAndID() )
+  if not self.CLIENTS[ClientName] then
+    self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
+  end
+
+  return self.CLIENTS[ClientName]
 end
 
 
@@ -199,10 +203,13 @@ end
 
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddGroup( DCSGroup, GroupName )
+function DATABASE:AddGroup( GroupName )
 
-  self.DCSGroups[GroupName] = DCSGroup
-  self.GROUPS[GroupName] = GROUP:Register( GroupName )
+  if not self.GROUPS[GroupName] then
+    self.GROUPS[GroupName] = GROUP:Register( GroupName )
+  end  
+  
+  return self.GROUPS[GroupName] 
 end
 
 --- Adds a player based on the Player Name in the DATABASE.
@@ -261,7 +268,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.SpawnCountryID = SpawnCountryID
   SpawnTemplate.SpawnCategoryID = SpawnCategoryID
 
-  local SpawnGroup = GROUP:Register( SpawnTemplate.name )
+  local SpawnGroup = self:AddGroup( SpawnTemplate.name )
   return SpawnGroup
 end
 
@@ -400,14 +407,14 @@ function DATABASE:_RegisterGroupsAndUnits()
       if DCSGroup:isExist() then
         local DCSGroupName = DCSGroup:getName()
   
-        self:E( { "Register Group:", DCSGroup, DCSGroupName } )
-        self:AddGroup( DCSGroup, DCSGroupName )
+        self:E( { "Register Group:", DCSGroupName } )
+        self:AddGroup( DCSGroupName )
 
         for DCSUnitId, DCSUnit in pairs( DCSGroup:getUnits() ) do
   
           local DCSUnitName = DCSUnit:getName()
-          self:E( { "Register Unit:", DCSUnit, DCSUnitName } )
-          self:AddUnit( DCSUnit, DCSUnitName )
+          self:E( { "Register Unit:", DCSUnitName } )
+          self:AddUnit( DCSUnitName )
         end
       else
         self:E( { "Group does not exist: ",  DCSGroup } )
@@ -441,8 +448,8 @@ function DATABASE:_RegisterStatics()
       if DCSStatic:isExist() then
         local DCSStaticName = DCSStatic:getName()
   
-        self:E( { "Register Static:", DCSStatic, DCSStaticName } )
-        self:AddStatic( DCSStatic, DCSStaticName )
+        self:E( { "Register Static:", DCSStaticName } )
+        self:AddStatic( DCSStaticName )
       else
         self:E( { "Static does not exist: ",  DCSStatic } )
       end
@@ -462,8 +469,8 @@ function DATABASE:_EventOnBirth( Event )
   self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
-    self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
+    self:AddUnit( Event.IniDCSUnitName )
+    self:AddGroup( Event.IniDCSGroupName )
     self:_EventOnPlayerEnterUnit( Event )
   end
 end
@@ -476,7 +483,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
   self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self.DCSUnits[Event.IniDCSUnitName] then
+    if self.UNITS[Event.IniDCSUnitName] then
       self:DeleteUnit( Event.IniDCSUnitName )
       -- add logic to correctly remove a group once all units are destroyed...
     end
@@ -558,19 +565,6 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Iterate the DATABASE and call an iterator function for each **alive** unit, providing the DCSUnit and optional parameters.
--- @param #DATABASE self
--- @param #function IteratorFunction The function that will be called when there is an alive unit in the database. The function needs to accept a DCSUnit parameter.
--- @return #DATABASE self
-function DATABASE:ForEachDCSUnit( IteratorFunction, ... )
-  self:F2( arg )
-  
-  self:ForEach( IteratorFunction, arg, self.DCSUnits )
-
-  return self
-end
-
-
 --- Iterate the DATABASE and call an iterator function for each **alive** UNIT, providing the UNIT and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive UNIT in the database. The function needs to accept a UNIT parameter.
diff --git a/Moose Development/Moose/Escort.lua b/Moose Development/Moose/Escort.lua
index 355a576fb..2a543e7c5 100644
--- a/Moose Development/Moose/Escort.lua	
+++ b/Moose Development/Moose/Escort.lua	
@@ -99,23 +99,31 @@
 -- * @{#ESCORT.MenuEvasion: Creates a menu structure to set the evasion techniques when the escort is under threat.
 -- * @{#ESCORT.MenuResumeMission}: Creates a menu structure so that the escort can resume from a waypoint.
 -- 
+-- 
+-- @usage
+-- -- Declare a new EscortPlanes object as follows:
+-- 
+-- -- First find the GROUP object and the CLIENT object.
+-- local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- 
+-- -- Now use these 2 objects to construct the new EscortPlanes object.
+-- EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
+-- 
+--
+--
 -- @module Escort
 -- @author FlightControl
 
-
-
-
-
-
-
---- 
+--- ESCORT class
 -- @type ESCORT
 -- @extends Base#BASE
 -- @field Client#CLIENT EscortClient
 -- @field Group#GROUP EscortGroup
 -- @field #string EscortName
 -- @field #ESCORT.MODE EscortMode The mode the escort is in.
--- @field #number FollowScheduler The id of the _FollowScheduler function.
+-- @field Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
+-- @field #number FollowDistance The current follow distance.
 -- @field #boolean ReportTargets If true, nearby targets are reported.
 -- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the EscortGroup.
 -- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the EscortGroup.
@@ -125,7 +133,7 @@ ESCORT = {
   EscortName = nil, -- The Escort Name
   EscortClient = nil,
   EscortGroup = nil,
-  EscortMode = nil,
+  EscortMode = 1,
   MODE = {
     FOLLOW = 1,
     MISSION = 2,
@@ -135,6 +143,7 @@ ESCORT = {
   ReportTargets = true,
   OptionROE = AI.Option.Air.val.ROE.OPEN_FIRE,
   OptionReactionOnThreat = AI.Option.Air.val.REACTION_ON_THREAT.ALLOW_ABORT_MISSION,
+  SmokeDirectionVector = false,
   TaskPoints = {}
 }
 
@@ -156,6 +165,15 @@ ESCORT = {
 -- @param Group#GROUP EscortGroup The group AI escorting the EscortClient.
 -- @param #string EscortName Name of the escort.
 -- @return #ESCORT self
+-- @usage
+-- -- Declare a new EscortPlanes object as follows:
+-- 
+-- -- First find the GROUP object and the CLIENT object.
+-- local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- 
+-- -- Now use these 2 objects to construct the new EscortPlanes object.
+-- EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
 function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
   local self = BASE:Inherit( self, BASE:New() )
   self:F( { EscortClient, EscortGroup, EscortName } )
@@ -165,8 +183,6 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
   self.EscortName = EscortName
   self.EscortBriefing = EscortBriefing
 
-  self:T( EscortGroup:GetClassNameAndID() )
-
   -- Set EscortGroup known at EscortClient.
   if not self.EscortClient._EscortGroups then
     self.EscortClient._EscortGroups = {}
@@ -177,10 +193,8 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
     self.EscortClient._EscortGroups[EscortGroup:GetName()].EscortGroup = self.EscortGroup
     self.EscortClient._EscortGroups[EscortGroup:GetName()].EscortName = self.EscortName
     self.EscortClient._EscortGroups[EscortGroup:GetName()].Targets = {}
-    self.EscortMode = ESCORT.MODE.FOLLOW
   end
 
-
   self.EscortMenu = MENU_CLIENT:New( self.EscortClient, self.EscortName )
 
   self.EscortGroup:WayPointInitialize(1)
@@ -194,9 +208,24 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
     60, EscortClient
   )
 
+  self.FollowDistance = 100
+  self.CT1 = 0
+  self.GT1 = 0
+  self.FollowScheduler = SCHEDULER:New( self, self._FollowScheduler, {}, 1, .5, .01 )
+  self.EscortMode = ESCORT.MODE.MISSION
+  self.FollowScheduler:Stop()
+
   return self
 end
 
+--- This function is for test, it will put on the frequency of the FollowScheduler a red smoke at the direction vector calculated for the escort to fly to.
+-- This allows to visualize where the escort is flying to.
+-- @param #ESCORT self
+-- @param #boolean SmokeDirection If true, then the direction vector will be smoked.
+function ESCORT:TestSmokeDirectionVector( SmokeDirection )
+  self.SmokeDirectionVector = ( SmokeDirection == true ) and true or false
+end
+
 
 --- Defines the default menus
 -- @param #ESCORT self
@@ -223,6 +252,7 @@ function ESCORT:Menus()
   self:MenuEvasion()
   self:MenuResumeMission()
 
+
   return self
 end
 
@@ -633,7 +663,7 @@ function ESCORT._HoldPosition( MenuParam )
   local OrbitHeight = MenuParam.ParamHeight
   local OrbitSeconds = MenuParam.ParamSeconds -- Not implemented yet
 
-  routines.removeFunction( self.FollowScheduler )
+  self.FollowScheduler:Stop()
 
   local PointFrom = {}
   local GroupPoint = EscortGroup:GetUnit(1):GetPointVec3()
@@ -662,6 +692,7 @@ function ESCORT._HoldPosition( MenuParam )
 
   EscortGroup:SetTask( EscortGroup:TaskRoute( Points ) )
   EscortGroup:MessageToClient( "Orbiting at location.", 10, EscortClient )
+
 end
 
 --- @param #MENUPARAM MenuParam
@@ -684,9 +715,7 @@ end
 function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
   self:F( { EscortGroup, EscortClient, Distance } )
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
+  self.FollowScheduler:Stop()
 
   EscortGroup:OptionROEHoldFire()
   EscortGroup:OptionROTPassiveDefense()
@@ -695,8 +724,8 @@ function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
 
   self.CT1 = 0
   self.GT1 = 0
-  --self.FollowScheduler = routines.scheduleFunction( self._FollowScheduler, { self, Distance }, timer.getTime() + 1, .5 )
-  self.FollowScheduler = SCHEDULER:New( self, self._FollowScheduler, { Distance }, 1, .5, .1 )
+  self.FollowScheduler:Start()
+
   EscortGroup:MessageToClient( "Rejoining and Following at " .. Distance .. "!", 30, EscortClient )
 end
 
@@ -768,11 +797,7 @@ function ESCORT._ScanTargets( MenuParam )
 
   local ScanDuration = MenuParam.ParamScanDuration
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
-
-  self:T( { "FollowScheduler after removefunction: ", self.FollowScheduler } )
+  self.FollowScheduler:Stop()
 
   if EscortGroup:IsHelicopter() then
     SCHEDULER:New( EscortGroup, EscortGroup.PushTask,
@@ -797,16 +822,16 @@ function ESCORT._ScanTargets( MenuParam )
   EscortGroup:MessageToClient( "Scanning targets for " .. ScanDuration .. " seconds.", ScanDuration, EscortClient )
 
   if self.EscortMode == ESCORT.MODE.FOLLOW then
-    --self.FollowScheduler = routines.scheduleFunction( self._FollowScheduler, { self, Distance }, timer.getTime() + ScanDuration, 1 )
     self.FollowScheduler:Start()
   end
 
 end
 
+--- @param Group#GROUP EscortGroup
 function _Resume( EscortGroup )
   env.info( '_Resume' )
 
-  local Escort = EscortGroup.Escort -- #ESCORT
+  local Escort = EscortGroup:GetState( EscortGroup, "Escort" )
   env.info( "EscortMode = "  .. Escort.EscortMode )
   if Escort.EscortMode == ESCORT.MODE.FOLLOW then
     Escort:JoinUpAndFollow( EscortGroup, Escort.EscortClient, Escort.Distance )
@@ -819,19 +844,18 @@ function ESCORT._AttackTarget( MenuParam )
 
   local self = MenuParam.ParamSelf
   local EscortGroup = self.EscortGroup
+  
   local EscortClient = self.EscortClient
   local AttackUnit = MenuParam.ParamUnit -- Unit#UNIT
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
+  self.FollowScheduler:Stop()
 
   self:T( AttackUnit )
 
   if EscortGroup:IsAir() then
     EscortGroup:OptionROEOpenFire()
     EscortGroup:OptionROTPassiveDefense()
-    EscortGroup.Escort = self -- Need to do this trick to get the reference for the escort in the _Resume function.
+    EscortGroup:SetState( EscortGroup, "Escort", self )
 --    routines.scheduleFunction(
 --      EscortGroup.PushTask,
 --      { EscortGroup,
@@ -846,7 +870,7 @@ function ESCORT._AttackTarget( MenuParam )
       EscortGroup.PushTask,
       { EscortGroup:TaskCombo(
           { EscortGroup:TaskAttackUnit( AttackUnit ),
-            EscortGroup:TaskFunction( 1, 2, "_Resume", {"''"} )
+            EscortGroup:TaskFunction( 1, 2, "_Resume", { "''" } )
           }
         )
       }, 10
@@ -870,9 +894,9 @@ function ESCORT._AttackTarget( MenuParam )
       }, 10
     )
   end
+  
   EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient )
 
-
 end
 
 --- @param #MENUPARAM MenuParam
@@ -884,10 +908,7 @@ function ESCORT._AssistTarget( MenuParam )
   local EscortGroupAttack = MenuParam.ParamEscortGroup
   local AttackUnit = MenuParam.ParamUnit -- Unit#UNIT
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
-
+  self.FollowScheduler:Stop()
 
   self:T( AttackUnit )
 
@@ -973,8 +994,7 @@ function ESCORT._ResumeMission( MenuParam )
 
   local WayPoint = MenuParam.ParamWayPoint
 
-  routines.removeFunction( self.FollowScheduler )
-  self.FollowScheduler = nil
+  self.FollowScheduler:Stop()
 
   local WayPoints = EscortGroup:GetTaskRoute()
   self:T( WayPoint, WayPoints )
@@ -1005,16 +1025,21 @@ function ESCORT:RegisterRoute()
 end
 
 --- @param Escort#ESCORT self
-function ESCORT:_FollowScheduler( FollowDistance )
-  self:F( { FollowDistance })
+function ESCORT:_FollowScheduler()
+  self:F( { self.FollowDistance } )
 
+  self:T( {self.EscortClient.UnitName, self.EscortGroup.GroupName } )
   if self.EscortGroup:IsAlive() and self.EscortClient:IsAlive() then
 
     local ClientUnit = self.EscortClient:GetClientGroupUnit()
     local GroupUnit = self.EscortGroup:GetUnit( 1 )
+    local FollowDistance = self.FollowDistance
+    
+    self:T( {ClientUnit.UnitName, GroupUnit.UnitName } )
 
     if self.CT1 == 0 and self.GT1 == 0 then
       self.CV1 = ClientUnit:GetPointVec3()
+      self:T( { "self.CV1", self.CV1 } )
       self.CT1 = timer.getTime()
       self.GV1 = GroupUnit:GetPointVec3()
       self.GT1 = timer.getTime()
@@ -1074,7 +1099,10 @@ function ESCORT:_FollowScheduler( FollowDistance )
       -- Now we can calculate the group destination vector GDV.
       local GDV = { x = DVu.x * CS * 8 + CVI.x, y = CVI.y, z = DVu.z * CS * 8 + CVI.z }
       
-      --trigger.action.smoke( GDV, trigger.smokeColor.Red )
+      if self.SmokeDirectionVector == true then
+        trigger.action.smoke( GDV, trigger.smokeColor.Red )
+      end
+      
       self:T2( { "CV2:", CV2 } )
       self:T2( { "CVI:", CVI } )
       self:T2( { "GDV:", GDV } )
@@ -1092,11 +1120,12 @@ function ESCORT:_FollowScheduler( FollowDistance )
         Speed = 0
       end
 
-      self:T( { "Client Speed, Escort Speed, Speed, FlyDistance, Time:", CS, GS, Speed, Distance, Time } )
+      self:T( { "Client Speed, Escort Speed, Speed, FollowDistance, Time:", CS, GS, Speed, FollowDistance, Time } )
 
       -- Now route the escort to the desired point with the desired speed.
       self.EscortGroup:TaskRouteToVec3( GDV, Speed / 3.6 ) -- DCS models speed in Mps (Miles per second)
     end
+
     return true
   end
 
@@ -1278,6 +1307,7 @@ function ESCORT:_ReportTargetsScheduler()
         MENU_CLIENT_COMMAND:New( self.EscortClient, "Waypoint " .. WayPointID .. " at " .. string.format( "%.2f", Distance ).. "km", self.EscortMenuResumeMission, ESCORT._ResumeMission, { ParamSelf = self, ParamWayPoint = WayPointID } )
       end
     end
+
     return true
   end
   
diff --git a/Moose Development/Moose/Event.lua b/Moose Development/Moose/Event.lua
index e58e8a2ec..959d9839a 100644
--- a/Moose Development/Moose/Event.lua	
+++ b/Moose Development/Moose/Event.lua	
@@ -494,11 +494,11 @@ function EVENT:onEvent( Event )
     self:E( { _EVENTCODES[Event.id], Event } )
     for ClassName, EventData in pairs( self.Events[Event.id] ) do
       if Event.IniDCSUnitName and EventData.IniUnit and EventData.IniUnit[Event.IniDCSUnitName] then 
-        self:T2( { "Calling event function for class ", ClassName, " unit ", Event.IniDCSUnitName } )
+        self:E( { "Calling event function for class ", ClassName, " unit ", Event.IniDCSUnitName } )
         EventData.IniUnit[Event.IniDCSUnitName].EventFunction( EventData.IniUnit[Event.IniDCSUnitName].EventSelf, Event )
       else
         if Event.IniDCSUnit and not EventData.IniUnit then
-          self:T2( { "Calling event function for class ", ClassName } )
+          self:E( { "Calling event function for class ", ClassName } )
           EventData.EventFunction( EventData.EventSelf, Event )
         end
       end
diff --git a/Moose Development/Moose/Group.lua b/Moose Development/Moose/Group.lua
index 4778c31c5..87cddd07e 100644
--- a/Moose Development/Moose/Group.lua	
+++ b/Moose Development/Moose/Group.lua	
@@ -185,6 +185,7 @@ function GROUP:Find( DCSGroup )
 
   local GroupName = DCSGroup:getName() -- Group#GROUP
   local GroupFound = _DATABASE:FindGroup( GroupName )
+  GroupFound:E( { GroupName, GroupFound:GetClassNameAndID() } )
   return GroupFound
 end
 
@@ -517,13 +518,14 @@ end
 
 
 function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionArguments )
+  self:F2( { WayPoint, WayPointIndex, FunctionString, FunctionArguments } )
 
   local DCSTask
 
   local DCSScript = {}
   DCSScript[#DCSScript+1] = "local MissionGroup = GROUP:Find( ... ) "
 
-  if FunctionArguments.n > 0 then
+  if FunctionArguments and #FunctionArguments > 0 then
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup, " .. table.concat( FunctionArguments, "," ) .. ")"
   else
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup )"
diff --git a/Moose Development/Moose/Scheduler.lua b/Moose Development/Moose/Scheduler.lua
index 652c74da9..82e78c5d3 100644
--- a/Moose Development/Moose/Scheduler.lua	
+++ b/Moose Development/Moose/Scheduler.lua	
@@ -46,13 +46,12 @@ function SCHEDULER:New( TimeEventObject, TimeEventFunction, TimeEventFunctionArg
   self.TimeEventFunction = TimeEventFunction
   self.TimeEventFunctionArguments = TimeEventFunctionArguments
   self.StartSeconds = StartSeconds
+  self.Repeat = false
 
   if RepeatSecondsInterval then
     self.RepeatSecondsInterval = RepeatSecondsInterval
-    self.Repeat = true
   else
     self.RepeatSecondsInterval = 0
-    self.Repeat = false
   end
 
   if RandomizationFactor then
@@ -79,7 +78,10 @@ end
 function SCHEDULER:Start()
   self:F2( self.TimeEventObject )
   
-  timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
+   if self.RepeatSecondsInterval ~= 0 then
+     self.Repeat = true
+   end
+   timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
   
   return self
 end
diff --git a/Moose Development/Moose/Test.lua b/Moose Development/Moose/Test.lua
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
index 682e1f28d..f96a2fdf1 100644
--- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
+++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
@@ -1,5 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-env.info( 'Moose Generation Timestamp: 20160611_1029' ) 
+env.info( 'Moose Generation Timestamp: 20160614_1503' ) 
 local base = _G
 
 Include = {}
@@ -2866,8 +2866,8 @@ function BASE:SetState( Object, StateName, State )
   if not self.States[ClassNameAndID] then
     self.States[ClassNameAndID] = {}
   end
-  
   self.States[ClassNameAndID][StateName] = State
+  self:E( { ClassNameAndID, StateName, State } )
   
   return self.States[ClassNameAndID][StateName]
 end
@@ -2875,8 +2875,11 @@ end
 function BASE:GetState( Object, StateName )
 
   local ClassNameAndID = Object:GetClassNameAndID()
+  self:E( { ClassNameAndID } )
   if self.States[ClassNameAndID] then
-    return self.States[ClassNameAndID][StateName]
+    local State = self.States[ClassNameAndID][StateName]
+    self:E( { ClassNameAndID, StateName, State } )
+    return State
   end
   
   return nil
@@ -3134,13 +3137,12 @@ function SCHEDULER:New( TimeEventObject, TimeEventFunction, TimeEventFunctionArg
   self.TimeEventFunction = TimeEventFunction
   self.TimeEventFunctionArguments = TimeEventFunctionArguments
   self.StartSeconds = StartSeconds
+  self.Repeat = false
 
   if RepeatSecondsInterval then
     self.RepeatSecondsInterval = RepeatSecondsInterval
-    self.Repeat = true
   else
     self.RepeatSecondsInterval = 0
-    self.Repeat = false
   end
 
   if RandomizationFactor then
@@ -3167,7 +3169,10 @@ end
 function SCHEDULER:Start()
   self:F2( self.TimeEventObject )
   
-  timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
+   if self.RepeatSecondsInterval ~= 0 then
+     self.Repeat = true
+   end
+   timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
   
   return self
 end
@@ -3722,11 +3727,11 @@ function EVENT:onEvent( Event )
     self:E( { _EVENTCODES[Event.id], Event } )
     for ClassName, EventData in pairs( self.Events[Event.id] ) do
       if Event.IniDCSUnitName and EventData.IniUnit and EventData.IniUnit[Event.IniDCSUnitName] then 
-        self:T2( { "Calling event function for class ", ClassName, " unit ", Event.IniDCSUnitName } )
+        self:E( { "Calling event function for class ", ClassName, " unit ", Event.IniDCSUnitName } )
         EventData.IniUnit[Event.IniDCSUnitName].EventFunction( EventData.IniUnit[Event.IniDCSUnitName].EventSelf, Event )
       else
         if Event.IniDCSUnit and not EventData.IniUnit then
-          self:T2( { "Calling event function for class ", ClassName } )
+          self:E( { "Calling event function for class ", ClassName } )
           EventData.EventFunction( EventData.EventSelf, Event )
         end
       end
@@ -4289,6 +4294,7 @@ function GROUP:Find( DCSGroup )
 
   local GroupName = DCSGroup:getName() -- Group#GROUP
   local GroupFound = _DATABASE:FindGroup( GroupName )
+  GroupFound:E( { GroupName, GroupFound:GetClassNameAndID() } )
   return GroupFound
 end
 
@@ -4621,13 +4627,14 @@ end
 
 
 function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionArguments )
+  self:F2( { WayPoint, WayPointIndex, FunctionString, FunctionArguments } )
 
   local DCSTask
 
   local DCSScript = {}
   DCSScript[#DCSScript+1] = "local MissionGroup = GROUP:Find( ... ) "
 
-  if FunctionArguments.n > 0 then
+  if FunctionArguments and #FunctionArguments > 0 then
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup, " .. table.concat( FunctionArguments, "," ) .. ")"
   else
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup )"
@@ -8739,9 +8746,6 @@ DATABASE = {
     ClientsByName = {},
     ClientsByID = {},
   },
-  DCSUnits = {},
-  DCSGroups = {},
-  DCSStatics = {},
   UNITS = {},
   STATICS = {},
   GROUPS = {},
@@ -8810,10 +8814,13 @@ end
 
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddUnit( DCSUnit, DCSUnitName )
+function DATABASE:AddUnit( DCSUnitName )
 
-  self.DCSUnits[DCSUnitName] = DCSUnit 
-  self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
+  if not  self.UNITS[DCSUnitName] then
+    self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
+  end
+  
+  return self.UNITS[DCSUnitName]
 end
 
 
@@ -8821,15 +8828,16 @@ end
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
 
-  self.DCSUnits[DCSUnitName] = nil 
+  --self.UNITS[DCSUnitName] = nil 
 end
 
 --- Adds a Static based on the Static Name in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddStatic( DCSStatic, DCSStaticName )
+function DATABASE:AddStatic( DCSStaticName )
 
-  self.DCSStatics[DCSStaticName] = DCSStatic 
-  self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+  if not self.STATICS[DCSStaticName] then
+    self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+  end
 end
 
 
@@ -8837,7 +8845,7 @@ end
 -- @param #DATABASE self
 function DATABASE:DeleteStatic( DCSStaticName )
 
-  self.DCSStatics[DCSStaticName] = nil 
+  --self.STATICS[DCSStaticName] = nil 
 end
 
 --- Finds a STATIC based on the StaticName.
@@ -8866,8 +8874,11 @@ end
 -- @param #DATABASE self
 function DATABASE:AddClient( ClientName )
 
-  self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
-  self:E( self.CLIENTS[ClientName]:GetClassNameAndID() )
+  if not self.CLIENTS[ClientName] then
+    self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
+  end
+
+  return self.CLIENTS[ClientName]
 end
 
 
@@ -8884,10 +8895,13 @@ end
 
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddGroup( DCSGroup, GroupName )
+function DATABASE:AddGroup( GroupName )
 
-  self.DCSGroups[GroupName] = DCSGroup
-  self.GROUPS[GroupName] = GROUP:Register( GroupName )
+  if not self.GROUPS[GroupName] then
+    self.GROUPS[GroupName] = GROUP:Register( GroupName )
+  end  
+  
+  return self.GROUPS[GroupName] 
 end
 
 --- Adds a player based on the Player Name in the DATABASE.
@@ -8946,7 +8960,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.SpawnCountryID = SpawnCountryID
   SpawnTemplate.SpawnCategoryID = SpawnCategoryID
 
-  local SpawnGroup = GROUP:Register( SpawnTemplate.name )
+  local SpawnGroup = self:AddGroup( SpawnTemplate.name )
   return SpawnGroup
 end
 
@@ -9085,14 +9099,14 @@ function DATABASE:_RegisterGroupsAndUnits()
       if DCSGroup:isExist() then
         local DCSGroupName = DCSGroup:getName()
   
-        self:E( { "Register Group:", DCSGroup, DCSGroupName } )
-        self:AddGroup( DCSGroup, DCSGroupName )
+        self:E( { "Register Group:", DCSGroupName } )
+        self:AddGroup( DCSGroupName )
 
         for DCSUnitId, DCSUnit in pairs( DCSGroup:getUnits() ) do
   
           local DCSUnitName = DCSUnit:getName()
-          self:E( { "Register Unit:", DCSUnit, DCSUnitName } )
-          self:AddUnit( DCSUnit, DCSUnitName )
+          self:E( { "Register Unit:", DCSUnitName } )
+          self:AddUnit( DCSUnitName )
         end
       else
         self:E( { "Group does not exist: ",  DCSGroup } )
@@ -9126,8 +9140,8 @@ function DATABASE:_RegisterStatics()
       if DCSStatic:isExist() then
         local DCSStaticName = DCSStatic:getName()
   
-        self:E( { "Register Static:", DCSStatic, DCSStaticName } )
-        self:AddStatic( DCSStatic, DCSStaticName )
+        self:E( { "Register Static:", DCSStaticName } )
+        self:AddStatic( DCSStaticName )
       else
         self:E( { "Static does not exist: ",  DCSStatic } )
       end
@@ -9147,8 +9161,8 @@ function DATABASE:_EventOnBirth( Event )
   self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
-    self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
+    self:AddUnit( Event.IniDCSUnitName )
+    self:AddGroup( Event.IniDCSGroupName )
     self:_EventOnPlayerEnterUnit( Event )
   end
 end
@@ -9161,7 +9175,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
   self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self.DCSUnits[Event.IniDCSUnitName] then
+    if self.UNITS[Event.IniDCSUnitName] then
       self:DeleteUnit( Event.IniDCSUnitName )
       -- add logic to correctly remove a group once all units are destroyed...
     end
@@ -9243,19 +9257,6 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Iterate the DATABASE and call an iterator function for each **alive** unit, providing the DCSUnit and optional parameters.
--- @param #DATABASE self
--- @param #function IteratorFunction The function that will be called when there is an alive unit in the database. The function needs to accept a DCSUnit parameter.
--- @return #DATABASE self
-function DATABASE:ForEachDCSUnit( IteratorFunction, ... )
-  self:F2( arg )
-  
-  self:ForEach( IteratorFunction, arg, self.DCSUnits )
-
-  return self
-end
-
-
 --- Iterate the DATABASE and call an iterator function for each **alive** UNIT, providing the UNIT and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive UNIT in the database. The function needs to accept a UNIT parameter.
@@ -18082,23 +18083,31 @@ end
 -- * @{#ESCORT.MenuEvasion: Creates a menu structure to set the evasion techniques when the escort is under threat.
 -- * @{#ESCORT.MenuResumeMission}: Creates a menu structure so that the escort can resume from a waypoint.
 -- 
+-- 
+-- @usage
+-- -- Declare a new EscortPlanes object as follows:
+-- 
+-- -- First find the GROUP object and the CLIENT object.
+-- local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- 
+-- -- Now use these 2 objects to construct the new EscortPlanes object.
+-- EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
+-- 
+--
+--
 -- @module Escort
 -- @author FlightControl
 
-
-
-
-
-
-
---- 
+--- ESCORT class
 -- @type ESCORT
 -- @extends Base#BASE
 -- @field Client#CLIENT EscortClient
 -- @field Group#GROUP EscortGroup
 -- @field #string EscortName
 -- @field #ESCORT.MODE EscortMode The mode the escort is in.
--- @field #number FollowScheduler The id of the _FollowScheduler function.
+-- @field Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
+-- @field #number FollowDistance The current follow distance.
 -- @field #boolean ReportTargets If true, nearby targets are reported.
 -- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the EscortGroup.
 -- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the EscortGroup.
@@ -18108,7 +18117,7 @@ ESCORT = {
   EscortName = nil, -- The Escort Name
   EscortClient = nil,
   EscortGroup = nil,
-  EscortMode = nil,
+  EscortMode = 1,
   MODE = {
     FOLLOW = 1,
     MISSION = 2,
@@ -18118,6 +18127,7 @@ ESCORT = {
   ReportTargets = true,
   OptionROE = AI.Option.Air.val.ROE.OPEN_FIRE,
   OptionReactionOnThreat = AI.Option.Air.val.REACTION_ON_THREAT.ALLOW_ABORT_MISSION,
+  SmokeDirectionVector = false,
   TaskPoints = {}
 }
 
@@ -18139,6 +18149,15 @@ ESCORT = {
 -- @param Group#GROUP EscortGroup The group AI escorting the EscortClient.
 -- @param #string EscortName Name of the escort.
 -- @return #ESCORT self
+-- @usage
+-- -- Declare a new EscortPlanes object as follows:
+-- 
+-- -- First find the GROUP object and the CLIENT object.
+-- local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- 
+-- -- Now use these 2 objects to construct the new EscortPlanes object.
+-- EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
 function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
   local self = BASE:Inherit( self, BASE:New() )
   self:F( { EscortClient, EscortGroup, EscortName } )
@@ -18148,8 +18167,6 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
   self.EscortName = EscortName
   self.EscortBriefing = EscortBriefing
 
-  self:T( EscortGroup:GetClassNameAndID() )
-
   -- Set EscortGroup known at EscortClient.
   if not self.EscortClient._EscortGroups then
     self.EscortClient._EscortGroups = {}
@@ -18160,10 +18177,8 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
     self.EscortClient._EscortGroups[EscortGroup:GetName()].EscortGroup = self.EscortGroup
     self.EscortClient._EscortGroups[EscortGroup:GetName()].EscortName = self.EscortName
     self.EscortClient._EscortGroups[EscortGroup:GetName()].Targets = {}
-    self.EscortMode = ESCORT.MODE.FOLLOW
   end
 
-
   self.EscortMenu = MENU_CLIENT:New( self.EscortClient, self.EscortName )
 
   self.EscortGroup:WayPointInitialize(1)
@@ -18177,9 +18192,24 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
     60, EscortClient
   )
 
+  self.FollowDistance = 100
+  self.CT1 = 0
+  self.GT1 = 0
+  self.FollowScheduler = SCHEDULER:New( self, self._FollowScheduler, {}, 1, .5, .01 )
+  self.EscortMode = ESCORT.MODE.MISSION
+  self.FollowScheduler:Stop()
+
   return self
 end
 
+--- This function is for test, it will put on the frequency of the FollowScheduler a red smoke at the direction vector calculated for the escort to fly to.
+-- This allows to visualize where the escort is flying to.
+-- @param #ESCORT self
+-- @param #boolean SmokeDirection If true, then the direction vector will be smoked.
+function ESCORT:TestSmokeDirectionVector( SmokeDirection )
+  self.SmokeDirectionVector = ( SmokeDirection == true ) and true or false
+end
+
 
 --- Defines the default menus
 -- @param #ESCORT self
@@ -18206,6 +18236,7 @@ function ESCORT:Menus()
   self:MenuEvasion()
   self:MenuResumeMission()
 
+
   return self
 end
 
@@ -18616,7 +18647,7 @@ function ESCORT._HoldPosition( MenuParam )
   local OrbitHeight = MenuParam.ParamHeight
   local OrbitSeconds = MenuParam.ParamSeconds -- Not implemented yet
 
-  routines.removeFunction( self.FollowScheduler )
+  self.FollowScheduler:Stop()
 
   local PointFrom = {}
   local GroupPoint = EscortGroup:GetUnit(1):GetPointVec3()
@@ -18645,6 +18676,7 @@ function ESCORT._HoldPosition( MenuParam )
 
   EscortGroup:SetTask( EscortGroup:TaskRoute( Points ) )
   EscortGroup:MessageToClient( "Orbiting at location.", 10, EscortClient )
+
 end
 
 --- @param #MENUPARAM MenuParam
@@ -18667,9 +18699,7 @@ end
 function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
   self:F( { EscortGroup, EscortClient, Distance } )
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
+  self.FollowScheduler:Stop()
 
   EscortGroup:OptionROEHoldFire()
   EscortGroup:OptionROTPassiveDefense()
@@ -18678,8 +18708,8 @@ function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
 
   self.CT1 = 0
   self.GT1 = 0
-  --self.FollowScheduler = routines.scheduleFunction( self._FollowScheduler, { self, Distance }, timer.getTime() + 1, .5 )
-  self.FollowScheduler = SCHEDULER:New( self, self._FollowScheduler, { Distance }, 1, .5, .1 )
+  self.FollowScheduler:Start()
+
   EscortGroup:MessageToClient( "Rejoining and Following at " .. Distance .. "!", 30, EscortClient )
 end
 
@@ -18751,11 +18781,7 @@ function ESCORT._ScanTargets( MenuParam )
 
   local ScanDuration = MenuParam.ParamScanDuration
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
-
-  self:T( { "FollowScheduler after removefunction: ", self.FollowScheduler } )
+  self.FollowScheduler:Stop()
 
   if EscortGroup:IsHelicopter() then
     SCHEDULER:New( EscortGroup, EscortGroup.PushTask,
@@ -18780,16 +18806,16 @@ function ESCORT._ScanTargets( MenuParam )
   EscortGroup:MessageToClient( "Scanning targets for " .. ScanDuration .. " seconds.", ScanDuration, EscortClient )
 
   if self.EscortMode == ESCORT.MODE.FOLLOW then
-    --self.FollowScheduler = routines.scheduleFunction( self._FollowScheduler, { self, Distance }, timer.getTime() + ScanDuration, 1 )
     self.FollowScheduler:Start()
   end
 
 end
 
+--- @param Group#GROUP EscortGroup
 function _Resume( EscortGroup )
   env.info( '_Resume' )
 
-  local Escort = EscortGroup.Escort -- #ESCORT
+  local Escort = EscortGroup:GetState( EscortGroup, "Escort" )
   env.info( "EscortMode = "  .. Escort.EscortMode )
   if Escort.EscortMode == ESCORT.MODE.FOLLOW then
     Escort:JoinUpAndFollow( EscortGroup, Escort.EscortClient, Escort.Distance )
@@ -18802,19 +18828,18 @@ function ESCORT._AttackTarget( MenuParam )
 
   local self = MenuParam.ParamSelf
   local EscortGroup = self.EscortGroup
+  
   local EscortClient = self.EscortClient
   local AttackUnit = MenuParam.ParamUnit -- Unit#UNIT
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
+  self.FollowScheduler:Stop()
 
   self:T( AttackUnit )
 
   if EscortGroup:IsAir() then
     EscortGroup:OptionROEOpenFire()
     EscortGroup:OptionROTPassiveDefense()
-    EscortGroup.Escort = self -- Need to do this trick to get the reference for the escort in the _Resume function.
+    EscortGroup:SetState( EscortGroup, "Escort", self )
 --    routines.scheduleFunction(
 --      EscortGroup.PushTask,
 --      { EscortGroup,
@@ -18829,7 +18854,7 @@ function ESCORT._AttackTarget( MenuParam )
       EscortGroup.PushTask,
       { EscortGroup:TaskCombo(
           { EscortGroup:TaskAttackUnit( AttackUnit ),
-            EscortGroup:TaskFunction( 1, 2, "_Resume", {"''"} )
+            EscortGroup:TaskFunction( 1, 2, "_Resume", { "''" } )
           }
         )
       }, 10
@@ -18853,9 +18878,9 @@ function ESCORT._AttackTarget( MenuParam )
       }, 10
     )
   end
+  
   EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient )
 
-
 end
 
 --- @param #MENUPARAM MenuParam
@@ -18867,10 +18892,7 @@ function ESCORT._AssistTarget( MenuParam )
   local EscortGroupAttack = MenuParam.ParamEscortGroup
   local AttackUnit = MenuParam.ParamUnit -- Unit#UNIT
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
-
+  self.FollowScheduler:Stop()
 
   self:T( AttackUnit )
 
@@ -18956,8 +18978,7 @@ function ESCORT._ResumeMission( MenuParam )
 
   local WayPoint = MenuParam.ParamWayPoint
 
-  routines.removeFunction( self.FollowScheduler )
-  self.FollowScheduler = nil
+  self.FollowScheduler:Stop()
 
   local WayPoints = EscortGroup:GetTaskRoute()
   self:T( WayPoint, WayPoints )
@@ -18988,16 +19009,21 @@ function ESCORT:RegisterRoute()
 end
 
 --- @param Escort#ESCORT self
-function ESCORT:_FollowScheduler( FollowDistance )
-  self:F( { FollowDistance })
+function ESCORT:_FollowScheduler()
+  self:F( { self.FollowDistance } )
 
+  self:T( {self.EscortClient.UnitName, self.EscortGroup.GroupName } )
   if self.EscortGroup:IsAlive() and self.EscortClient:IsAlive() then
 
     local ClientUnit = self.EscortClient:GetClientGroupUnit()
     local GroupUnit = self.EscortGroup:GetUnit( 1 )
+    local FollowDistance = self.FollowDistance
+    
+    self:T( {ClientUnit.UnitName, GroupUnit.UnitName } )
 
     if self.CT1 == 0 and self.GT1 == 0 then
       self.CV1 = ClientUnit:GetPointVec3()
+      self:T( { "self.CV1", self.CV1 } )
       self.CT1 = timer.getTime()
       self.GV1 = GroupUnit:GetPointVec3()
       self.GT1 = timer.getTime()
@@ -19057,7 +19083,10 @@ function ESCORT:_FollowScheduler( FollowDistance )
       -- Now we can calculate the group destination vector GDV.
       local GDV = { x = DVu.x * CS * 8 + CVI.x, y = CVI.y, z = DVu.z * CS * 8 + CVI.z }
       
-      --trigger.action.smoke( GDV, trigger.smokeColor.Red )
+      if self.SmokeDirectionVector == true then
+        trigger.action.smoke( GDV, trigger.smokeColor.Red )
+      end
+      
       self:T2( { "CV2:", CV2 } )
       self:T2( { "CVI:", CVI } )
       self:T2( { "GDV:", GDV } )
@@ -19075,11 +19104,12 @@ function ESCORT:_FollowScheduler( FollowDistance )
         Speed = 0
       end
 
-      self:T( { "Client Speed, Escort Speed, Speed, FlyDistance, Time:", CS, GS, Speed, Distance, Time } )
+      self:T( { "Client Speed, Escort Speed, Speed, FollowDistance, Time:", CS, GS, Speed, FollowDistance, Time } )
 
       -- Now route the escort to the desired point with the desired speed.
       self.EscortGroup:TaskRouteToVec3( GDV, Speed / 3.6 ) -- DCS models speed in Mps (Miles per second)
     end
+
     return true
   end
 
@@ -19261,6 +19291,7 @@ function ESCORT:_ReportTargetsScheduler()
         MENU_CLIENT_COMMAND:New( self.EscortClient, "Waypoint " .. WayPointID .. " at " .. string.format( "%.2f", Distance ).. "km", self.EscortMenuResumeMission, ESCORT._ResumeMission, { ParamSelf = self, ParamWayPoint = WayPointID } )
       end
     end
+
     return true
   end
   
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index 682e1f28d..f96a2fdf1 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,5 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-env.info( 'Moose Generation Timestamp: 20160611_1029' ) 
+env.info( 'Moose Generation Timestamp: 20160614_1503' ) 
 local base = _G
 
 Include = {}
@@ -2866,8 +2866,8 @@ function BASE:SetState( Object, StateName, State )
   if not self.States[ClassNameAndID] then
     self.States[ClassNameAndID] = {}
   end
-  
   self.States[ClassNameAndID][StateName] = State
+  self:E( { ClassNameAndID, StateName, State } )
   
   return self.States[ClassNameAndID][StateName]
 end
@@ -2875,8 +2875,11 @@ end
 function BASE:GetState( Object, StateName )
 
   local ClassNameAndID = Object:GetClassNameAndID()
+  self:E( { ClassNameAndID } )
   if self.States[ClassNameAndID] then
-    return self.States[ClassNameAndID][StateName]
+    local State = self.States[ClassNameAndID][StateName]
+    self:E( { ClassNameAndID, StateName, State } )
+    return State
   end
   
   return nil
@@ -3134,13 +3137,12 @@ function SCHEDULER:New( TimeEventObject, TimeEventFunction, TimeEventFunctionArg
   self.TimeEventFunction = TimeEventFunction
   self.TimeEventFunctionArguments = TimeEventFunctionArguments
   self.StartSeconds = StartSeconds
+  self.Repeat = false
 
   if RepeatSecondsInterval then
     self.RepeatSecondsInterval = RepeatSecondsInterval
-    self.Repeat = true
   else
     self.RepeatSecondsInterval = 0
-    self.Repeat = false
   end
 
   if RandomizationFactor then
@@ -3167,7 +3169,10 @@ end
 function SCHEDULER:Start()
   self:F2( self.TimeEventObject )
   
-  timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
+   if self.RepeatSecondsInterval ~= 0 then
+     self.Repeat = true
+   end
+   timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
   
   return self
 end
@@ -3722,11 +3727,11 @@ function EVENT:onEvent( Event )
     self:E( { _EVENTCODES[Event.id], Event } )
     for ClassName, EventData in pairs( self.Events[Event.id] ) do
       if Event.IniDCSUnitName and EventData.IniUnit and EventData.IniUnit[Event.IniDCSUnitName] then 
-        self:T2( { "Calling event function for class ", ClassName, " unit ", Event.IniDCSUnitName } )
+        self:E( { "Calling event function for class ", ClassName, " unit ", Event.IniDCSUnitName } )
         EventData.IniUnit[Event.IniDCSUnitName].EventFunction( EventData.IniUnit[Event.IniDCSUnitName].EventSelf, Event )
       else
         if Event.IniDCSUnit and not EventData.IniUnit then
-          self:T2( { "Calling event function for class ", ClassName } )
+          self:E( { "Calling event function for class ", ClassName } )
           EventData.EventFunction( EventData.EventSelf, Event )
         end
       end
@@ -4289,6 +4294,7 @@ function GROUP:Find( DCSGroup )
 
   local GroupName = DCSGroup:getName() -- Group#GROUP
   local GroupFound = _DATABASE:FindGroup( GroupName )
+  GroupFound:E( { GroupName, GroupFound:GetClassNameAndID() } )
   return GroupFound
 end
 
@@ -4621,13 +4627,14 @@ end
 
 
 function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionArguments )
+  self:F2( { WayPoint, WayPointIndex, FunctionString, FunctionArguments } )
 
   local DCSTask
 
   local DCSScript = {}
   DCSScript[#DCSScript+1] = "local MissionGroup = GROUP:Find( ... ) "
 
-  if FunctionArguments.n > 0 then
+  if FunctionArguments and #FunctionArguments > 0 then
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup, " .. table.concat( FunctionArguments, "," ) .. ")"
   else
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup )"
@@ -8739,9 +8746,6 @@ DATABASE = {
     ClientsByName = {},
     ClientsByID = {},
   },
-  DCSUnits = {},
-  DCSGroups = {},
-  DCSStatics = {},
   UNITS = {},
   STATICS = {},
   GROUPS = {},
@@ -8810,10 +8814,13 @@ end
 
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddUnit( DCSUnit, DCSUnitName )
+function DATABASE:AddUnit( DCSUnitName )
 
-  self.DCSUnits[DCSUnitName] = DCSUnit 
-  self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
+  if not  self.UNITS[DCSUnitName] then
+    self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
+  end
+  
+  return self.UNITS[DCSUnitName]
 end
 
 
@@ -8821,15 +8828,16 @@ end
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
 
-  self.DCSUnits[DCSUnitName] = nil 
+  --self.UNITS[DCSUnitName] = nil 
 end
 
 --- Adds a Static based on the Static Name in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddStatic( DCSStatic, DCSStaticName )
+function DATABASE:AddStatic( DCSStaticName )
 
-  self.DCSStatics[DCSStaticName] = DCSStatic 
-  self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+  if not self.STATICS[DCSStaticName] then
+    self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+  end
 end
 
 
@@ -8837,7 +8845,7 @@ end
 -- @param #DATABASE self
 function DATABASE:DeleteStatic( DCSStaticName )
 
-  self.DCSStatics[DCSStaticName] = nil 
+  --self.STATICS[DCSStaticName] = nil 
 end
 
 --- Finds a STATIC based on the StaticName.
@@ -8866,8 +8874,11 @@ end
 -- @param #DATABASE self
 function DATABASE:AddClient( ClientName )
 
-  self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
-  self:E( self.CLIENTS[ClientName]:GetClassNameAndID() )
+  if not self.CLIENTS[ClientName] then
+    self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
+  end
+
+  return self.CLIENTS[ClientName]
 end
 
 
@@ -8884,10 +8895,13 @@ end
 
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddGroup( DCSGroup, GroupName )
+function DATABASE:AddGroup( GroupName )
 
-  self.DCSGroups[GroupName] = DCSGroup
-  self.GROUPS[GroupName] = GROUP:Register( GroupName )
+  if not self.GROUPS[GroupName] then
+    self.GROUPS[GroupName] = GROUP:Register( GroupName )
+  end  
+  
+  return self.GROUPS[GroupName] 
 end
 
 --- Adds a player based on the Player Name in the DATABASE.
@@ -8946,7 +8960,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.SpawnCountryID = SpawnCountryID
   SpawnTemplate.SpawnCategoryID = SpawnCategoryID
 
-  local SpawnGroup = GROUP:Register( SpawnTemplate.name )
+  local SpawnGroup = self:AddGroup( SpawnTemplate.name )
   return SpawnGroup
 end
 
@@ -9085,14 +9099,14 @@ function DATABASE:_RegisterGroupsAndUnits()
       if DCSGroup:isExist() then
         local DCSGroupName = DCSGroup:getName()
   
-        self:E( { "Register Group:", DCSGroup, DCSGroupName } )
-        self:AddGroup( DCSGroup, DCSGroupName )
+        self:E( { "Register Group:", DCSGroupName } )
+        self:AddGroup( DCSGroupName )
 
         for DCSUnitId, DCSUnit in pairs( DCSGroup:getUnits() ) do
   
           local DCSUnitName = DCSUnit:getName()
-          self:E( { "Register Unit:", DCSUnit, DCSUnitName } )
-          self:AddUnit( DCSUnit, DCSUnitName )
+          self:E( { "Register Unit:", DCSUnitName } )
+          self:AddUnit( DCSUnitName )
         end
       else
         self:E( { "Group does not exist: ",  DCSGroup } )
@@ -9126,8 +9140,8 @@ function DATABASE:_RegisterStatics()
       if DCSStatic:isExist() then
         local DCSStaticName = DCSStatic:getName()
   
-        self:E( { "Register Static:", DCSStatic, DCSStaticName } )
-        self:AddStatic( DCSStatic, DCSStaticName )
+        self:E( { "Register Static:", DCSStaticName } )
+        self:AddStatic( DCSStaticName )
       else
         self:E( { "Static does not exist: ",  DCSStatic } )
       end
@@ -9147,8 +9161,8 @@ function DATABASE:_EventOnBirth( Event )
   self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
-    self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
+    self:AddUnit( Event.IniDCSUnitName )
+    self:AddGroup( Event.IniDCSGroupName )
     self:_EventOnPlayerEnterUnit( Event )
   end
 end
@@ -9161,7 +9175,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
   self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self.DCSUnits[Event.IniDCSUnitName] then
+    if self.UNITS[Event.IniDCSUnitName] then
       self:DeleteUnit( Event.IniDCSUnitName )
       -- add logic to correctly remove a group once all units are destroyed...
     end
@@ -9243,19 +9257,6 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Iterate the DATABASE and call an iterator function for each **alive** unit, providing the DCSUnit and optional parameters.
--- @param #DATABASE self
--- @param #function IteratorFunction The function that will be called when there is an alive unit in the database. The function needs to accept a DCSUnit parameter.
--- @return #DATABASE self
-function DATABASE:ForEachDCSUnit( IteratorFunction, ... )
-  self:F2( arg )
-  
-  self:ForEach( IteratorFunction, arg, self.DCSUnits )
-
-  return self
-end
-
-
 --- Iterate the DATABASE and call an iterator function for each **alive** UNIT, providing the UNIT and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive UNIT in the database. The function needs to accept a UNIT parameter.
@@ -18082,23 +18083,31 @@ end
 -- * @{#ESCORT.MenuEvasion: Creates a menu structure to set the evasion techniques when the escort is under threat.
 -- * @{#ESCORT.MenuResumeMission}: Creates a menu structure so that the escort can resume from a waypoint.
 -- 
+-- 
+-- @usage
+-- -- Declare a new EscortPlanes object as follows:
+-- 
+-- -- First find the GROUP object and the CLIENT object.
+-- local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- 
+-- -- Now use these 2 objects to construct the new EscortPlanes object.
+-- EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
+-- 
+--
+--
 -- @module Escort
 -- @author FlightControl
 
-
-
-
-
-
-
---- 
+--- ESCORT class
 -- @type ESCORT
 -- @extends Base#BASE
 -- @field Client#CLIENT EscortClient
 -- @field Group#GROUP EscortGroup
 -- @field #string EscortName
 -- @field #ESCORT.MODE EscortMode The mode the escort is in.
--- @field #number FollowScheduler The id of the _FollowScheduler function.
+-- @field Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
+-- @field #number FollowDistance The current follow distance.
 -- @field #boolean ReportTargets If true, nearby targets are reported.
 -- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the EscortGroup.
 -- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the EscortGroup.
@@ -18108,7 +18117,7 @@ ESCORT = {
   EscortName = nil, -- The Escort Name
   EscortClient = nil,
   EscortGroup = nil,
-  EscortMode = nil,
+  EscortMode = 1,
   MODE = {
     FOLLOW = 1,
     MISSION = 2,
@@ -18118,6 +18127,7 @@ ESCORT = {
   ReportTargets = true,
   OptionROE = AI.Option.Air.val.ROE.OPEN_FIRE,
   OptionReactionOnThreat = AI.Option.Air.val.REACTION_ON_THREAT.ALLOW_ABORT_MISSION,
+  SmokeDirectionVector = false,
   TaskPoints = {}
 }
 
@@ -18139,6 +18149,15 @@ ESCORT = {
 -- @param Group#GROUP EscortGroup The group AI escorting the EscortClient.
 -- @param #string EscortName Name of the escort.
 -- @return #ESCORT self
+-- @usage
+-- -- Declare a new EscortPlanes object as follows:
+-- 
+-- -- First find the GROUP object and the CLIENT object.
+-- local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- 
+-- -- Now use these 2 objects to construct the new EscortPlanes object.
+-- EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
 function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
   local self = BASE:Inherit( self, BASE:New() )
   self:F( { EscortClient, EscortGroup, EscortName } )
@@ -18148,8 +18167,6 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
   self.EscortName = EscortName
   self.EscortBriefing = EscortBriefing
 
-  self:T( EscortGroup:GetClassNameAndID() )
-
   -- Set EscortGroup known at EscortClient.
   if not self.EscortClient._EscortGroups then
     self.EscortClient._EscortGroups = {}
@@ -18160,10 +18177,8 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
     self.EscortClient._EscortGroups[EscortGroup:GetName()].EscortGroup = self.EscortGroup
     self.EscortClient._EscortGroups[EscortGroup:GetName()].EscortName = self.EscortName
     self.EscortClient._EscortGroups[EscortGroup:GetName()].Targets = {}
-    self.EscortMode = ESCORT.MODE.FOLLOW
   end
 
-
   self.EscortMenu = MENU_CLIENT:New( self.EscortClient, self.EscortName )
 
   self.EscortGroup:WayPointInitialize(1)
@@ -18177,9 +18192,24 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing )
     60, EscortClient
   )
 
+  self.FollowDistance = 100
+  self.CT1 = 0
+  self.GT1 = 0
+  self.FollowScheduler = SCHEDULER:New( self, self._FollowScheduler, {}, 1, .5, .01 )
+  self.EscortMode = ESCORT.MODE.MISSION
+  self.FollowScheduler:Stop()
+
   return self
 end
 
+--- This function is for test, it will put on the frequency of the FollowScheduler a red smoke at the direction vector calculated for the escort to fly to.
+-- This allows to visualize where the escort is flying to.
+-- @param #ESCORT self
+-- @param #boolean SmokeDirection If true, then the direction vector will be smoked.
+function ESCORT:TestSmokeDirectionVector( SmokeDirection )
+  self.SmokeDirectionVector = ( SmokeDirection == true ) and true or false
+end
+
 
 --- Defines the default menus
 -- @param #ESCORT self
@@ -18206,6 +18236,7 @@ function ESCORT:Menus()
   self:MenuEvasion()
   self:MenuResumeMission()
 
+
   return self
 end
 
@@ -18616,7 +18647,7 @@ function ESCORT._HoldPosition( MenuParam )
   local OrbitHeight = MenuParam.ParamHeight
   local OrbitSeconds = MenuParam.ParamSeconds -- Not implemented yet
 
-  routines.removeFunction( self.FollowScheduler )
+  self.FollowScheduler:Stop()
 
   local PointFrom = {}
   local GroupPoint = EscortGroup:GetUnit(1):GetPointVec3()
@@ -18645,6 +18676,7 @@ function ESCORT._HoldPosition( MenuParam )
 
   EscortGroup:SetTask( EscortGroup:TaskRoute( Points ) )
   EscortGroup:MessageToClient( "Orbiting at location.", 10, EscortClient )
+
 end
 
 --- @param #MENUPARAM MenuParam
@@ -18667,9 +18699,7 @@ end
 function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
   self:F( { EscortGroup, EscortClient, Distance } )
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
+  self.FollowScheduler:Stop()
 
   EscortGroup:OptionROEHoldFire()
   EscortGroup:OptionROTPassiveDefense()
@@ -18678,8 +18708,8 @@ function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
 
   self.CT1 = 0
   self.GT1 = 0
-  --self.FollowScheduler = routines.scheduleFunction( self._FollowScheduler, { self, Distance }, timer.getTime() + 1, .5 )
-  self.FollowScheduler = SCHEDULER:New( self, self._FollowScheduler, { Distance }, 1, .5, .1 )
+  self.FollowScheduler:Start()
+
   EscortGroup:MessageToClient( "Rejoining and Following at " .. Distance .. "!", 30, EscortClient )
 end
 
@@ -18751,11 +18781,7 @@ function ESCORT._ScanTargets( MenuParam )
 
   local ScanDuration = MenuParam.ParamScanDuration
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
-
-  self:T( { "FollowScheduler after removefunction: ", self.FollowScheduler } )
+  self.FollowScheduler:Stop()
 
   if EscortGroup:IsHelicopter() then
     SCHEDULER:New( EscortGroup, EscortGroup.PushTask,
@@ -18780,16 +18806,16 @@ function ESCORT._ScanTargets( MenuParam )
   EscortGroup:MessageToClient( "Scanning targets for " .. ScanDuration .. " seconds.", ScanDuration, EscortClient )
 
   if self.EscortMode == ESCORT.MODE.FOLLOW then
-    --self.FollowScheduler = routines.scheduleFunction( self._FollowScheduler, { self, Distance }, timer.getTime() + ScanDuration, 1 )
     self.FollowScheduler:Start()
   end
 
 end
 
+--- @param Group#GROUP EscortGroup
 function _Resume( EscortGroup )
   env.info( '_Resume' )
 
-  local Escort = EscortGroup.Escort -- #ESCORT
+  local Escort = EscortGroup:GetState( EscortGroup, "Escort" )
   env.info( "EscortMode = "  .. Escort.EscortMode )
   if Escort.EscortMode == ESCORT.MODE.FOLLOW then
     Escort:JoinUpAndFollow( EscortGroup, Escort.EscortClient, Escort.Distance )
@@ -18802,19 +18828,18 @@ function ESCORT._AttackTarget( MenuParam )
 
   local self = MenuParam.ParamSelf
   local EscortGroup = self.EscortGroup
+  
   local EscortClient = self.EscortClient
   local AttackUnit = MenuParam.ParamUnit -- Unit#UNIT
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
+  self.FollowScheduler:Stop()
 
   self:T( AttackUnit )
 
   if EscortGroup:IsAir() then
     EscortGroup:OptionROEOpenFire()
     EscortGroup:OptionROTPassiveDefense()
-    EscortGroup.Escort = self -- Need to do this trick to get the reference for the escort in the _Resume function.
+    EscortGroup:SetState( EscortGroup, "Escort", self )
 --    routines.scheduleFunction(
 --      EscortGroup.PushTask,
 --      { EscortGroup,
@@ -18829,7 +18854,7 @@ function ESCORT._AttackTarget( MenuParam )
       EscortGroup.PushTask,
       { EscortGroup:TaskCombo(
           { EscortGroup:TaskAttackUnit( AttackUnit ),
-            EscortGroup:TaskFunction( 1, 2, "_Resume", {"''"} )
+            EscortGroup:TaskFunction( 1, 2, "_Resume", { "''" } )
           }
         )
       }, 10
@@ -18853,9 +18878,9 @@ function ESCORT._AttackTarget( MenuParam )
       }, 10
     )
   end
+  
   EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient )
 
-
 end
 
 --- @param #MENUPARAM MenuParam
@@ -18867,10 +18892,7 @@ function ESCORT._AssistTarget( MenuParam )
   local EscortGroupAttack = MenuParam.ParamEscortGroup
   local AttackUnit = MenuParam.ParamUnit -- Unit#UNIT
 
-  if self.FollowScheduler then
-    routines.removeFunction( self.FollowScheduler )
-  end
-
+  self.FollowScheduler:Stop()
 
   self:T( AttackUnit )
 
@@ -18956,8 +18978,7 @@ function ESCORT._ResumeMission( MenuParam )
 
   local WayPoint = MenuParam.ParamWayPoint
 
-  routines.removeFunction( self.FollowScheduler )
-  self.FollowScheduler = nil
+  self.FollowScheduler:Stop()
 
   local WayPoints = EscortGroup:GetTaskRoute()
   self:T( WayPoint, WayPoints )
@@ -18988,16 +19009,21 @@ function ESCORT:RegisterRoute()
 end
 
 --- @param Escort#ESCORT self
-function ESCORT:_FollowScheduler( FollowDistance )
-  self:F( { FollowDistance })
+function ESCORT:_FollowScheduler()
+  self:F( { self.FollowDistance } )
 
+  self:T( {self.EscortClient.UnitName, self.EscortGroup.GroupName } )
   if self.EscortGroup:IsAlive() and self.EscortClient:IsAlive() then
 
     local ClientUnit = self.EscortClient:GetClientGroupUnit()
     local GroupUnit = self.EscortGroup:GetUnit( 1 )
+    local FollowDistance = self.FollowDistance
+    
+    self:T( {ClientUnit.UnitName, GroupUnit.UnitName } )
 
     if self.CT1 == 0 and self.GT1 == 0 then
       self.CV1 = ClientUnit:GetPointVec3()
+      self:T( { "self.CV1", self.CV1 } )
       self.CT1 = timer.getTime()
       self.GV1 = GroupUnit:GetPointVec3()
       self.GT1 = timer.getTime()
@@ -19057,7 +19083,10 @@ function ESCORT:_FollowScheduler( FollowDistance )
       -- Now we can calculate the group destination vector GDV.
       local GDV = { x = DVu.x * CS * 8 + CVI.x, y = CVI.y, z = DVu.z * CS * 8 + CVI.z }
       
-      --trigger.action.smoke( GDV, trigger.smokeColor.Red )
+      if self.SmokeDirectionVector == true then
+        trigger.action.smoke( GDV, trigger.smokeColor.Red )
+      end
+      
       self:T2( { "CV2:", CV2 } )
       self:T2( { "CVI:", CVI } )
       self:T2( { "GDV:", GDV } )
@@ -19075,11 +19104,12 @@ function ESCORT:_FollowScheduler( FollowDistance )
         Speed = 0
       end
 
-      self:T( { "Client Speed, Escort Speed, Speed, FlyDistance, Time:", CS, GS, Speed, Distance, Time } )
+      self:T( { "Client Speed, Escort Speed, Speed, FollowDistance, Time:", CS, GS, Speed, FollowDistance, Time } )
 
       -- Now route the escort to the desired point with the desired speed.
       self.EscortGroup:TaskRouteToVec3( GDV, Speed / 3.6 ) -- DCS models speed in Mps (Miles per second)
     end
+
     return true
   end
 
@@ -19261,6 +19291,7 @@ function ESCORT:_ReportTargetsScheduler()
         MENU_CLIENT_COMMAND:New( self.EscortClient, "Waypoint " .. WayPointID .. " at " .. string.format( "%.2f", Distance ).. "km", self.EscortMenuResumeMission, ESCORT._ResumeMission, { ParamSelf = self, ParamWayPoint = WayPointID } )
       end
     end
+
     return true
   end
   
diff --git a/Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz b/Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz
index c21694b02..3015a87c1 100644
Binary files a/Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz and b/Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz differ
diff --git a/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz b/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz
index 47c6aeae9..05404f569 100644
Binary files a/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz and b/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz differ
diff --git a/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz b/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz
index b6c19b6b2..f4921fb20 100644
Binary files a/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz and b/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz differ
diff --git a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.lua b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.lua
index 732b5b5ac..0af903907 100644
--- a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.lua	
+++ b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.lua	
@@ -19,6 +19,11 @@ do
       :MenuReportTargets( 60, 20 )
       :MenuResumeMission()
       :MenuAssistedAttack()
+
+    local EscortGroupArtillery = SpawnEscortArtillery:ReSpawn(1)
+    local EscortArtillery = ESCORT
+      :New( Client, EscortGroupArtillery, "Escort Artillery" )
+      :Menus()
   end
   
   local function EventAlivePlane( Client )
@@ -52,6 +57,7 @@ do
   SpawnEscortPlane = SPAWN:New( "Escort Plane" )
   SpawnEscortGround = SPAWN:New( "Escort Ground" )
   SpawnEscortShip = SPAWN:New( "Escort Ship" )
+  SpawnEscortArtillery = SPAWN:New( "Ground Attack Assistance" )
 
   EscortClientHeli = CLIENT:FindByName( "Lead Helicopter", "Fly around and observe the behaviour of the escort helicopter" ):Alive( EventAliveHelicopter )  
   EscortClientPlane = CLIENT:FindByName( "Lead Plane", "Fly around and observe the behaviour of the escort airplane. Select Navigate->Joun-Up and airplane should follow you. Change speed and directions." )
diff --git a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz
index d41754fea..5148b617f 100644
Binary files a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz and b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz differ
diff --git a/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz b/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
index 1159ed374..39844d015 100644
Binary files a/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz and b/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz differ
diff --git a/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz b/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz
index 434a9bfa9..04636f1ff 100644
Binary files a/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz and b/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz differ
diff --git a/Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz b/Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz
index 2be17fd06..bffbff8d9 100644
Binary files a/Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz and b/Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz differ
diff --git a/Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz b/Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz
index a540aa486..af00c7c4b 100644
Binary files a/Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz and b/Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz differ
diff --git a/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz b/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz
index 3993273fc..2027b24b1 100644
Binary files a/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz and b/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz differ
diff --git a/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz b/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz
index 3c2b20441..cbd9f04e9 100644
Binary files a/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz and b/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz differ
diff --git a/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz b/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz
index 67b00dcdc..3c39ea44a 100644
Binary files a/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz and b/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz differ
diff --git a/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz b/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz
index 32c402323..892aa245e 100644
Binary files a/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz and b/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz differ
diff --git a/Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz b/Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz
index 7983e03c9..b5de3f3b1 100644
Binary files a/Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz and b/Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz differ
diff --git a/Moose Test Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz b/Moose Test Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz
index d6e5f0e3b..ed16e4e08 100644
Binary files a/Moose Test Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz and b/Moose Test Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz differ
diff --git a/Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz b/Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz
index 6491eabea..d9f084d81 100644
Binary files a/Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz and b/Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz differ
diff --git a/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz b/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz
index 0ddb42abd..d88d022e2 100644
Binary files a/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz and b/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz differ
diff --git a/Moose Training/Documentation/AIBalancer.html b/Moose Training/Documentation/AIBalancer.html
new file mode 100644
index 000000000..12bf002c5
--- /dev/null
+++ b/Moose Training/Documentation/AIBalancer.html	
@@ -0,0 +1,253 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+	<head>
+		<link rel="stylesheet" href="stylesheet.css" type="text/css"/>
+	</head>
+<body>
+<div id="container">
+<div id="product">
+	<div id="product_logo"></div>
+	<div id="product_name"><big><b></b></big></div>
+	<div id="product_description"></div>
+</div>
+<div id="main">
+	<div id="navigation">
+		<h2>Modules</h2>
+			<ul><li>
+				<a href="index.html">index</a>
+			</li></ul>
+		<ul>
+					<li>AIBalancer</li>
+					<li><a href="Airbase.html">Airbase</a></li>
+					<li><a href="Base.html">Base</a></li>
+					<li><a href="CARGO.html">CARGO</a></li>
+					<li><a href="CleanUp.html">CleanUp</a></li>
+					<li><a href="Client.html">Client</a></li>
+					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
+					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
+					<li><a href="DCSCommand.html">DCSCommand</a></li>
+					<li><a href="DCSController.html">DCSController</a></li>
+					<li><a href="DCSGroup.html">DCSGroup</a></li>
+					<li><a href="DCSObject.html">DCSObject</a></li>
+					<li><a href="DCSTask.html">DCSTask</a></li>
+					<li><a href="DCSTypes.html">DCSTypes</a></li>
+					<li><a href="DCSUnit.html">DCSUnit</a></li>
+					<li><a href="DCSWorld.html">DCSWorld</a></li>
+					<li><a href="DCStimer.html">DCStimer</a></li>
+					<li><a href="DEPLOYTASK.html">DEPLOYTASK</a></li>
+					<li><a href="DESTROYBASETASK.html">DESTROYBASETASK</a></li>
+					<li><a href="DESTROYGROUPSTASK.html">DESTROYGROUPSTASK</a></li>
+					<li><a href="DESTROYRADARSTASK.html">DESTROYRADARSTASK</a></li>
+					<li><a href="DESTROYUNITTYPESTASK.html">DESTROYUNITTYPESTASK</a></li>
+					<li><a href="Database.html">Database</a></li>
+					<li><a href="Escort.html">Escort</a></li>
+					<li><a href="Event.html">Event</a></li>
+					<li><a href="GOHOMETASK.html">GOHOMETASK</a></li>
+					<li><a href="Group.html">Group</a></li>
+					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
+					<li><a href="Menu.html">Menu</a></li>
+					<li><a href="Message.html">Message</a></li>
+					<li><a href="MissileTrainer.html">MissileTrainer</a></li>
+					<li><a href="Mission.html">Mission</a></li>
+					<li><a href="NOTASK.html">NOTASK</a></li>
+					<li><a href="PICKUPTASK.html">PICKUPTASK</a></li>
+					<li><a href="Point.html">Point</a></li>
+					<li><a href="ROUTETASK.html">ROUTETASK</a></li>
+					<li><a href="STAGE.html">STAGE</a></li>
+					<li><a href="Scheduler.html">Scheduler</a></li>
+					<li><a href="Scoring.html">Scoring</a></li>
+					<li><a href="Sead.html">Sead</a></li>
+					<li><a href="Set.html">Set</a></li>
+					<li><a href="Spawn.html">Spawn</a></li>
+					<li><a href="Static.html">Static</a></li>
+					<li><a href="StaticObject.html">StaticObject</a></li>
+					<li><a href="TASK.html">TASK</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Zone.html">Zone</a></li>
+					<li><a href="env.html">env</a></li>
+					<li><a href="land.html">land</a></li>
+					<li><a href="routines.html">routines</a></li>
+		</ul>
+	</div>
+	<div id="content">
+   <h1>Module <code>AIBalancer</code></h1>
+   
+<p>This module contains the AIBALANCER class.</p>
+
+   
+
+<hr/>
+
+<h1>1) <a href="AIBalancer.html##(AIBALANCER)">AIBalancer#AIBALANCER</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
+<p>The <a href="AIBalancer.html##(AIBALANCER)">AIBalancer#AIBALANCER</a> class controls the dynamic spawning of AI GROUPS depending on a SET<em>CLIENT.
+There will be as many AI GROUPS spawned as there at CLIENTS in SET</em>CLIENT not spawned.</p>
+
+<h2>1.1) AIBALANCER construction method:</h2>
+<p>Create a new AIBALANCER object with the <a href="##(AIBALANCER).New">AIBALANCER.New</a> method:</p>
+
+<ul>
+    <li><a href="##(AIBALANCER).New">AIBALANCER.New</a>: Creates a new AIBALANCER object.</li>
+</ul>
+
+
+<hr/>
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AIBALANCER">AIBALANCER</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(AIBALANCER)">Type <code>AIBALANCER</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIBALANCER).ClassName">AIBALANCER.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIBALANCER).New">AIBALANCER:New(SetClient, SpawnAI)</a></td>
+		<td class="summary">
+<p>Creates a new AIBALANCER object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIBALANCER).SetClient">AIBALANCER.SetClient</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIBALANCER).SpawnAI">AIBALANCER.SpawnAI</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIBALANCER)._ClientAliveMonitorScheduler">AIBALANCER:_ClientAliveMonitorScheduler()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AIBALANCER)">#AIBALANCER</a></em>
+<a id="AIBALANCER" >
+<strong>AIBALANCER</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(AIBalancer)" >Type <code>AIBalancer</code></a></h2>
+	
+			<h2><a id="#(AIBALANCER)" >Type <code>AIBALANCER</code></a></h2>
+				
+<p>AIBALANCER class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(AIBALANCER).ClassName" >
+<strong>AIBALANCER.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIBALANCER).New" >
+<strong>AIBALANCER:New(SetClient, SpawnAI)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new AIBALANCER object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> SetClient </em></code>: 
+A SET_CLIENT object that will contain the CLIENT objects to be monitored if they are alive or not (joined by a player).</p>
+
+				</li>
+				<li>
+				
+<p><code><em> SpawnAI </em></code>: 
+A SPAWN object that will spawn the AI units required, balancing the SetClient.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(AIBALANCER)">#AIBALANCER</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a></em>
+<a id="#(AIBALANCER).SetClient" >
+<strong>AIBALANCER.SetClient</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Spawn.html##(SPAWN)">Spawn#SPAWN</a></em>
+<a id="#(AIBALANCER).SpawnAI" >
+<strong>AIBALANCER.SpawnAI</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIBALANCER)._ClientAliveMonitorScheduler" >
+<strong>AIBALANCER:_ClientAliveMonitorScheduler()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Airbase.html b/Moose Training/Documentation/Airbase.html
index 528f6b026..4348feac2 100644
--- a/Moose Training/Documentation/Airbase.html	
+++ b/Moose Training/Documentation/Airbase.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li>Airbase</li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Base.html b/Moose Training/Documentation/Base.html
index 5ba88ac2a..2953d98b7 100644
--- a/Moose Training/Documentation/Base.html	
+++ b/Moose Training/Documentation/Base.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li>Base</li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -161,6 +162,12 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 		<td class="name" nowrap="nowrap"><a href="##(BASE).ClassName">BASE.ClassName</a></td>
 		<td class="summary">
 <p>The name of the class.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).ClearState">BASE:ClearState(Object, StateName)</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -239,6 +246,12 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 		<td class="name" nowrap="nowrap"><a href="##(BASE).GetClassNameAndID">BASE:GetClassNameAndID()</a></td>
 		<td class="summary">
 <p>Get the ClassName + ClassID of the class instance.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).GetState">BASE:GetState(Object, StateName)</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -260,9 +273,21 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(BASE).T">BASE:T(Arguments, DebugInfoCurrentParam, DebugInfoFromParam)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).SetState">BASE:SetState(Object, StateName, State)</a></td>
 		<td class="summary">
-<p>Trace a function logic.</p>
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).States">BASE.States</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).T">BASE:T(Arguments)</a></td>
+		<td class="summary">
+<p>Trace a function logic level 1.</p>
 </td>
 		</tr>
 		<tr>
@@ -299,6 +324,12 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 		<td class="name" nowrap="nowrap"><a href="##(BASE).TraceLevel">BASE:TraceLevel(Level)</a></td>
 		<td class="summary">
 <p>Set trace level</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE)._T">BASE:_T(Arguments, DebugInfoCurrentParam, DebugInfoFromParam)</a></td>
+		<td class="summary">
+<p>Trace a function logic.</p>
 </td>
 		</tr>
 		<tr>
@@ -415,6 +446,32 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 		<dl class="function">
 <dt>
 
+<a id="#(BASE).ClearState" >
+<strong>BASE:ClearState(Object, StateName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Object </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> StateName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(BASE).CreateEventBirth" >
 <strong>BASE:CreateEventBirth(EventTime, Initiator, IniUnitName, place, subplace)</strong>
 </a>
@@ -722,6 +779,32 @@ The ClassName + ClassID of the class instance.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(BASE).GetState" >
+<strong>BASE:GetState(Object, StateName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Object </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> StateName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(BASE).Inherit" >
 <strong>BASE:Inherit(Child, Parent)</strong>
 </a>
@@ -817,34 +900,69 @@ end</code></pre>
 		<dl class="function">
 <dt>
 
-<a id="#(BASE).T" >
-<strong>BASE:T(Arguments, DebugInfoCurrentParam, DebugInfoFromParam)</strong>
+<a id="#(BASE).SetState" >
+<strong>BASE:SetState(Object, StateName, State)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Trace a function logic.</p>
 
-	
-<p>Can be anywhere within the function logic.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
+<p><code><em> Object </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> StateName </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> State </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(BASE).States" >
+<strong>BASE.States</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).T" >
+<strong>BASE:T(Arguments)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Trace a function logic level 1.</p>
+
+	
+<p>Can be anywhere within the function logic.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
 <p><code><em> Arguments </em></code>: 
 A #table or any field.</p>
 
-				</li>
-				<li>
-				
-<p><code><em> DebugInfoCurrentParam </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em> DebugInfoFromParam </em></code>: </p>
-
 				</li>
 		</ul>
 </dd>
@@ -992,6 +1110,38 @@ true = trace all methods in MOOSE.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(BASE)._T" >
+<strong>BASE:_T(Arguments, DebugInfoCurrentParam, DebugInfoFromParam)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Trace a function logic.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Arguments </em></code>: 
+A #table or any field.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> DebugInfoCurrentParam </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> DebugInfoFromParam </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(BASE).onEvent" >
 <strong>BASE:onEvent(event)</strong>
 </a>
diff --git a/Moose Training/Documentation/CARGO.html b/Moose Training/Documentation/CARGO.html
index a6736c085..b4a0512fb 100644
--- a/Moose Training/Documentation/CARGO.html	
+++ b/Moose Training/Documentation/CARGO.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li>CARGO</li>
diff --git a/Moose Training/Documentation/CleanUp.html b/Moose Training/Documentation/CleanUp.html
index 192c54b52..5a4a76881 100644
--- a/Moose Training/Documentation/CleanUp.html	
+++ b/Moose Training/Documentation/CleanUp.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Client.html b/Moose Training/Documentation/Client.html
index c598043e8..9a314c434 100644
--- a/Moose Training/Documentation/Client.html	
+++ b/Moose Training/Documentation/Client.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -130,7 +131,7 @@ If the DCS Unit object does not exist or is nil, the CLIENT methods will return
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CLIENT).Alive">CLIENT:Alive(CallBack, ...)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(CLIENT).Alive">CLIENT:Alive(CallBack, CallBackFunction, ...)</a></td>
 		<td class="summary">
 <p>Checks for a client alive event and calls a function on a continuous basis.</p>
 </td>
@@ -412,7 +413,7 @@ self</p>
 <dt>
 
 <a id="#(CLIENT).Alive" >
-<strong>CLIENT:Alive(CallBack, ...)</strong>
+<strong>CLIENT:Alive(CallBack, CallBackFunction, ...)</strong>
 </a>
 </dt>
 <dd>
@@ -429,6 +430,11 @@ Function.</p>
 				</li>
 				<li>
 				
+<p><code><em> CallBackFunction </em></code>: </p>
+
+				</li>
+				<li>
+				
 <p><code><em> ... </em></code>: </p>
 
 				</li>
diff --git a/Moose Training/Documentation/DCSAirbase.html b/Moose Training/Documentation/DCSAirbase.html
index 20c970f2a..7f68b0c49 100644
--- a/Moose Training/Documentation/DCSAirbase.html	
+++ b/Moose Training/Documentation/DCSAirbase.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSCoalitionObject.html b/Moose Training/Documentation/DCSCoalitionObject.html
index a6e10abeb..03512fa4b 100644
--- a/Moose Training/Documentation/DCSCoalitionObject.html	
+++ b/Moose Training/Documentation/DCSCoalitionObject.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSCommand.html b/Moose Training/Documentation/DCSCommand.html
index 38d4e6b58..1de8e9418 100644
--- a/Moose Training/Documentation/DCSCommand.html	
+++ b/Moose Training/Documentation/DCSCommand.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSController.html b/Moose Training/Documentation/DCSController.html
index 763eb4b79..024cd7b8d 100644
--- a/Moose Training/Documentation/DCSController.html	
+++ b/Moose Training/Documentation/DCSController.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSGroup.html b/Moose Training/Documentation/DCSGroup.html
index 685694b71..dbb06f65f 100644
--- a/Moose Training/Documentation/DCSGroup.html	
+++ b/Moose Training/Documentation/DCSGroup.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSObject.html b/Moose Training/Documentation/DCSObject.html
index a255ab69c..0ca6e09a7 100644
--- a/Moose Training/Documentation/DCSObject.html	
+++ b/Moose Training/Documentation/DCSObject.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSTask.html b/Moose Training/Documentation/DCSTask.html
index 47a8e0e8e..5893c739b 100644
--- a/Moose Training/Documentation/DCSTask.html	
+++ b/Moose Training/Documentation/DCSTask.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSTypes.html b/Moose Training/Documentation/DCSTypes.html
index 39b519636..d852904b7 100644
--- a/Moose Training/Documentation/DCSTypes.html	
+++ b/Moose Training/Documentation/DCSTypes.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSUnit.html b/Moose Training/Documentation/DCSUnit.html
index 421156d53..3eb946880 100644
--- a/Moose Training/Documentation/DCSUnit.html	
+++ b/Moose Training/Documentation/DCSUnit.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCSWorld.html b/Moose Training/Documentation/DCSWorld.html
index 21cb3b7d6..600b8b584 100644
--- a/Moose Training/Documentation/DCSWorld.html	
+++ b/Moose Training/Documentation/DCSWorld.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DCStimer.html b/Moose Training/Documentation/DCStimer.html
index f1d0e61d4..59f3b2ba1 100644
--- a/Moose Training/Documentation/DCStimer.html	
+++ b/Moose Training/Documentation/DCStimer.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DEPLOYTASK.html b/Moose Training/Documentation/DEPLOYTASK.html
index 75ab0d37a..56757c681 100644
--- a/Moose Training/Documentation/DEPLOYTASK.html	
+++ b/Moose Training/Documentation/DEPLOYTASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DESTROYBASETASK.html b/Moose Training/Documentation/DESTROYBASETASK.html
index 03d0d6973..4ad311e23 100644
--- a/Moose Training/Documentation/DESTROYBASETASK.html	
+++ b/Moose Training/Documentation/DESTROYBASETASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DESTROYGROUPSTASK.html b/Moose Training/Documentation/DESTROYGROUPSTASK.html
index b1afdec18..3bfd5b4b3 100644
--- a/Moose Training/Documentation/DESTROYGROUPSTASK.html	
+++ b/Moose Training/Documentation/DESTROYGROUPSTASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DESTROYRADARSTASK.html b/Moose Training/Documentation/DESTROYRADARSTASK.html
index 09c66cdbd..b99a2df40 100644
--- a/Moose Training/Documentation/DESTROYRADARSTASK.html	
+++ b/Moose Training/Documentation/DESTROYRADARSTASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/DESTROYUNITTYPESTASK.html b/Moose Training/Documentation/DESTROYUNITTYPESTASK.html
index cdf34dece..1c284398c 100644
--- a/Moose Training/Documentation/DESTROYUNITTYPESTASK.html	
+++ b/Moose Training/Documentation/DESTROYUNITTYPESTASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Database.html b/Moose Training/Documentation/Database.html
index f59745b8f..e8c9ee5b6 100644
--- a/Moose Training/Documentation/Database.html	
+++ b/Moose Training/Documentation/Database.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -278,6 +279,24 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).GROUPS">DATABASE.GROUPS</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).GetCategoryFromClientTemplate">DATABASE:GetCategoryFromClientTemplate(ClientName)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).GetCoalitionFromClientTemplate">DATABASE:GetCoalitionFromClientTemplate(ClientName)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).GetCountryFromClientTemplate">DATABASE:GetCountryFromClientTemplate(ClientName)</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -362,6 +381,12 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._EventOnPlayerLeaveUnit">DATABASE:_EventOnPlayerLeaveUnit(Event)</a></td>
 		<td class="summary">
 <p>Handles the OnPlayerLeaveUnit event to clean the active players table.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterClients">DATABASE:_RegisterClients()</a></td>
+		<td class="summary">
+<p>Private method that registers all Units of skill Client or Player within in the mission.</p>
 </td>
 		</tr>
 		<tr>
@@ -383,7 +408,7 @@ The following iterator methods are currently available within the DATABASE:</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterTemplate">DATABASE:_RegisterTemplate(GroupTemplate)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterTemplate">DATABASE:_RegisterTemplate(GroupTemplate, CoalitionID, CategoryID, CountryID)</a></td>
 		<td class="summary">
 <p>Private method that registers new Group Templates within the DATABASE Object.</p>
 </td>
@@ -1067,6 +1092,69 @@ self</p>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).GetCategoryFromClientTemplate" >
+<strong>DATABASE:GetCategoryFromClientTemplate(ClientName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ClientName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).GetCoalitionFromClientTemplate" >
+<strong>DATABASE:GetCoalitionFromClientTemplate(ClientName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ClientName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).GetCountryFromClientTemplate" >
+<strong>DATABASE:GetCountryFromClientTemplate(ClientName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ClientName </em></code>: </p>
+
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
@@ -1340,6 +1428,24 @@ self</p>
 		<dl class="function">
 <dt>
 
+<a id="#(DATABASE)._RegisterClients" >
+<strong>DATABASE:_RegisterClients()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Private method that registers all Units of skill Client or Player within in the mission.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(DATABASE)._RegisterGroupsAndUnits" >
 <strong>DATABASE:_RegisterGroupsAndUnits()</strong>
 </a>
@@ -1390,19 +1496,34 @@ self</p>
 <dt>
 
 <a id="#(DATABASE)._RegisterTemplate" >
-<strong>DATABASE:_RegisterTemplate(GroupTemplate)</strong>
+<strong>DATABASE:_RegisterTemplate(GroupTemplate, CoalitionID, CategoryID, CountryID)</strong>
 </a>
 </dt>
 <dd>
 	
 <p>Private method that registers new Group Templates within the DATABASE Object.</p>
 
-		<h3>Parameter</h3>
+		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
 <p><code><em>#table GroupTemplate </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em> CoalitionID </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> CategoryID </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> CountryID </em></code>: </p>
+
 				</li>
 		</ul>
 		<h3>Return value</h3>
diff --git a/Moose Training/Documentation/Escort.html b/Moose Training/Documentation/Escort.html
index b0c1318cd..8dff989f8 100644
--- a/Moose Training/Documentation/Escort.html	
+++ b/Moose Training/Documentation/Escort.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -175,6 +176,20 @@ Note that this is really fantastic, as you now have the dynamic of taking contro
 </ul>
 
 
+
+			<h2>Usage:</h2>
+		<pre class="example"><code>-- Declare a new EscortPlanes object as follows:
+
+-- First find the GROUP object and the CLIENT object.
+local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+
+-- Now use these 2 objects to construct the new EscortPlanes object.
+EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
+
+
+</code></pre>
+
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
@@ -430,12 +445,18 @@ Note that this is really fantastic, as you now have the dynamic of taking contro
 		<td class="name" nowrap="nowrap"><a href="##(ESCORT).EscortName">ESCORT.EscortName</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ESCORT).FollowDistance">ESCORT.FollowDistance</a></td>
+		<td class="summary">
+<p>The current follow distance.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ESCORT).FollowScheduler">ESCORT.FollowScheduler</a></td>
 		<td class="summary">
-<p>The id of the _FollowScheduler function.</p>
+<p>The instance of the SCHEDULER class.</p>
 </td>
 		</tr>
 		<tr>
@@ -589,7 +610,7 @@ Note that this is really fantastic, as you now have the dynamic of taking contro
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ESCORT)._FollowScheduler">ESCORT:_FollowScheduler(FollowDistance)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ESCORT)._FollowScheduler">ESCORT:_FollowScheduler()</a></td>
 		<td class="summary">
 
 </td>
@@ -1322,13 +1343,27 @@ Note that this is really fantastic, as you now have the dynamic of taking contro
 <dt>
 
 		<em>#number</em>
+<a id="#(ESCORT).FollowDistance" >
+<strong>ESCORT.FollowDistance</strong>
+</a>
+</dt>
+<dd>
+	
+<p>The current follow distance.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Scheduler.html##(SCHEDULER)">Scheduler#SCHEDULER</a></em>
 <a id="#(ESCORT).FollowScheduler" >
 <strong>ESCORT.FollowScheduler</strong>
 </a>
 </dt>
 <dd>
 	
-<p>The id of the _FollowScheduler function.</p>
+<p>The instance of the SCHEDULER class.</p>
 
 </dd>
 </dl>
@@ -1788,6 +1823,16 @@ Name of the escort.</p>
 <p><em><a href="##(ESCORT)">#ESCORT</a>:</em>
 self</p>
 
+			<h3>Usage:</h3>
+		<pre class="example"><code>-- Declare a new EscortPlanes object as follows:
+
+-- First find the GROUP object and the CLIENT object.
+local EscortClient = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
+local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+
+-- Now use these 2 objects to construct the new EscortPlanes object.
+EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )</code></pre>
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1962,21 +2007,13 @@ self</p>
 <dt>
 
 <a id="#(ESCORT)._FollowScheduler" >
-<strong>ESCORT:_FollowScheduler(FollowDistance)</strong>
+<strong>ESCORT:_FollowScheduler()</strong>
 </a>
 </dt>
 <dd>
 	
 
 
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em> FollowDistance </em></code>: </p>
-
-				</li>
-		</ul>
 </dd>
 </dl>
 		<dl class="function">
diff --git a/Moose Training/Documentation/Event.html b/Moose Training/Documentation/Event.html
index c455ef683..93784120c 100644
--- a/Moose Training/Documentation/Event.html	
+++ b/Moose Training/Documentation/Event.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/GOHOMETASK.html b/Moose Training/Documentation/GOHOMETASK.html
index 169154def..01aecd8ae 100644
--- a/Moose Training/Documentation/GOHOMETASK.html	
+++ b/Moose Training/Documentation/GOHOMETASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Group.html b/Moose Training/Documentation/Group.html
index 4d5dda341..e5a10a838 100644
--- a/Moose Training/Documentation/Group.html	
+++ b/Moose Training/Documentation/Group.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/MISSION.html b/Moose Training/Documentation/MISSION.html
index bb0b028e1..315e41b09 100644
--- a/Moose Training/Documentation/MISSION.html	
+++ b/Moose Training/Documentation/MISSION.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/MOVEMENT.html b/Moose Training/Documentation/MOVEMENT.html
index e780c1960..9a0de89fb 100644
--- a/Moose Training/Documentation/MOVEMENT.html	
+++ b/Moose Training/Documentation/MOVEMENT.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Menu.html b/Moose Training/Documentation/Menu.html
index 1030e5d3c..0976c0c20 100644
--- a/Moose Training/Documentation/Menu.html	
+++ b/Moose Training/Documentation/Menu.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Message.html b/Moose Training/Documentation/Message.html
index b19eb8463..61075a7ee 100644
--- a/Moose Training/Documentation/Message.html	
+++ b/Moose Training/Documentation/Message.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/MissileTrainer.html b/Moose Training/Documentation/MissileTrainer.html
index cb7573dbd..fcbdafcc7 100644
--- a/Moose Training/Documentation/MissileTrainer.html	
+++ b/Moose Training/Documentation/MissileTrainer.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -190,6 +191,12 @@ It suports the following functionality:</p>
 		<td class="name" nowrap="nowrap"><a href="##(MISSILETRAINER).ClassName">MISSILETRAINER.ClassName</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSILETRAINER).DBClients">MISSILETRAINER.DBClients</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -286,6 +293,12 @@ It suports the following functionality:</p>
 		<td class="name" nowrap="nowrap"><a href="##(MISSILETRAINER).TrackingFrequency">MISSILETRAINER.TrackingFrequency</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSILETRAINER).TrackingMissiles">MISSILETRAINER.TrackingMissiles</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -310,6 +323,12 @@ It suports the following functionality:</p>
 		<td class="name" nowrap="nowrap"><a href="##(MISSILETRAINER)._AddRange">MISSILETRAINER:_AddRange(Client, TrainerWeapon)</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSILETRAINER)._Alive">MISSILETRAINER._Alive(Client, self)</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -408,6 +427,20 @@ It suports the following functionality:</p>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a></em>
+<a id="#(MISSILETRAINER).DBClients" >
+<strong>MISSILETRAINER.DBClients</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -786,6 +819,20 @@ The distance in meters when a tracked missile needs to be destroyed when close t
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MISSILETRAINER).TrackingMissiles" >
+<strong>MISSILETRAINER.TrackingMissiles</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -871,6 +918,32 @@ The distance in meters when a tracked missile needs to be destroyed when close t
 		<dl class="function">
 <dt>
 
+<a id="#(MISSILETRAINER)._Alive" >
+<strong>MISSILETRAINER._Alive(Client, self)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Client </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> self </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(MISSILETRAINER)._EventShot" >
 <strong>MISSILETRAINER:_EventShot(Event)</strong>
 </a>
diff --git a/Moose Training/Documentation/NOTASK.html b/Moose Training/Documentation/NOTASK.html
index a16acc7f7..91637bb7f 100644
--- a/Moose Training/Documentation/NOTASK.html	
+++ b/Moose Training/Documentation/NOTASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/PICKUPTASK.html b/Moose Training/Documentation/PICKUPTASK.html
index 88c16ead1..b00b67633 100644
--- a/Moose Training/Documentation/PICKUPTASK.html	
+++ b/Moose Training/Documentation/PICKUPTASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Point.html b/Moose Training/Documentation/Point.html
index 84d50a13d..5ce62bfb0 100644
--- a/Moose Training/Documentation/Point.html	
+++ b/Moose Training/Documentation/Point.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/ROUTETASK.html b/Moose Training/Documentation/ROUTETASK.html
index 6808f2933..524cc693f 100644
--- a/Moose Training/Documentation/ROUTETASK.html	
+++ b/Moose Training/Documentation/ROUTETASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/STAGE.html b/Moose Training/Documentation/STAGE.html
index d4e26709d..beb73a83b 100644
--- a/Moose Training/Documentation/STAGE.html	
+++ b/Moose Training/Documentation/STAGE.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Scheduler.html b/Moose Training/Documentation/Scheduler.html
index 55b979b86..27b4935ba 100644
--- a/Moose Training/Documentation/Scheduler.html	
+++ b/Moose Training/Documentation/Scheduler.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Scoring.html b/Moose Training/Documentation/Scoring.html
index c37ce03ca..22c920010 100644
--- a/Moose Training/Documentation/Scoring.html	
+++ b/Moose Training/Documentation/Scoring.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Sead.html b/Moose Training/Documentation/Sead.html
index f756d0ec7..f9186167b 100644
--- a/Moose Training/Documentation/Sead.html	
+++ b/Moose Training/Documentation/Sead.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Set.html b/Moose Training/Documentation/Set.html
index 684113b13..093aa3c2b 100644
--- a/Moose Training/Documentation/Set.html	
+++ b/Moose Training/Documentation/Set.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -111,7 +112,7 @@ You can set the <strong>"yield interval"</strong>, and the <strong>"time interva
 </ul>
 
 <h2>2.2) Add or Remove GROUP(s) from SET_GROUP: </h2>
-<p>GROUPS can be added and removed using the <a href="Set.html##(SET_GROUP).AddGroupsByName">Set#SET_GROUP.AddGroupsByName</a> and <a href="Set.html##(SET_GROUPS).RemoveGroupsByName">Set#SET_GROUPS.RemoveGroupsByName</a> respectively. 
+<p>GROUPS can be added and removed using the <a href="Set.html##(SET_GROUP).AddGroupsByName">Set#SET_GROUP.AddGroupsByName</a> and <a href="Set.html##(SET_GROUP).RemoveGroupsByName">Set#SET_GROUP.RemoveGroupsByName</a> respectively. 
 These methods take a single GROUP name or an array of GROUP names to be added or removed from SET_GROUP.</p>
 
 <h2>2.3) SET_GROUP filter criteria: </h2>
@@ -169,8 +170,11 @@ The following iterator methods are currently available within the SET</em>GROUP:
     <li><a href="##(SET_UNIT).New">SET_UNIT.New</a>: Creates a new SET_UNIT object.</li>
 </ul>
 
+<h2>3.2) Add or Remove UNIT(s) from SET_UNIT: </h2>
+<p>UNITs can be added and removed using the <a href="Set.html##(SET_UNIT).AddUnitsByName">Set#SET_UNIT.AddUnitsByName</a> and <a href="Set.html##(SET_UNIT).RemoveUnitsByName">Set#SET_UNIT.RemoveUnitsByName</a> respectively. 
+These methods take a single UNIT name or an array of UNIT names to be added or removed from SET_UNIT.</p>
 
-<h2>3.2) SET_UNIT filter criteria: </h2>
+<h2>3.3) SET_UNIT filter criteria: </h2>
 <p>You can set filter criteria to define the set of units within the SET_UNIT.
 Filter criteria are defined by:</p>
 
@@ -194,22 +198,79 @@ Filter criteria are defined by:</p>
     <li><a href="##(SET_UNIT).FilterZones">SET_UNIT.FilterZones</a>: Builds the SET_UNIT with the units within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
 </ul>
 
-<h2>3.3) SET_UNIT iterators:</h2>
+<h2>3.4) SET_UNIT iterators:</h2>
 <p>Once the filters have been defined and the SET<em>UNIT has been built, you can iterate the SET</em>UNIT with the available iterator methods.
 The iterator methods will walk the SET<em>UNIT set, and call for each element within the set a function that you provide.
 The following iterator methods are currently available within the SET</em>UNIT:</p>
 
 <ul>
     <li><a href="##(SET_UNIT).ForEachUnit">SET_UNIT.ForEachUnit</a>: Calls a function for each alive unit it finds within the SET_UNIT.</li>
+    <li><a href="##(SET_GROUP).ForEachGroupCompletelyInZone">SET_GROUP.ForEachGroupCompletelyInZone</a>: Iterate the SET_GROUP and call an iterator function for each <strong>alive</strong> GROUP presence completely in a <a href="Zone.html">Zone</a>, providing the GROUP and optional parameters to the called function.</li>
+    <li><a href="##(SET_GROUP).ForEachGroupNotInZone">SET_GROUP.ForEachGroupNotInZone</a>: Iterate the SET_GROUP and call an iterator function for each <strong>alive</strong> GROUP presence not in a <a href="Zone.html">Zone</a>, providing the GROUP and optional parameters to the called function.</li>
 </ul>
 
 <p>Planned iterators methods in development are (so these are not yet available):</p>
 
 <ul>
-    <li><a href="##(SET_UNIT).ForEachUnitInGroup">SET_UNIT.ForEachUnitInGroup</a>: Calls a function for each group contained within the SET_UNIT.</li>
-    <li><a href="##(SET_UNIT).ForEachUnitInZone">SET_UNIT.ForEachUnitInZone</a>: Calls a function for each unit within a certain zone contained within the SET_UNIT.</li>
+    <li><a href="##(SET_UNIT).ForEachUnitInUnit">SET_UNIT.ForEachUnitInUnit</a>: Calls a function for each unit contained within the SET_UNIT.</li>
+    <li><a href="##(SET_UNIT).ForEachUnitCompletelyInZone">SET_UNIT.ForEachUnitCompletelyInZone</a>: Iterate and call an iterator function for each <strong>alive</strong> UNIT presence completely in a <a href="Zone.html">Zone</a>, providing the UNIT and optional parameters to the called function.</li>
+    <li><a href="##(SET_UNIT).ForEachUnitNotInZone">SET_UNIT.ForEachUnitNotInZone</a>: Iterate and call an iterator function for each <strong>alive</strong> UNIT presence not in a <a href="Zone.html">Zone</a>, providing the UNIT and optional parameters to the called function.</li>
 </ul>
 
+<h1>4) <a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a> class, extends <a href="Set.html##(SET_BASE)">Set#SET_BASE</a></h1>
+<p>Mission designers can use the <a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a> class to build sets of units belonging to certain:</p>
+
+<ul>
+    <li>Coalitions</li>
+    <li>Categories</li>
+    <li>Countries</li>
+    <li>Client types</li>
+    <li>Starting with certain prefix strings.</li>
+</ul>
+
+<h2>4.1) SET_CLIENT construction method:</h2>
+<p>Create a new SET_CLIENT object with the <a href="##(SET_CLIENT).New">SET_CLIENT.New</a> method:</p>
+
+<ul>
+    <li><a href="##(SET_CLIENT).New">SET_CLIENT.New</a>: Creates a new SET_CLIENT object.</li>
+</ul>
+
+<h2>4.2) Add or Remove CLIENT(s) from SET_CLIENT: </h2>
+<p>CLIENTs can be added and removed using the <a href="Set.html##(SET_CLIENT).AddClientsByName">Set#SET_CLIENT.AddClientsByName</a> and <a href="Set.html##(SET_CLIENT).RemoveClientsByName">Set#SET_CLIENT.RemoveClientsByName</a> respectively. 
+These methods take a single CLIENT name or an array of CLIENT names to be added or removed from SET_CLIENT.</p>
+
+<h2>4.3) SET_CLIENT filter criteria: </h2>
+<p>You can set filter criteria to define the set of clients within the SET_CLIENT.
+Filter criteria are defined by:</p>
+
+<ul>
+    <li><a href="##(SET_CLIENT).FilterCoalitions">SET_CLIENT.FilterCoalitions</a>: Builds the SET_CLIENT with the clients belonging to the coalition(s).</li>
+    <li><a href="##(SET_CLIENT).FilterCategories">SET_CLIENT.FilterCategories</a>: Builds the SET_CLIENT with the clients belonging to the category(ies).</li>
+    <li><a href="##(SET_CLIENT).FilterTypes">SET_CLIENT.FilterTypes</a>: Builds the SET_CLIENT with the clients belonging to the client type(s).</li>
+    <li><a href="##(SET_CLIENT).FilterCountries">SET_CLIENT.FilterCountries</a>: Builds the SET_CLIENT with the clients belonging to the country(ies).</li>
+    <li><a href="##(SET_CLIENT).FilterPrefixes">SET_CLIENT.FilterPrefixes</a>: Builds the SET_CLIENT with the clients starting with the same prefix string(s).</li>
+</ul>
+
+<p>Once the filter criteria have been set for the SET_CLIENT, you can start filtering using:</p>
+
+<ul>
+    <li><a href="##(SET_CLIENT).FilterStart">SET_CLIENT.FilterStart</a>: Starts the filtering of the clients within the SET_CLIENT.</li>
+</ul>
+
+<p>Planned filter criteria within development are (so these are not yet available):</p>
+
+<ul>
+    <li><a href="##(SET_CLIENT).FilterZones">SET_CLIENT.FilterZones</a>: Builds the SET_CLIENT with the clients within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
+</ul>
+
+<h2>4.4) SET_CLIENT iterators:</h2>
+<p>Once the filters have been defined and the SET<em>CLIENT has been built, you can iterate the SET</em>CLIENT with the available iterator methods.
+The iterator methods will walk the SET<em>CLIENT set, and call for each element within the set a function that you provide.
+The following iterator methods are currently available within the SET</em>CLIENT:</p>
+
+<ul>
+    <li><a href="##(SET_CLIENT).ForEachClient">SET_CLIENT.ForEachClient</a>: Calls a function for each alive client it finds within the SET_CLIENT.</li>
+</ul>
 
 <hr/>
 
@@ -220,6 +281,12 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<td class="name" nowrap="nowrap"><a href="#SET_BASE">SET_BASE</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#SET_CLIENT">SET_CLIENT</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -247,12 +314,6 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).ClassName">SET_BASE.ClassName</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).Database">SET_BASE.Database</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -331,6 +392,130 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE)._Find">SET_BASE:_Find(ObjectName)</a></td>
 		<td class="summary">
 <p>Finds an <a href="Base.html##(BASE)">Base#BASE</a> object based on the object Name.</p>
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(SET_CLIENT)">Type <code>SET_CLIENT</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).AddClientsByName">SET_CLIENT:AddClientsByName(AddClientNames)</a></td>
+		<td class="summary">
+<p>Add CLIENT(s) to SET_CLIENT.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).AddInDatabase">SET_CLIENT:AddInDatabase(Event)</a></td>
+		<td class="summary">
+<p>Handles the Database to check on an event (birth) that the Object was added in the Database.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).ClassName">SET_CLIENT.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).Clients">SET_CLIENT.Clients</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).Filter">SET_CLIENT.Filter</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterCategories">SET_CLIENT:FilterCategories(Categories)</a></td>
+		<td class="summary">
+<p>Builds a set of clients out of categories.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterCoalitions">SET_CLIENT:FilterCoalitions(Coalitions)</a></td>
+		<td class="summary">
+<p>Builds a set of clients of coalitions.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterCountries">SET_CLIENT:FilterCountries(Countries)</a></td>
+		<td class="summary">
+<p>Builds a set of clients of defined countries.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterMeta">SET_CLIENT.FilterMeta</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterPrefixes">SET_CLIENT:FilterPrefixes(Prefixes)</a></td>
+		<td class="summary">
+<p>Builds a set of clients of defined client prefixes.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterStart">SET_CLIENT:FilterStart()</a></td>
+		<td class="summary">
+<p>Starts the filtering.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FilterTypes">SET_CLIENT:FilterTypes(Types)</a></td>
+		<td class="summary">
+<p>Builds a set of clients of defined client types.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FindClient">SET_CLIENT:FindClient(ClientName)</a></td>
+		<td class="summary">
+<p>Finds a Client based on the Client Name.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).FindInDatabase">SET_CLIENT:FindInDatabase(Event)</a></td>
+		<td class="summary">
+<p>Handles the Database to check on any event that Object exists in the Database.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).ForEachClient">SET_CLIENT:ForEachClient(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Interate the SET_CLIENT and call an interator function for each <strong>alive</strong> CLIENT, providing the CLIENT and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).ForEachClientCompletelyInZone">SET_CLIENT:ForEachClientCompletelyInZone(ZoneObject, IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the SET_CLIENT and call an iterator function for each <strong>alive</strong> CLIENT presence completely in a <a href="Zone.html">Zone</a>, providing the CLIENT and optional parameters to the called function.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).ForEachClientNotInZone">SET_CLIENT:ForEachClientNotInZone(ZoneObject, IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the SET_CLIENT and call an iterator function for each <strong>alive</strong> CLIENT presence not in a <a href="Zone.html">Zone</a>, providing the CLIENT and optional parameters to the called function.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).IsIncludeObject">SET_CLIENT:IsIncludeObject(MClient)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).New">SET_CLIENT:New()</a></td>
+		<td class="summary">
+<p>Creates a new SET_CLIENT object, building a set of clients belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_CLIENT).RemoveClientsByName">SET_CLIENT:RemoveClientsByName(RemoveClientNames)</a></td>
+		<td class="summary">
+<p>Remove CLIENT(s) from SET_CLIENT.</p>
 </td>
 		</tr>
 	</table>
@@ -448,7 +633,7 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_GROUP).RemoveGroupsByName">SET_GROUP:RemoveGroupsByName(RemoveGroupNames)</a></td>
 		<td class="summary">
-<p>Remove GROUP(s) to SET_GROUP.</p>
+<p>Remove GROUP(s) from SET_GROUP.</p>
 </td>
 		</tr>
 	</table>
@@ -459,6 +644,12 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).AddInDatabase">SET_UNIT:AddInDatabase(Event)</a></td>
 		<td class="summary">
 <p>Handles the Database to check on an event (birth) that the Object was added in the Database.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).AddUnitsByName">SET_UNIT:AddUnitsByName(AddUnitNames)</a></td>
+		<td class="summary">
+<p>Add UNIT(s) to SET_UNIT.</p>
 </td>
 		</tr>
 		<tr>
@@ -531,6 +722,18 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).ForEachUnit">SET_UNIT:ForEachUnit(IteratorFunction, ...)</a></td>
 		<td class="summary">
 <p>Interate the SET_UNIT and call an interator function for each <strong>alive</strong> UNIT, providing the UNIT and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).ForEachUnitCompletelyInZone">SET_UNIT:ForEachUnitCompletelyInZone(ZoneObject, IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the SET_UNIT and call an iterator function for each <strong>alive</strong> UNIT presence completely in a <a href="Zone.html">Zone</a>, providing the UNIT and optional parameters to the called function.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).ForEachUnitNotInZone">SET_UNIT:ForEachUnitNotInZone(ZoneObject, IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the SET_UNIT and call an iterator function for each <strong>alive</strong> UNIT presence not in a <a href="Zone.html">Zone</a>, providing the UNIT and optional parameters to the called function.</p>
 </td>
 		</tr>
 		<tr>
@@ -543,6 +746,12 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).New">SET_UNIT:New()</a></td>
 		<td class="summary">
 <p>Creates a new SET_UNIT object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SET_UNIT).RemoveUnitsByName">SET_UNIT:RemoveUnitsByName(RemoveUnitNames)</a></td>
+		<td class="summary">
+<p>Remove UNIT(s) from SET_UNIT.</p>
 </td>
 		</tr>
 		<tr>
@@ -566,6 +775,20 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(SET_CLIENT)">#SET_CLIENT</a></em>
+<a id="SET_CLIENT" >
+<strong>SET_CLIENT</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -646,20 +869,6 @@ The added BASE Object.</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET_BASE).Database" >
-<strong>SET_BASE.Database</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -966,6 +1175,550 @@ self</p>
 <p><em><a href="Base.html##(BASE)">Base#BASE</a>:</em>
 The Object found.</p>
 
+</dd>
+</dl>
+
+			<h2><a id="#(SET_CLIENT)" >Type <code>SET_CLIENT</code></a></h2>
+				
+<p>SET_CLIENT class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).AddClientsByName" >
+<strong>SET_CLIENT:AddClientsByName(AddClientNames)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add CLIENT(s) to SET_CLIENT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string AddClientNames </em></code>: 
+A single name or an array of CLIENT names.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+
+<p>self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).AddInDatabase" >
+<strong>SET_CLIENT:AddInDatabase(Event)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Handles the Database to check on an event (birth) that the Object was added in the Database.</p>
+
+	
+<p>This is required, because sometimes the <em>DATABASE birth event gets called later than the SET</em>BASE birth event!</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em>#string:</em>
+The name of the CLIENT</p>
+
+				</li>
+				<li>
+				
+<p><em>#table:</em>
+The CLIENT</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(SET_CLIENT).ClassName" >
+<strong>SET_CLIENT.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(SET_CLIENT).Clients" >
+<strong>SET_CLIENT.Clients</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(SET_CLIENT).Filter" >
+<strong>SET_CLIENT.Filter</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FilterCategories" >
+<strong>SET_CLIENT:FilterCategories(Categories)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of clients out of categories.</p>
+
+	
+<p>Possible current categories are plane, helicopter, ground, ship.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Categories </em></code>: 
+Can take the following values: "plane", "helicopter", "ground", "ship".</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FilterCoalitions" >
+<strong>SET_CLIENT:FilterCoalitions(Coalitions)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of clients of coalitions.</p>
+
+	
+<p>Possible current coalitions are red, blue and neutral.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Coalitions </em></code>: 
+Can take the following values: "red", "blue", "neutral".</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FilterCountries" >
+<strong>SET_CLIENT:FilterCountries(Countries)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of clients of defined countries.</p>
+
+	
+<p>Possible current countries are those known within DCS world.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Countries </em></code>: 
+Can take those country strings known within DCS world.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(SET_CLIENT).FilterMeta" >
+<strong>SET_CLIENT.FilterMeta</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FilterPrefixes" >
+<strong>SET_CLIENT:FilterPrefixes(Prefixes)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of clients of defined client prefixes.</p>
+
+	
+<p>All the clients starting with the given prefixes will be included within the set.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Prefixes </em></code>: 
+The prefix of which the client name starts with.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FilterStart" >
+<strong>SET_CLIENT:FilterStart()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Starts the filtering.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FilterTypes" >
+<strong>SET_CLIENT:FilterTypes(Types)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of clients of defined client types.</p>
+
+	
+<p>Possible current types are those types known within DCS world.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Types </em></code>: 
+Can take those type strings known within DCS world.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FindClient" >
+<strong>SET_CLIENT:FindClient(ClientName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Finds a Client based on the Client Name.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string ClientName </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Client.html##(CLIENT)">Client#CLIENT</a>:</em>
+The found Client.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).FindInDatabase" >
+<strong>SET_CLIENT:FindInDatabase(Event)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Handles the Database to check on any event that Object exists in the Database.</p>
+
+	
+<p>This is required, because sometimes the <em>DATABASE event gets called later than the SET</em>BASE event or vise versa!</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em>#string:</em>
+The name of the CLIENT</p>
+
+				</li>
+				<li>
+				
+<p><em>#table:</em>
+The CLIENT</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).ForEachClient" >
+<strong>SET_CLIENT:ForEachClient(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Interate the SET_CLIENT and call an interator function for each <strong>alive</strong> CLIENT, providing the CLIENT and optional parameters.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function IteratorFunction </em></code>: 
+The function that will be called when there is an alive CLIENT in the SET_CLIENT. The function needs to accept a CLIENT parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).ForEachClientCompletelyInZone" >
+<strong>SET_CLIENT:ForEachClientCompletelyInZone(ZoneObject, IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the SET_CLIENT and call an iterator function for each <strong>alive</strong> CLIENT presence completely in a <a href="Zone.html">Zone</a>, providing the CLIENT and optional parameters to the called function.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+The Zone to be tested for.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#function IteratorFunction </em></code>: 
+The function that will be called when there is an alive CLIENT in the SET_CLIENT. The function needs to accept a CLIENT parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).ForEachClientNotInZone" >
+<strong>SET_CLIENT:ForEachClientNotInZone(ZoneObject, IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the SET_CLIENT and call an iterator function for each <strong>alive</strong> CLIENT presence not in a <a href="Zone.html">Zone</a>, providing the CLIENT and optional parameters to the called function.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+The Zone to be tested for.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#function IteratorFunction </em></code>: 
+The function that will be called when there is an alive CLIENT in the SET_CLIENT. The function needs to accept a CLIENT parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).IsIncludeObject" >
+<strong>SET_CLIENT:IsIncludeObject(MClient)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> MClient </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).New" >
+<strong>SET_CLIENT:New()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new SET_CLIENT object, building a set of clients belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_CLIENT)">#SET_CLIENT</a>:</em></p>
+
+
+			<h3>Usage:</h3>
+		<pre class="example"><code>-- Define a new SET_CLIENT Object. This DBObject will contain a reference to all Clients.
+DBObject = SET_CLIENT:New()</code></pre>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_CLIENT).RemoveClientsByName" >
+<strong>SET_CLIENT:RemoveClientsByName(RemoveClientNames)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Remove CLIENT(s) from SET_CLIENT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> RemoveClientNames </em></code>: 
+A single name or an array of CLIENT names.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+
+<p>self</p>
+
 </dd>
 </dl>
 
@@ -1488,7 +2241,7 @@ DBObject = SET_GROUP:New()</code></pre>
 </dt>
 <dd>
 	
-<p>Remove GROUP(s) to SET_GROUP.</p>
+<p>Remove GROUP(s) from SET_GROUP.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -1549,6 +2302,33 @@ The UNIT</p>
 
 				</li>
 			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_UNIT).AddUnitsByName" >
+<strong>SET_UNIT:AddUnitsByName(AddUnitNames)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add UNIT(s) to SET_UNIT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string AddUnitNames </em></code>: 
+A single name or an array of UNIT names.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+
+<p>self</p>
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1861,6 +2641,82 @@ self</p>
 		<dl class="function">
 <dt>
 
+<a id="#(SET_UNIT).ForEachUnitCompletelyInZone" >
+<strong>SET_UNIT:ForEachUnitCompletelyInZone(ZoneObject, IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the SET_UNIT and call an iterator function for each <strong>alive</strong> UNIT presence completely in a <a href="Zone.html">Zone</a>, providing the UNIT and optional parameters to the called function.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+The Zone to be tested for.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#function IteratorFunction </em></code>: 
+The function that will be called when there is an alive UNIT in the SET_UNIT. The function needs to accept a UNIT parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_UNIT)">#SET_UNIT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_UNIT).ForEachUnitNotInZone" >
+<strong>SET_UNIT:ForEachUnitNotInZone(ZoneObject, IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the SET_UNIT and call an iterator function for each <strong>alive</strong> UNIT presence not in a <a href="Zone.html">Zone</a>, providing the UNIT and optional parameters to the called function.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+The Zone to be tested for.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#function IteratorFunction </em></code>: 
+The function that will be called when there is an alive UNIT in the SET_UNIT. The function needs to accept a UNIT parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(SET_UNIT)">#SET_UNIT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(SET_UNIT).IsIncludeObject" >
 <strong>SET_UNIT:IsIncludeObject(MUnit)</strong>
 </a>
@@ -1904,6 +2760,33 @@ self</p>
 		<pre class="example"><code>-- Define a new SET_UNIT Object. This DBObject will contain a reference to all alive Units.
 DBObject = SET_UNIT:New()</code></pre>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SET_UNIT).RemoveUnitsByName" >
+<strong>SET_UNIT:RemoveUnitsByName(RemoveUnitNames)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Remove UNIT(s) from SET_UNIT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> RemoveUnitNames </em></code>: 
+A single name or an array of UNIT names.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+
+<p>self</p>
+
 </dd>
 </dl>
 		<dl class="function">
diff --git a/Moose Training/Documentation/Spawn.html b/Moose Training/Documentation/Spawn.html
index ef75c88e3..9d9502cc0 100644
--- a/Moose Training/Documentation/Spawn.html	
+++ b/Moose Training/Documentation/Spawn.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Static.html b/Moose Training/Documentation/Static.html
index 3d3ee61c2..8a589c0a6 100644
--- a/Moose Training/Documentation/Static.html	
+++ b/Moose Training/Documentation/Static.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/StaticObject.html b/Moose Training/Documentation/StaticObject.html
index bbf2cba18..53b5c8f56 100644
--- a/Moose Training/Documentation/StaticObject.html	
+++ b/Moose Training/Documentation/StaticObject.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/TASK.html b/Moose Training/Documentation/TASK.html
index 3855d0f1e..7d531077c 100644
--- a/Moose Training/Documentation/TASK.html	
+++ b/Moose Training/Documentation/TASK.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Unit.html b/Moose Training/Documentation/Unit.html
index 8f51b0453..0472aab38 100644
--- a/Moose Training/Documentation/Unit.html	
+++ b/Moose Training/Documentation/Unit.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/Zone.html b/Moose Training/Documentation/Zone.html
index 490e4449d..260ecb52c 100644
--- a/Moose Training/Documentation/Zone.html	
+++ b/Moose Training/Documentation/Zone.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/env.html b/Moose Training/Documentation/env.html
index 927b69495..aebd87009 100644
--- a/Moose Training/Documentation/env.html	
+++ b/Moose Training/Documentation/env.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/index.html b/Moose Training/Documentation/index.html
index 96be59ebe..1f1d181a4 100644
--- a/Moose Training/Documentation/index.html	
+++ b/Moose Training/Documentation/index.html	
@@ -17,6 +17,7 @@
 				index
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
@@ -71,6 +72,12 @@
 	<div id="content">
 <h2>Module</h2>
 	<table class="module_list">
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="AIBalancer.html">AIBalancer</a></td>
+			<td class="summary">
+<p>This module contains the AIBALANCER class.</p>
+</td>
+			</tr>
 			<tr>
 			<td class="name" nowrap="nowrap"><a href="Airbase.html">Airbase</a></td>
 			<td class="summary">
diff --git a/Moose Training/Documentation/land.html b/Moose Training/Documentation/land.html
index 2164e74b0..b958ddd17 100644
--- a/Moose Training/Documentation/land.html	
+++ b/Moose Training/Documentation/land.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
diff --git a/Moose Training/Documentation/routines.html b/Moose Training/Documentation/routines.html
index 2a4b23fd8..f5422ae60 100644
--- a/Moose Training/Documentation/routines.html	
+++ b/Moose Training/Documentation/routines.html	
@@ -17,6 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
+					<li><a href="AIBalancer.html">AIBalancer</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>