diff --git a/Moose Development/Moose/Airbase.lua b/Moose Development/Moose/Airbase.lua
new file mode 100644
index 000000000..970e8ddfa
--- /dev/null
+++ b/Moose Development/Moose/Airbase.lua	
@@ -0,0 +1,290 @@
+--- AIRBASE Class
+-- 
+-- @{AIRBASE} class
+-- ==============
+-- The @{AIRBASE} class is a wrapper class to handle the DCS Airbase objects:
+-- 
+--  * Support all DCS Airbase APIs.
+--  * Enhance with Airbase specific APIs not in the DCS Airbase API set.
+--  
+--  
+-- AIRBASE reference methods
+-- ====================== 
+-- For each DCS Airbase object alive within a running mission, a AIRBASE wrapper object (instance) will be created within the _@{DATABASE} object.
+-- This is done at the beginning of the mission (when the mission starts).
+--  
+-- The AIRBASE class **does not contain a :New()** method, rather it provides **:Find()** methods to retrieve the object reference
+-- using the DCS Airbase or the DCS AirbaseName.
+-- 
+-- Another thing to know is that AIRBASE objects do not "contain" the DCS Airbase object. 
+-- The AIRBASE methods will reference the DCS Airbase object by name when it is needed during API execution.
+-- If the DCS Airbase object does not exist or is nil, the AIRBASE methods will return nil and log an exception in the DCS.log file.
+--  
+-- The AIRBASE class provides the following functions to retrieve quickly the relevant AIRBASE instance:
+-- 
+--  * @{#AIRBASE.Find}(): Find a AIRBASE instance from the _DATABASE object using a DCS Airbase object.
+--  * @{#AIRBASE.FindByName}(): Find a AIRBASE instance from the _DATABASE object using a DCS Airbase name.
+--  
+-- IMPORTANT: ONE SHOULD NEVER SANATIZE these AIRBASE OBJECT REFERENCES! (make the AIRBASE object references nil).
+-- 
+-- DCS AIRBASE APIs
+-- =============
+-- The DCS Airbase APIs are used extensively within MOOSE. The AIRBASE class has for each DCS Airbase API a corresponding method.
+-- To be able to distinguish easily in your code the difference between a AIRBASE API call and a DCS Airbase API call,
+-- the first letter of the method is also capitalized. So, by example, the DCS Airbase method @{DCSAirbase#Airbase.getName}()
+-- is implemented in the AIRBASE class as @{#AIRBASE.GetName}().
+-- 
+-- More functions will be added
+-- ----------------------------
+-- During the MOOSE development, more functions will be added. 
+-- 
+-- @module Airbase
+-- @author FlightControl
+
+Include.File( "Routines" )
+Include.File( "Base" )
+Include.File( "Message" )
+
+--- The AIRBASE class
+-- @type AIRBASE
+-- @extends Base#BASE
+AIRBASE = {
+  ClassName="AIRBASE",
+  CategoryName = { 
+    [Airbase.Category.AIRDROME]   = "Airdrome",
+    [Airbase.Category.HELIPAD]    = "Helipad",
+    [Airbase.Category.SHIP]       = "Ship",
+    },
+  }
+
+-- Registration.
+  
+--- Create a new AIRBASE from DCSAirbase.
+-- @param #AIRBASE self
+-- @param DCSAirbase#Airbase DCSAirbase
+-- @param Database#DATABASE Database
+-- @return Airbase#AIRBASE
+function AIRBASE:Register( AirbaseName )
+
+  local self = BASE:Inherit( self, BASE:New() )
+  self:F2( AirbaseName )
+  self.AirbaseName = AirbaseName
+  return self
+end
+
+-- Reference methods.
+
+--- Finds a AIRBASE from the _DATABASE using a DCSAirbase object.
+-- @param #AIRBASE self
+-- @param DCSAirbase#Airbase DCSAirbase An existing DCS Airbase object reference.
+-- @return Airbase#AIRBASE self
+function AIRBASE:Find( DCSAirbase )
+
+  local AirbaseName = DCSAirbase:getName()
+  local AirbaseFound = _DATABASE:FindAirbase( AirbaseName )
+  return AirbaseFound
+end
+
+--- Find a AIRBASE in the _DATABASE using the name of an existing DCS Airbase.
+-- @param #AIRBASE self
+-- @param #string AirbaseName The Airbase Name.
+-- @return Airbase#AIRBASE self
+function AIRBASE:FindByName( AirbaseName )
+  
+  local AirbaseFound = _DATABASE:FindAirbase( AirbaseName )
+  return AirbaseFound
+end
+
+function AIRBASE:GetDCSAirbase()
+  local DCSAirbase = Airbase.getByName( self.AirbaseName )
+  
+  if DCSAirbase then
+    return DCSAirbase
+  end
+    
+  return nil
+end
+
+--- Returns coalition of the Airbase.
+-- @param Airbase#AIRBASE self
+-- @return DCSCoalitionObject#coalition.side The side of the coalition.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetCoalition()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseCoalition = DCSAirbase:getCoalition()
+    self:T3( AirbaseCoalition )
+    return AirbaseCoalition
+  end 
+  
+  return nil
+end
+
+--- Returns country of the Airbase.
+-- @param Airbase#AIRBASE self
+-- @return DCScountry#country.id The country identifier.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetCountry()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseCountry = DCSAirbase:getCountry()
+    self:T3( AirbaseCountry )
+    return AirbaseCountry
+  end 
+  
+  return nil
+end
+ 
+
+--- Returns DCS Airbase object name. 
+-- The function provides access to non-activated units too.
+-- @param Airbase#AIRBASE self
+-- @return #string The name of the DCS Airbase.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetName()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseName = self.AirbaseName
+    return AirbaseName
+  end 
+  
+  return nil
+end
+
+
+--- Returns if the airbase is alive.
+-- @param Airbase#AIRBASE self
+-- @return #boolean true if Airbase is alive.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:IsAlive()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseIsAlive = DCSAirbase:isExist()
+    return AirbaseIsAlive
+  end 
+  
+  return false
+end
+
+--- Returns the unit's unique identifier.
+-- @param Airbase#AIRBASE self
+-- @return DCSAirbase#Airbase.ID Airbase ID
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetID()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseID = DCSAirbase:getID()
+    return AirbaseID
+  end 
+
+  return nil
+end
+
+--- Returns the Airbase's callsign - the localized string.
+-- @param Airbase#AIRBASE self
+-- @return #string The Callsign of the Airbase.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetCallSign()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseCallSign = DCSAirbase:getCallsign()
+    return AirbaseCallSign
+  end
+  
+  return nil
+end
+
+
+
+--- Returns unit descriptor. Descriptor type depends on unit category.
+-- @param Airbase#AIRBASE self
+-- @return DCSAirbase#Airbase.Desc The Airbase descriptor.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetDesc()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseDesc = DCSAirbase:getDesc()
+    return AirbaseDesc
+  end
+  
+  return nil
+end
+
+
+--- Returns the type name of the DCS Airbase.
+-- @param Airbase#AIRBASE self
+-- @return #string The type name of the DCS Airbase.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetTypeName()
+  self:F2( self.AirbaseName )
+  
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseTypeName = DCSAirbase:getTypeName()
+    self:T3( AirbaseTypeName )
+    return AirbaseTypeName
+  end
+
+  return nil
+end
+
+
+--- Returns the @{DCSTypes#Vec2} vector indicating the point in 2D of the DCS Airbase within the mission.
+-- @param Airbase#AIRBASE self
+-- @return DCSTypes#Vec2 The 2D point vector of the DCS Airbase.
+-- @return #nil The DCS Airbase is not existing or alive.  
+function AIRBASE:GetPointVec2()
+  self:F2( self.AirbaseName )
+
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbasePointVec3 = DCSAirbase:getPosition().p
+    
+    local AirbasePointVec2 = {}
+    AirbasePointVec2.x = AirbasePointVec3.x
+    AirbasePointVec2.y = AirbasePointVec3.z
+  
+    self:T3( AirbasePointVec2 )
+    return AirbasePointVec2
+  end
+  
+  return nil
+end
+
+--- Returns the DCS Airbase category name as defined within the DCS Airbase Descriptor.
+-- @param Airbase#AIRBASE self
+-- @return #string The DCS Airbase Category Name
+function AIRBASE:GetCategoryName()
+  local DCSAirbase = self:GetDCSAirbase()
+  
+  if DCSAirbase then
+    local AirbaseCategoryName = self.CategoryName[ self:GetDesc().category ]
+    return AirbaseCategoryName
+  end
+  
+  return nil
+end
+
diff --git a/Moose Development/Moose/Base.lua b/Moose Development/Moose/Base.lua
index e2196c8ba..3586673d1 100644
--- a/Moose Development/Moose/Base.lua	
+++ b/Moose Development/Moose/Base.lua	
@@ -487,7 +487,10 @@ function BASE:E( Arguments )
 	end
 
 	local LineCurrent = DebugInfoCurrent.currentline
-	local LineFrom = DebugInfoFrom.currentline
+  local LineFrom = -1 
+	if DebugInfoFrom then
+	  LineFrom = DebugInfoFrom.currentline
+	end
 
 	env.info( string.format( "%6d(%6d)/%1s:%20s%05d.%s(%s)" , LineCurrent, LineFrom, "E", self.ClassName, self.ClassID, Function, routines.utils.oneLineSerialize( Arguments ) ) )
 end
diff --git a/Moose Development/Moose/Database.lua b/Moose Development/Moose/Database.lua
index 1814af91f..66febcae9 100644
--- a/Moose Development/Moose/Database.lua	
+++ b/Moose Development/Moose/Database.lua	
@@ -1,64 +1,34 @@
---- Manage sets of units and groups. 
+--- Manage the mission database. 
 -- 
--- @{#Database} class
+-- @{#DATABASE} class
 -- ==================
--- Mission designers can use the DATABASE class to build sets of units belonging to certain:
+-- Mission designers can use the DATABASE class to refer to:
 -- 
---  * Coalitions
---  * Categories
---  * Countries
---  * Unit types
---  * Starting with certain prefix strings.
+--  * UNITS
+--  * GROUPS
+--  * players
+--  * alive players
+--  * CLIENTS
+--  * alive CLIENTS
 --  
--- This list will grow over time. Planned developments are to include filters and iterators.
--- Additional filters will be added around @{Zone#ZONEs}, Radiuses, Active players, ...
--- More iterators will be implemented in the near future ...
---
--- Administers the Initial Sets of the Mission Templates as defined within the Mission Editor.
--- 
--- DATABASE construction methods:
--- =================================
--- Create a new DATABASE object with the @{#DATABASE.New} method:
--- 
---    * @{#DATABASE.New}: Creates a new DATABASE object.
---   
--- 
--- DATABASE filter criteria: 
--- =========================
--- You can set filter criteria to define the set of units within the database.
--- Filter criteria are defined by:
--- 
---    * @{#DATABASE.FilterCoalitions}: Builds the DATABASE with the units belonging to the coalition(s).
---    * @{#DATABASE.FilterCategories}: Builds the DATABASE with the units belonging to the category(ies).
---    * @{#DATABASE.FilterTypes}: Builds the DATABASE with the units belonging to the unit type(s).
---    * @{#DATABASE.FilterCountries}: Builds the DATABASE with the units belonging to the country(ies).
---    * @{#DATABASE.FilterUnitPrefixes}: Builds the DATABASE with the units starting with the same prefix string(s).
---   
--- Once the filter criteria have been set for the DATABASE, you can start filtering using:
--- 
---   * @{#DATABASE.FilterStart}: Starts the filtering of the units within the database.
--- 
--- Planned filter criteria within development are (so these are not yet available):
--- 
---    * @{#DATABASE.FilterGroupPrefixes}: Builds the DATABASE with the groups of the units starting with the same prefix string(s).
---    * @{#DATABASE.FilterZones}: Builds the DATABASE with the units within a @{Zone#ZONE}.
+-- On top, for internal MOOSE administration purposes, the DATBASE administers the Unit and Gruop templates as defined within the Mission Editor.
 -- 
+-- Moose will automatically create one instance of the DATABASE class into the **global** object _DATABASE.
+-- Moose refers to _DATABASE within the framework extensively, but you can also refer to the _DATABASE object within your missions if required.
 -- 
 -- DATABASE iterators:
 -- ===================
--- Once the filters have been defined and the DATABASE has been built, you can iterate the database with the available iterator methods.
+-- You can iterate the database with the available iterator methods.
 -- The iterator methods will walk the DATABASE set, and call for each element within the set a function that you provide.
 -- The following iterator methods are currently available within the DATABASE:
 -- 
---   * @{#DATABASE.ForEachAliveUnit}: Calls a function for each alive unit it finds within the DATABASE.
+--   * @{#DATABASE.ForEachUnit}: Calls a function for each @{UNIT} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachGroup}: Calls a function for each @{GROUP} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachPlayer}: Calls a function for each player it finds within the DATABASE.
+--   * @{#DATABASE.ForEachPlayerAlive}: Calls a function for each alive player it finds within the DATABASE.
+--   * @{#DATABASE.ForEachClient}: Calls a function for each @{CLIENT} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachClientAlive}: Calls a function for each alive @{CLIENT} it finds within the DATABASE.
 --   
--- Planned iterators methods in development are (so these are not yet available):
--- 
---   * @{#DATABASE.ForEachUnit}: Calls a function for each unit contained within the DATABASE.
---   * @{#DATABASE.ForEachGroup}: Calls a function for each group contained within the DATABASE.
---   * @{#DATABASE.ForEachUnitInZone}: Calls a function for each unit within a certain zone contained within the DATABASE.
--- 
--- ====
 -- @module Database
 -- @author FlightControl
 
@@ -70,6 +40,7 @@ Include.File( "Unit" )
 Include.File( "Event" )
 Include.File( "Client" )
 
+
 --- DATABASE class
 -- @type DATABASE
 -- @extends Base#BASE
@@ -85,34 +56,11 @@ DATABASE = {
   DCSGroups = {},
   UNITS = {},
   GROUPS = {},
-  NavPoints = {},
-  Statics = {},
-  Players = {},
-  PlayersAlive = {},
+  PLAYERS = {},
+  PLAYERSALIVE = {},
   CLIENTS = {},
-  ClientsAlive = {},
-  Filter = {
-    Coalitions = nil,
-    Categories = nil,
-    Types = nil,
-    Countries = nil,
-    UnitPrefixes = nil,
-    GroupPrefixes = nil,
-  },
-  FilterMeta = {
-    Coalitions = {
-      red = coalition.side.RED,
-      blue = coalition.side.BLUE,
-      neutral = coalition.side.NEUTRAL,
-    },
-    Categories = {
-      plane = Unit.Category.AIRPLANE,
-      helicopter = Unit.Category.HELICOPTER,
-      ground = Unit.Category.GROUND_UNIT,
-      ship = Unit.Category.SHIP,
-      structure = Unit.Category.STRUCTURE,
-    },
-  },
+  CLIENTSALIVE = {},
+  NavPoints = {},
 }
 
 local _DATABASECoalition =
@@ -147,12 +95,13 @@ function DATABASE:New()
   _EVENTDISPATCHER:OnCrash( self._EventOnDeadOrCrash, self )
   
   
-  -- Add database with registered clients and already alive players
-  
   -- Follow alive players and clients
   _EVENTDISPATCHER:OnPlayerEnterUnit( self._EventOnPlayerEnterUnit, self )
   _EVENTDISPATCHER:OnPlayerLeaveUnit( self._EventOnPlayerLeaveUnit, self )
   
+  self:_RegisterTemplates()
+  self:_RegisterDatabase()
+  self:_RegisterPlayers()
   
   return self
 end
@@ -167,6 +116,7 @@ function DATABASE:FindUnit( UnitName )
   return UnitFound
 end
 
+
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddUnit( DCSUnit, DCSUnitName )
@@ -175,6 +125,7 @@ function DATABASE:AddUnit( DCSUnit, DCSUnitName )
   self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
 end
 
+
 --- Deletes a Unit from the DATABASE based on the Unit Name.
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
@@ -182,6 +133,7 @@ function DATABASE:DeleteUnit( DCSUnitName )
   self.DCSUnits[DCSUnitName] = nil 
 end
 
+
 --- Finds a CLIENT based on the ClientName.
 -- @param #DATABASE self
 -- @param #string ClientName
@@ -192,6 +144,7 @@ function DATABASE:FindClient( ClientName )
   return ClientFound
 end
 
+
 --- Adds a CLIENT based on the ClientName in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddClient( ClientName )
@@ -200,6 +153,7 @@ function DATABASE:AddClient( ClientName )
   self:E( self.CLIENTS[ClientName]:GetClassNameAndID() )
 end
 
+
 --- Finds a GROUP based on the GroupName.
 -- @param #DATABASE self
 -- @param #string GroupName
@@ -210,6 +164,7 @@ function DATABASE:FindGroup( GroupName )
   return GroupFound
 end
 
+
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddGroup( DCSGroup, GroupName )
@@ -218,6 +173,30 @@ function DATABASE:AddGroup( DCSGroup, GroupName )
   self.GROUPS[GroupName] = GROUP:Register( GroupName )
 end
 
+--- Adds a player based on the Player Name in the DATABASE.
+-- @param #DATABASE self
+function DATABASE:AddPlayer( UnitName, PlayerName )
+
+  if PlayerName then
+    self:E( { "Add player for unit:", UnitName, PlayerName } )
+    self.PLAYERS[PlayerName] = PlayerName
+    self.PLAYERSALIVE[PlayerName] = PlayerName
+    self.CLIENTSALIVE[PlayerName] = self:FindClient( UnitName )
+  end
+end
+
+--- Deletes a player from the DATABASE based on the Player Name.
+-- @param #DATABASE self
+function DATABASE:DeletePlayer( PlayerName )
+
+  if PlayerName then
+    self:E( { "Clean player:", PlayerName } )
+    self.PLAYERSALIVE[PlayerName] = nil
+    self.CLIENTSALIVE[PlayerName] = nil
+  end
+end
+
+
 --- Instantiate new Groups within the DCSRTE.
 -- This method expects EXACTLY the same structure as a structure within the ME, and needs 2 additional fields defined:
 -- SpawnCountryID, SpawnCategoryID
@@ -226,9 +205,9 @@ end
 -- @param #table SpawnTemplate
 -- @return #DATABASE self
 function DATABASE:Spawn( SpawnTemplate )
-  self:F( SpawnTemplate.name )
+  self:F2( SpawnTemplate.name )
 
-  self:T( { SpawnTemplate.SpawnCountryID, SpawnTemplate.SpawnCategoryID } )
+  self:T2( { SpawnTemplate.SpawnCountryID, SpawnTemplate.SpawnCategoryID } )
 
   -- Copy the spawn variables of the template in temporary storage, nullify, and restore the spawn variables.
   local SpawnCoalitionID = SpawnTemplate.SpawnCoalitionID
@@ -240,7 +219,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.SpawnCountryID = nil
   SpawnTemplate.SpawnCategoryID = nil
 
-  self:_RegisterGroup( SpawnTemplate )
+  self:_RegisterTemplate( SpawnTemplate )
   coalition.addGroup( SpawnCountryID, SpawnCategoryID, SpawnTemplate )
 
   -- Restore
@@ -253,18 +232,16 @@ function DATABASE:Spawn( SpawnTemplate )
   return SpawnGroup
 end
 
-
 --- Set a status to a Group within the Database, this to check crossing events for example.
 function DATABASE:SetStatusGroup( GroupName, Status )
-  self:F( Status )
+  self:F2( Status )
 
   self.Templates.Groups[GroupName].Status = Status
 end
 
-
 --- Get a status to a Group within the Database, this to check crossing events for example.
 function DATABASE:GetStatusGroup( GroupName )
-  self:F( Status )
+  self:F2( Status )
 
   if self.Templates.Groups[GroupName] then
     return self.Templates.Groups[GroupName].Status
@@ -273,11 +250,12 @@ function DATABASE:GetStatusGroup( GroupName )
   end
 end
 
+
 --- Private method that registers new Group Templates within the DATABASE Object.
 -- @param #DATABASE self
 -- @param #table GroupTemplate
 -- @return #DATABASE self
-function DATABASE:_RegisterGroup( GroupTemplate )
+function DATABASE:_RegisterTemplate( GroupTemplate )
 
   local GroupTemplateName = env.getValueDictByKey(GroupTemplate.name)
 
@@ -297,7 +275,7 @@ function DATABASE:_RegisterGroup( GroupTemplate )
   self.Templates.Groups[GroupTemplateName].UnitCount = #GroupTemplate.units
   self.Templates.Groups[GroupTemplateName].Units = GroupTemplate.units
 
-  self:T( { "Group", self.Templates.Groups[GroupTemplateName].GroupName, self.Templates.Groups[GroupTemplateName].UnitCount } )
+  self:T2( { "Group", self.Templates.Groups[GroupTemplateName].GroupName, self.Templates.Groups[GroupTemplateName].UnitCount } )
 
   for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do
 
@@ -317,6 +295,7 @@ function DATABASE:_RegisterGroup( GroupTemplate )
   end
 end
 
+
 --- Private method that registers all alive players in the mission.
 -- @param #DATABASE self
 -- @return #DATABASE self
@@ -328,9 +307,10 @@ function DATABASE:_RegisterPlayers()
       self:T3( { "UnitData:", UnitData } )
       if UnitData and UnitData:isExist() then
         local UnitName = UnitData:getName()
-        if not self.PlayersAlive[UnitName] then
-          self:E( { "Add player for unit:", UnitName, UnitData:getPlayerName() } )
-          self.PlayersAlive[UnitName] = UnitData:getPlayerName()
+        local PlayerName = UnitData:getPlayerName()
+        if not self.PLAYERS[PlayerName] then
+          self:E( { "Add player for unit:", UnitName, PlayerName } )
+          self:AddPlayer( UnitName, PlayerName )
         end
       end
     end
@@ -339,6 +319,7 @@ function DATABASE:_RegisterPlayers()
   return self
 end
 
+
 --- Private method that registers all datapoints within in the mission.
 -- @param #DATABASE self
 -- @return #DATABASE self
@@ -381,22 +362,21 @@ end
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnBirth( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
-      self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
-      self:_EventOnPlayerEnterUnit( Event )
-    end
+    self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
+    self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
+    self:_EventOnPlayerEnterUnit( Event )
   end
 end
 
+
 --- Handles the OnDead or OnCrash event for alive units set.
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnDeadOrCrash( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
     if self.DCSUnits[Event.IniDCSUnitName] then
@@ -406,48 +386,44 @@ function DATABASE:_EventOnDeadOrCrash( Event )
   end
 end
 
+
 --- Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnPlayerEnterUnit( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if not self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Add player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = Event.IniDCSUnit:getPlayerName()
-        self.ClientsAlive[Event.IniDCSUnitName] = self.CLIENTS[ Event.IniDCSUnitName ]
-      end
+    local PlayerName = Event.IniDCSUnit:getPlayerName()
+    if not self.PLAYERSALIVE[PlayerName] then
+      self:AddPlayer( Event.IniDCSUnitName, PlayerName )
     end
   end
 end
 
+
 --- Handles the OnPlayerLeaveUnit event to clean the active players table.
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnPlayerLeaveUnit( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Cleaning player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = nil
-        self.ClientsAlive[Event.IniDCSUnitName] = nil
-      end
+    local PlayerName = Event.IniDCSUnit:getPlayerName()
+    if self.PLAYERSALIVE[PlayerName] then
+      self:DeletePlayer( PlayerName )
     end
   end
 end
 
 --- Iterators
 
---- Interate the DATABASE and call an interator function for the given set, providing the Object for each element within the set and optional parameters.
+--- Iterate the DATABASE and call an iterator function for the given set, providing the Object for each element within the set and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the database.
 -- @return #DATABASE self
 function DATABASE:ForEach( IteratorFunction, arg, Set )
-  self:F( arg )
+  self:F2( arg )
   
   local function CoRoutine()
     local Count = 0
@@ -467,7 +443,7 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
   local function Schedule()
   
     local status, res = coroutine.resume( co )
-    self:T( { status, res } )
+    self:T2( { status, res } )
     
     if status == false then
       error( res )
@@ -485,46 +461,96 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Interate the DATABASE and call an interator function for each **alive** unit, providing the Unit and optional parameters.
+--- 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 UNIT parameter.
+-- @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:F( arg )
+  self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.DCSUnits )
 
   return self
 end
 
---- Interate the DATABASE and call an interator function for each **alive** player, providing the Unit of the player and optional parameters.
+
+--- 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 player in the database. The function needs to accept a UNIT parameter.
+-- @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.
+-- @return #DATABASE self
+function DATABASE:ForEachUnit( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.UNITS )
+
+  return self
+end
+
+--- Iterate the DATABASE and call an iterator function for each **alive** GROUP, providing the GROUP and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive GROUP in the database. The function needs to accept a GROUP parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachGroup( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.GROUPS )
+
+  return self
+end
+
+
+--- Iterate the DATABASE and call an iterator function for each player, providing the player name and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an player in the database. The function needs to accept the player name.
 -- @return #DATABASE self
 function DATABASE:ForEachPlayer( IteratorFunction, ... )
-  self:F( arg )
+  self:F2( arg )
   
-  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
+  self:ForEach( IteratorFunction, arg, self.PLAYERS )
   
   return self
 end
 
 
---- Interate the DATABASE and call an interator function for each client, providing the Client to the function and optional parameters.
+--- Iterate the DATABASE and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive player in the database. The function needs to accept a UNIT parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachPlayerAlive( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.PLAYERSALIVE )
+  
+  return self
+end
+
+--- Iterate the DATABASE and call an iterator function for each CLIENT, providing the CLIENT to the function and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the database. The function needs to accept a CLIENT parameter.
 -- @return #DATABASE self
 function DATABASE:ForEachClient( IteratorFunction, ... )
-  self:F( arg )
+  self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.CLIENTS )
 
   return self
 end
 
+--- Iterate the DATABASE and call an iterator function for each **ALIVE** CLIENT, providing the CLIENT to the function and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive CLIENT in the database. The function needs to accept a CLIENT parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachClientAlive( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.CLIENTSALIVE )
 
-function DATABASE:ScanEnvironment()
-  self:F()
+  return self
+end
+
+
+function DATABASE:_RegisterTemplates()
+  self:F2()
 
   self.Navpoints = {}
   self.UNITS = {}
@@ -574,7 +600,7 @@ function DATABASE:ScanEnvironment()
                   for group_num, GroupTemplate in pairs(obj_type_data.group) do
 
                     if GroupTemplate and GroupTemplate.units and type(GroupTemplate.units) == 'table' then  --making sure again- this is a valid group
-                      self:_RegisterGroup( GroupTemplate )
+                      self:_RegisterTemplate( GroupTemplate )
                     end --if GroupTemplate and GroupTemplate.units then
                   end --for group_num, GroupTemplate in pairs(obj_type_data.group) do
                 end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
@@ -586,120 +612,9 @@ function DATABASE:ScanEnvironment()
     end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
   end --for coa_name, coa_data in pairs(mission.coalition) do
 
-  self:_RegisterDatabase()
-  self:_RegisterPlayers()
-
   return self
 end
 
 
----
--- @param #DATABASE self
--- @param DCSUnit#Unit DCSUnit
--- @return #DATABASE self
-function DATABASE:_IsIncludeDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitInclude = true
-
-  if self.Filter.Coalitions then
-    local DCSUnitCoalition = false
-    for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
-      self:T( { "Coalition:", DCSUnit:getCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
-      if self.FilterMeta.Coalitions[CoalitionName] and self.FilterMeta.Coalitions[CoalitionName] == DCSUnit:getCoalition() then
-        DCSUnitCoalition = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCoalition
-  end
-  
-  if self.Filter.Categories then
-    local DCSUnitCategory = false
-    for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
-      self:T( { "Category:", DCSUnit:getDesc().category, self.FilterMeta.Categories[CategoryName], CategoryName } )
-      if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == DCSUnit:getDesc().category then
-        DCSUnitCategory = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCategory
-  end
-  
-  if self.Filter.Types then
-    local DCSUnitType = false
-    for TypeID, TypeName in pairs( self.Filter.Types ) do
-      self:T( { "Type:", DCSUnit:getTypeName(), TypeName } )
-      if TypeName == DCSUnit:getTypeName() then
-        DCSUnitType = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitType
-  end
-  
-  if self.Filter.Countries then
-    local DCSUnitCountry = false
-    for CountryID, CountryName in pairs( self.Filter.Countries ) do
-      self:T( { "Country:", DCSUnit:getCountry(), CountryName } )
-      if country.id[CountryName] == DCSUnit:getCountry() then
-        DCSUnitCountry = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCountry
-  end
-
-  if self.Filter.UnitPrefixes then
-    local DCSUnitPrefix = false
-    for UnitPrefixId, UnitPrefix in pairs( self.Filter.UnitPrefixes ) do
-      self:T( { "Unit Prefix:", string.find( DCSUnit:getName(), UnitPrefix, 1 ), UnitPrefix } )
-      if string.find( DCSUnit:getName(), UnitPrefix, 1 ) then
-        DCSUnitPrefix = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitPrefix
-  end
-
-  self:T( DCSUnitInclude )
-  return DCSUnitInclude
-end
-
----
--- @param #DATABASE self
--- @param DCSUnit#Unit DCSUnit
--- @return #DATABASE self
-function DATABASE:_IsAliveDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitAlive = false
-  if DCSUnit and DCSUnit:isExist() and DCSUnit:isActive() then
-    if self.DCSUnits[DCSUnit:getName()] then
-      DCSUnitAlive = true
-    end
-  end
-  self:T( DCSUnitAlive )
-  return DCSUnitAlive
-end
-
----
--- @param #DATABASE self
--- @param DCSGroup#Group DCSGroup
--- @return #DATABASE self
-function DATABASE:_IsAliveDCSGroup( DCSGroup )
-  self:F( DCSGroup )
-  local DCSGroupAlive = false
-  if DCSGroup and DCSGroup:isExist() then
-    if self.DCSGroups[DCSGroup:getName()] then
-      DCSGroupAlive = true
-    end
-  end
-  self:T( DCSGroupAlive )
-  return DCSGroupAlive
-end
-
-
---- Traces the current database contents in the log ... (for debug reasons).
--- @param #DATABASE self
--- @return #DATABASE self
-function DATABASE:TraceDatabase()
-  self:F()
-  
-  self:T( { "DCSUnits:", self.DCSUnits } )
-end
 
 
diff --git a/Moose Development/Moose/Event.lua b/Moose Development/Moose/Event.lua
index f7c2a0649..75cfca6ff 100644
--- a/Moose Development/Moose/Event.lua	
+++ b/Moose Development/Moose/Event.lua	
@@ -64,7 +64,7 @@ local _EVENTCODES = {
 
 function EVENT:New()
   local self = BASE:Inherit( self, BASE:New() )
-  self:F()
+  self:F2()
   self.EventHandler = world.addEventHandler( self )
   return self
 end
@@ -154,7 +154,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnBirthForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnBirthForUnit )
   
@@ -167,7 +167,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnBirth( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_BIRTH )
   
@@ -181,7 +181,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnBirthForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
   
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_BIRTH )
   
@@ -195,7 +195,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnCrashForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnCrashForUnit )
 
@@ -208,7 +208,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnCrash( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_CRASH )
   
@@ -222,7 +222,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnCrashForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
   
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_CRASH )
 
@@ -236,7 +236,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnDeadForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
   
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnDeadForUnit )
 
@@ -249,7 +249,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnDead( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_DEAD )
   
@@ -264,7 +264,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnDeadForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_DEAD )
   
@@ -278,7 +278,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPilotDeadForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_PILOT_DEAD )
 
@@ -292,7 +292,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnLandForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnLandForUnit )
   
@@ -306,7 +306,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnLandForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_LAND )
 
@@ -320,7 +320,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnTakeOffForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnTakeOffForUnit )
 
@@ -334,7 +334,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnTakeOffForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_TAKEOFF )
 
@@ -348,7 +348,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineShutDownForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnEngineShutDownForUnit )
   
@@ -362,7 +362,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineShutDownForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_ENGINE_SHUTDOWN )
   
@@ -376,7 +376,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineStartUpForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_ENGINE_STARTUP )
   
@@ -389,7 +389,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnShot( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_SHOT )
   
@@ -403,7 +403,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnShotForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_SHOT )
   
@@ -416,7 +416,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnHit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_HIT )
   
@@ -430,7 +430,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnHitForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_HIT )
   
@@ -443,7 +443,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPlayerEnterUnit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_PLAYER_ENTER_UNIT )
   
@@ -456,7 +456,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPlayerLeaveUnit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_PLAYER_LEAVE_UNIT )
   
@@ -466,7 +466,7 @@ end
 
 
 function EVENT:onEvent( Event )
-  self:F( { _EVENTCODES[Event.id], Event } )
+  self:F2( { _EVENTCODES[Event.id], Event } )
 
   if self and self.Events and self.Events[Event.id] then
     if Event.initiator and Event.initiator:getCategory() == Object.Category.UNIT then
diff --git a/Moose Development/Moose/Group.lua b/Moose Development/Moose/Group.lua
index 89cf288b8..818d21eb9 100644
--- a/Moose Development/Moose/Group.lua	
+++ b/Moose Development/Moose/Group.lua	
@@ -1,32 +1,32 @@
---- GROUP class. 
--- 
+--- GROUP class.
+--
 -- @{GROUP} class
 -- ==============
 -- The @{GROUP} class is a wrapper class to handle the DCS Group objects:
--- 
+--
 --  * Support all DCS Group APIs.
 --  * Enhance with Group specific APIs not in the DCS Group API set.
 --  * Handle local Group Controller.
 --  * Manage the "state" of the DCS Group.
---  
---  
+--
+--
 -- GROUP reference methods
--- ======================= 
+-- =======================
 -- For each DCS Group object alive within a running mission, a GROUP wrapper object (instance) will be created within the _@{DATABASE} object.
 -- This is done at the beginning of the mission (when the mission starts), and dynamically when new DCS Group objects are spawned (using the @{SPAWN} class).
---  
+--
 -- The GROUP class does not contain a :New() method, rather it provides :Find() methods to retrieve the object reference
 -- using the DCS Group or the DCS GroupName.
--- 
--- Another thing to know is that GROUP objects do not "contain" the DCS Group object. 
+--
+-- Another thing to know is that GROUP objects do not "contain" the DCS Group object.
 -- The GROUP methods will reference the DCS Group object by name when it is needed during API execution.
 -- If the DCS Group object does not exist or is nil, the GROUP methods will return nil and log an exception in the DCS.log file.
---  
+--
 -- The GROUP class provides the following functions to retrieve quickly the relevant GROUP instance:
--- 
+--
 --  * @{#GROUP.Find}(): Find a GROUP instance from the _DATABASE object using a DCS Group object.
 --  * @{#GROUP.FindByName}(): Find a GROUP instance from the _DATABASE object using a DCS Group name.
---  
+--
 -- IMPORTANT: ONE SHOULD NEVER SANATIZE these GROUP OBJECT REFERENCES! (make the GROUP object references nil).
 -- @module Group
 -- @author FlightControl
@@ -42,14 +42,14 @@ Include.File( "Unit" )
 -- @field DCSGroup#Group DCSGroup The DCS group class.
 -- @field #string GroupName The name of the group.
 GROUP = {
-	ClassName = "GROUP",
-	GroupName = "",
-	GroupID = 0,
-	Controller = nil,
-	DCSGroup = nil,
-	WayPointFunctions = {},
-	}
-	
+  ClassName = "GROUP",
+  GroupName = "",
+  GroupID = 0,
+  Controller = nil,
+  DCSGroup = nil,
+  WayPointFunctions = {},
+}
+
 --- A DCSGroup
 -- @type DCSGroup
 -- @field id_ The ID of the group in DCS
@@ -59,10 +59,10 @@ GROUP = {
 -- @param DCSGroup#Group GroupName The DCS Group name
 -- @return #GROUP self
 function GROUP:Register( GroupName )
-	local self = BASE:Inherit( self, BASE:New() )
-	self:F2( GroupName )
-	self.GroupName = GroupName
-	return self
+  local self = BASE:Inherit( self, BASE:New() )
+  self:F2( GroupName )
+  self.GroupName = GroupName
+  return self
 end
 
 -- Reference methods.
@@ -95,11 +95,11 @@ end
 -- @return DCSGroup#Group The DCS Group.
 function GROUP:GetDCSGroup()
   local DCSGroup = Group.getByName( self.GroupName )
-  
+
   if DCSGroup then
     return DCSGroup
   end
-    
+
   return nil
 end
 
@@ -110,27 +110,27 @@ end
 -- @return #boolean true if the DCS Group is alive.
 function GROUP:IsAlive()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupIsAlive = DCSGroup:isExist()
     self:T3( GroupIsAlive )
     return GroupIsAlive
   end
-  
+
   return nil
 end
 
---- Destroys the DCS Group and all of its DCS Units. 
+--- Destroys the DCS Group and all of its DCS Units.
 -- Note that this destroy method also raises a destroy event at run-time.
 -- So all event listeners will catch the destroy event of this DCS Group.
 -- @param #GROUP self
 function GROUP:Destroy()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     for Index, UnitData in pairs( DCSGroup:getUnits() ) do
       self:CreateEventCrash( timer.getTime(), UnitData )
@@ -138,11 +138,11 @@ function GROUP:Destroy()
     DCSGroup:destroy()
     DCSGroup = nil
   end
-  
+
   return nil
 end
 
---- Returns category of the DCS Group. 
+--- Returns category of the DCS Group.
 -- @param #GROUP self
 -- @return DCSGroup#Group.Category The category ID
 function GROUP:GetCategory()
@@ -154,7 +154,7 @@ function GROUP:GetCategory()
     self:T3( GroupCategory )
     return GroupCategory
   end
-  
+
   return nil
 end
 
@@ -170,14 +170,14 @@ function GROUP:GetCategoryName()
       [Group.Category.AIRPLANE] = "Airplane",
       [Group.Category.HELICOPTER] = "Helicopter",
       [Group.Category.GROUND] = "Ground Unit",
-      [Group.Category.SHIP] = "Ship",  
+      [Group.Category.SHIP] = "Ship",
     }
     local GroupCategory = DCSGroup:getCategory()
     self:T3( GroupCategory )
-  
+
     return CategoryNames[GroupCategory]
   end
-  
+
   return nil
 end
 
@@ -194,7 +194,24 @@ function GROUP:GetCoalition()
     self:T3( GroupCoalition )
     return GroupCoalition
   end
-  
+
+  return nil
+end
+
+--- Returns the country of the DCS Group.
+-- @param #GROUP self
+-- @return DCScountry#country.id The country identifier.
+-- @return #nil The DCS Group is not existing or alive.
+function GROUP:GetCountry()
+  self:F2( self.GroupName )
+
+  local DCSGroup = self:GetDCSGroup()
+  if DCSGroup then
+    local GroupCountry = DCSGroup:getUnit(1):getCountry()
+    self:T3( GroupCountry )
+    return GroupCountry
+  end
+
   return nil
 end
 
@@ -205,13 +222,13 @@ function GROUP:GetName()
   self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupName = DCSGroup:getName()
     self:T3( GroupName )
     return GroupName
   end
-  
+
   return nil
 end
 
@@ -220,19 +237,19 @@ end
 -- @return #number The identifier of the DCS Group.
 function GROUP:GetID()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupID = DCSGroup:getID()
     self:T3( GroupID )
     return GroupID
   end
-  
+
   return nil
 end
 
---- Returns the UNIT wrapper class with number UnitNumber. 
+--- Returns the UNIT wrapper class with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the UNIT wrapper class to be returned.
@@ -241,7 +258,7 @@ function GROUP:GetUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local UnitFound = UNIT:Find( DCSGroup:getUnit( UnitNumber ) )
     self:T3( UnitFound.UnitName )
@@ -252,7 +269,7 @@ function GROUP:GetUnit( UnitNumber )
   return nil
 end
 
---- Returns the DCS Unit with number UnitNumber. 
+--- Returns the DCS Unit with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the DCS Unit to be returned.
@@ -261,7 +278,7 @@ function GROUP:GetDCSUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnitFound = DCSGroup:getUnit( UnitNumber )
     self:T3( DCSUnitFound )
@@ -271,14 +288,14 @@ function GROUP:GetDCSUnit( UnitNumber )
   return nil
 end
 
---- Returns current size of the DCS Group. 
--- If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed. 
+--- Returns current size of the DCS Group.
+-- If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed.
 -- @param #GROUP self
 -- @return #number The DCS Group size.
 function GROUP:GetSize()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupSize = DCSGroup:getSize()
     self:T3( GroupSize )
@@ -288,15 +305,15 @@ function GROUP:GetSize()
   return nil
 end
 
---- 
---- Returns the initial size of the DCS Group. 
--- If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged. 
+---
+--- Returns the initial size of the DCS Group.
+-- If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged.
 -- @param #GROUP self
 -- @return #number The DCS Group initial size.
 function GROUP:GetInitialSize()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupInitialSize = DCSGroup:getInitialSize()
     self:T3( GroupInitialSize )
@@ -312,7 +329,7 @@ end
 function GROUP:GetUnits()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnits = DCSGroup:getUnits()
     local Units = {}
@@ -333,7 +350,7 @@ end
 function GROUP:GetDCSUnits()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnits = DCSGroup:getUnits()
     self:T3( DCSUnits )
@@ -349,7 +366,7 @@ end
 function GROUP:_GetController()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupController = DCSGroup:getController()
     self:T3( GroupController )
@@ -369,7 +386,7 @@ end
 function GROUP:WayPointInitialize()
 
   self.WayPoints = self:GetTaskRoute()
-  
+
   return self
 end
 
@@ -382,7 +399,7 @@ end
 -- @return #GROUP
 function GROUP:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
   self:F2( { WayPoint, WayPointIndex, WayPointFunction } )
-  
+
   table.insert( self.WayPoints[WayPoint].task.params.tasks, WayPointIndex )
   self.WayPoints[WayPoint].task.params.tasks[WayPointIndex] = self:TaskFunction( WayPoint, WayPointIndex, WayPointFunction, arg )
   return self
@@ -392,7 +409,7 @@ end
 function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionArguments )
 
   local DCSTask
-  
+
   local DCSScript = {}
   DCSScript[#DCSScript+1] = "local MissionGroup = GROUP:Find( ... ) "
 
@@ -400,16 +417,16 @@ function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionAr
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup, " .. table.concat( FunctionArguments, "," ) .. ")"
   else
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup )"
-  end  
-  
-  DCSTask = self:TaskWrappedAction( 
+  end
+
+  DCSTask = self:TaskWrappedAction(
     self:CommandDoScript(
       table.concat( DCSScript )
     ), WayPointIndex
   )
-  
+
   self:T3( DCSTask )
-  
+
   return DCSTask
 
 end
@@ -428,14 +445,14 @@ function GROUP:WayPointExecute( WayPoint, WaitTime )
   if not WayPoint then
     WayPoint = 1
   end
-  
+
   -- When starting the mission from a certain point, the TaskPoints need to be deleted before the given WayPoint.
   for TaskPointID = 1, WayPoint - 1 do
     table.remove( self.WayPoints, 1 )
   end
 
   self:T3( self.WayPoints )
-  
+
   self:SetTask( self:TaskRoute( self.WayPoints ), WaitTime )
 
   return self
@@ -445,9 +462,9 @@ end
 --- Activates a GROUP.
 -- @param #GROUP self
 function GROUP:Activate()
-	self:F2( { self.GroupName } )
-	trigger.action.activateGroup( self:GetDCSGroup() )
-	return self:GetDCSGroup()
+  self:F2( { self.GroupName } )
+  trigger.action.activateGroup( self:GetDCSGroup() )
+  return self:GetDCSGroup()
 end
 
 
@@ -458,13 +475,13 @@ function GROUP:GetTypeName()
   self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupTypeName = DCSGroup:getUnit(1):getTypeName()
     self:T3( GroupTypeName )
     return( GroupTypeName )
   end
-  
+
   return nil
 end
 
@@ -473,33 +490,33 @@ end
 -- @return #string The CallSign of the first DCS Unit of the DCS Group.
 function GROUP:GetCallsign()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCallSign = DCSGroup:getUnit(1):getCallsign()
     self:T3( GroupCallSign )
     return GroupCallSign
   end
-  
+
   return nil
 end
 
 --- Returns the current point (Vec2 vector) of the first DCS Unit in the DCS Group.
 -- @return DCSTypes#Vec2 Current Vec2 point of the first DCS Unit of the DCS Group.
 function GROUP:GetPointVec2()
-	self:F2( self.GroupName )
-	
-	local GroupPointVec2 = self:GetUnit(1):GetPointVec2()
-	self:T3( GroupPointVec2 )
-	return GroupPointVec2
+  self:F2( self.GroupName )
+
+  local GroupPointVec2 = self:GetUnit(1):GetPointVec2()
+  self:T3( GroupPointVec2 )
+  return GroupPointVec2
 end
 
 --- Returns the current point (Vec3 vector) of the first DCS Unit in the DCS Group.
 -- @return DCSTypes#Vec3 Current Vec3 point of the first DCS Unit of the DCS Group.
 function GROUP:GetPointVec3()
-	self:F2( self.GroupName )
-  
+  self:F2( self.GroupName )
+
   local GroupPointVec3 = self:GetUnit(1):GetPointVec3()
   self:T3( GroupPointVec3 )
   return GroupPointVec3
@@ -514,16 +531,16 @@ end
 -- @param #GROUP self
 -- @return #boolean Air category evaluation result.
 function GROUP:IsAir()
-	self:F2( self.GroupName )
+  self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local IsAirResult = DCSGroup:getCategory() == Group.Category.AIRPLANE or DCSGroup:getCategory() == Group.Category.HELICOPTER
-  	self:T3( IsAirResult )
-  	return IsAirResult
+    local IsAirResult = DCSGroup:getCategory() == Group.Category.AIRPLANE or DCSGroup:getCategory() == Group.Category.HELICOPTER
+    self:T3( IsAirResult )
+    return IsAirResult
   end
-  
+
   return nil
 end
 
@@ -532,15 +549,15 @@ end
 -- @return #boolean true if DCS Group contains Helicopters.
 function GROUP:IsHelicopter()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.HELICOPTER
   end
-  
+
   return nil
 end
 
@@ -549,15 +566,15 @@ end
 -- @return #boolean true if DCS Group contains AirPlanes.
 function GROUP:IsAirPlane()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.AIRPLANE
   end
-  
+
   return nil
 end
 
@@ -566,15 +583,15 @@ end
 -- @return #boolean true if DCS Group contains Ground troops.
 function GROUP:IsGround()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.GROUND
   end
-  
+
   return nil
 end
 
@@ -583,15 +600,15 @@ end
 -- @return #boolean true if DCS Group contains Ships.
 function GROUP:IsShip()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.SHIP
   end
-  
+
   return nil
 end
 
@@ -600,23 +617,23 @@ end
 -- @param #GROUP self
 -- @return #boolean All units on the ground result.
 function GROUP:AllOnGround()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local AllOnGroundResult = true
-  
-  	for Index, UnitData in pairs( DCSGroup:getUnits() ) do
-  		if UnitData:inAir() then
-  			AllOnGroundResult = false
-  		end
-  	end
-  	
-  	self:T3( AllOnGroundResult )
-  	return AllOnGroundResult
+    local AllOnGroundResult = true
+
+    for Index, UnitData in pairs( DCSGroup:getUnits() ) do
+      if UnitData:inAir() then
+        AllOnGroundResult = false
+      end
+    end
+
+    self:T3( AllOnGroundResult )
+    return AllOnGroundResult
   end
-  
+
   return nil
 end
 
@@ -625,26 +642,26 @@ end
 -- @param #GROUP self
 -- @return #number Maximum velocity found.
 function GROUP:GetMaxVelocity()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local MaxVelocity = 0
-  	
-  	for Index, UnitData in pairs( DCSGroup:getUnits() ) do
-  
-  		local Velocity = UnitData:getVelocity()
-  		local VelocityTotal = math.abs( Velocity.x ) + math.abs( Velocity.y ) + math.abs( Velocity.z )
-  
-  		if VelocityTotal < MaxVelocity then
-  			MaxVelocity = VelocityTotal
-  		end 
-  	end
-  	
-  	return MaxVelocity
+    local MaxVelocity = 0
+
+    for Index, UnitData in pairs( DCSGroup:getUnits() ) do
+
+      local Velocity = UnitData:getVelocity()
+      local VelocityTotal = math.abs( Velocity.x ) + math.abs( Velocity.y ) + math.abs( Velocity.z )
+
+      if VelocityTotal < MaxVelocity then
+        MaxVelocity = VelocityTotal
+      end
+    end
+
+    return MaxVelocity
   end
- 
+
   return nil
 end
 
@@ -653,7 +670,7 @@ end
 -- @param #GROUP self
 -- @return #number Minimum height found.
 function GROUP:GetMinHeight()
-	self:F2()
+  self:F2()
 
 end
 
@@ -662,7 +679,7 @@ end
 -- @param #GROUP self
 -- @return #number Maximum height found.
 function GROUP:GetMaxHeight()
-	self:F2()
+  self:F2()
 
 end
 
@@ -672,16 +689,16 @@ end
 -- @param #GROUP self
 -- @return Group#GROUP self
 function GROUP:PopCurrentTask()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
     Controller:popTask()
     return self
   end
-  
+
   return nil
 end
 
@@ -689,27 +706,27 @@ end
 -- @param #GROUP self
 -- @return Group#GROUP self
 function GROUP:PushTask( DCSTask, WaitTime )
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     -- When a group SPAWNs, it takes about a second to get the group in the simulator. Setting tasks to unspawned groups provides unexpected results.
     -- Therefore we schedule the functions to set the mission and options for the Group.
     -- Controller:pushTask( DCSTask )
-  
+
     if WaitTime then
       --routines.scheduleFunction( Controller.pushTask, { Controller, DCSTask }, timer.getTime() + WaitTime )
       SCHEDULER:New( Controller, Controller.pushTask, { DCSTask }, WaitTime )
     else
       Controller:pushTask( DCSTask )
     end
-  
+
     return self
   end
-  
+
   return nil
 end
 
@@ -720,24 +737,24 @@ function GROUP:SetTask( DCSTask, WaitTime )
   self:F2( { DCSTask } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  
+
     local Controller = self:_GetController()
-    
+
     -- When a group SPAWNs, it takes about a second to get the group in the simulator. Setting tasks to unspawned groups provides unexpected results.
     -- Therefore we schedule the functions to set the mission and options for the Group.
     -- Controller.setTask( Controller, DCSTask )
-  
+
     if not WaitTime then
       WaitTime = 1
     end
     --routines.scheduleFunction( Controller.setTask, { Controller, DCSTask }, timer.getTime() + WaitTime )
     SCHEDULER:New( Controller, Controller.setTask, { DCSTask }, WaitTime )
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -745,15 +762,15 @@ end
 --- Return a condition section for a controlled task
 -- @param #GROUP self
 -- @param DCSTime#Time time
--- @param #string userFlag 
--- @param #boolean userFlagValue 
+-- @param #string userFlag
+-- @param #boolean userFlagValue
 -- @param #string condition
--- @param DCSTime#Time duration 
--- @param #number lastWayPoint 
+-- @param DCSTime#Time duration
+-- @param #number lastWayPoint
 -- return DCSTask#Task
 function GROUP:TaskCondition( time, userFlag, userFlagValue, condition, duration, lastWayPoint )
-	self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
-  
+  self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
+
   local DCSStopCondition = {}
   DCSStopCondition.time = time
   DCSStopCondition.userFlag = userFlag
@@ -761,9 +778,9 @@ function GROUP:TaskCondition( time, userFlag, userFlagValue, condition, duration
   DCSStopCondition.condition = condition
   DCSStopCondition.duration = duration
   DCSStopCondition.lastWayPoint = lastWayPoint
-  
+
   self:T3( { DCSStopCondition } )
-  return DCSStopCondition 
+  return DCSStopCondition
 end
 
 --- Return a Controlled Task taking a Task and a TaskCondition
@@ -772,18 +789,18 @@ end
 -- @param #DCSStopCondition DCSStopCondition
 -- @return DCSTask#Task
 function GROUP:TaskControlled( DCSTask, DCSStopCondition )
-	self:F2( { DCSTask, DCSStopCondition } )
+  self:F2( { DCSTask, DCSStopCondition } )
 
   local DCSTaskControlled
-  
-  DCSTaskControlled = { 
-    id = 'ControlledTask', 
-    params = { 
-      task = DCSTask, 
-      stopCondition = DCSStopCondition 
-    } 
+
+  DCSTaskControlled = {
+    id = 'ControlledTask',
+    params = {
+      task = DCSTask,
+      stopCondition = DCSStopCondition
+    }
   }
-  
+
   self:T3( { DCSTaskControlled } )
   return DCSTaskControlled
 end
@@ -796,19 +813,19 @@ function GROUP:TaskCombo( DCSTasks )
   self:F2( { DCSTasks } )
 
   local DCSTaskCombo
-  
-  DCSTaskCombo = { 
-    id = 'ComboTask', 
-    params = { 
+
+  DCSTaskCombo = {
+    id = 'ComboTask',
+    params = {
       tasks = DCSTasks
-    } 
+    }
   }
-  
+
   self:T3( { DCSTaskCombo } )
   return DCSTaskCombo
 end
 
---- Return a WrappedAction Task taking a Command 
+--- Return a WrappedAction Task taking a Command
 -- @param #GROUP self
 -- @param DCSCommand#Command DCSCommand
 -- @return DCSTask#Task
@@ -816,8 +833,8 @@ function GROUP:TaskWrappedAction( DCSCommand, Index )
   self:F2( { DCSCommand } )
 
   local DCSTaskWrappedAction
-  
-  DCSTaskWrappedAction = { 
+
+  DCSTaskWrappedAction = {
     id = "WrappedAction",
     enabled = true,
     number = Index,
@@ -837,15 +854,15 @@ end
 -- @return #GROUP self
 function GROUP:SetCommand( DCSCommand )
   self:F2( DCSCommand )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
     Controller:setCommand( DCSCommand )
     return self
   end
-  
+
   return nil
 end
 
@@ -856,117 +873,387 @@ end
 -- @return DCSTask#Task
 function GROUP:CommandSwitchWayPoint( FromWayPoint, ToWayPoint, Index )
   self:F2( { FromWayPoint, ToWayPoint, Index } )
-  
+
   local CommandSwitchWayPoint = {
-    id = 'SwitchWaypoint', 
-    params = { 
-      fromWaypointIndex = FromWayPoint,  
-      goToWaypointIndex = ToWayPoint, 
+    id = 'SwitchWaypoint',
+    params = {
+      fromWaypointIndex = FromWayPoint,
+      goToWaypointIndex = ToWayPoint,
     },
   }
-  
+
   self:T3( { CommandSwitchWayPoint } )
   return CommandSwitchWayPoint
 end
-  
 
---- Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
+
+-- TASKS FOR AIR GROUPS
+
+
+--- (AIR) Attack a Group.
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
+
+  --  AttackGroup = {
+  --   id = 'AttackGroup',
+  --   params = {
+  --     groupId = Group.ID,
+  --     weaponType = number,
+  --     expend = enum AI.Task.WeaponExpend,
+  --     attackQty = number,
+  --     directionEnabled = boolean,
+  --     direction = Azimuth,
+  --     altitudeEnabled = boolean,
+  --     altitude = Distance,
+  --     attackQtyLimit = boolean,
+  --   }
+  -- }
+
+  local DirectionEnabled = nil
+  if Direction then
+    DirectionEnabled = true
+  end
+
+  local AltitudeEnabled = nil
+  if Altitude then
+    AltitudeEnabled = true
+  end
+
+  local DCSTask
+  DCSTask = { id = 'AttackGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      directionEnabled = DirectionEnabled,
+      direction = Direction,
+      altitudeEnabled = AltitudeEnabled,
+      altitude = Altitude,
+      attackQtyLimit = AttackQtyLimit,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Attack the Unit.
+-- @param #GROUP self
+-- @param Unit#UNIT AttackUnit The unit.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackUnit( AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack )
+  self:F2( { self.GroupName, AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack } )
+
+  --  AttackUnit = {
+  --    id = 'AttackUnit',
+  --    params = {
+  --      unitId = Unit.ID,
+  --      weaponType = number,
+  --      expend = enum AI.Task.WeaponExpend
+  --      attackQty = number,
+  --      direction = Azimuth,
+  --      attackQtyLimit = boolean,
+  --      groupAttack = boolean,
+  --    }
+  --  }
+
+  local DCSTask
+  DCSTask = { id = 'AttackUnit',
+    params = {
+      unitId = AttackUnit:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      direction = Direction,
+      attackQtyLimit = AttackQtyLimit,
+      groupAttack = GroupAttack,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Delivering weapon at the point on the ground. 
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the point to deliver weapon at.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) Desired quantity of passes. The parameter is not the same in AttackGroup and AttackUnit tasks. 
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskBombing( PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  Bombing = { 
+--    id = 'Bombing', 
+--    params = { 
+--      point = Vec2,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'Bombing',
+    params = {
+    point = PointVec2,
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+--- (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 Point The point to hold the position.
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #GROUP self
 function GROUP:TaskOrbitCircleAtVec2( Point, Altitude, Speed )
-	self:F2( { self.GroupName, Point, Altitude, Speed } )
+  self:F2( { self.GroupName, Point, Altitude, Speed } )
+
+  --  pattern = enum AI.Task.OribtPattern,
+  --    point = Vec2,
+  --    point2 = Vec2,
+  --    speed = Distance,
+  --    altitude = Distance
 
---  pattern = enum AI.Task.OribtPattern,
---    point = Vec2,
---    point2 = Vec2,
---    speed = Distance,
---    altitude = Distance
-    
   local LandHeight = land.getHeight( Point )
-  
+
   self:T3( { LandHeight } )
 
-  local DCSTask = { id = 'Orbit', 
-                   params = { pattern = AI.Task.OrbitPattern.CIRCLE, 
-                              point = Point, 
-                              speed = Speed, 
-                              altitude = Altitude + LandHeight
-                            } 
-                 } 
+  local DCSTask = { id = 'Orbit',
+    params = { pattern = AI.Task.OrbitPattern.CIRCLE,
+      point = Point,
+      speed = Speed,
+      altitude = Altitude + LandHeight
+    }
+  }
+
+
+  --  local AITask = { id = 'ControlledTask',
+  --                   params = { task = { id = 'Orbit',
+  --                                       params = { pattern = AI.Task.OrbitPattern.CIRCLE,
+  --                                                  point = Point,
+  --                                                  speed = Speed,
+  --                                                  altitude = Altitude + LandHeight
+  --                                                }
+  --                                     },
+  --                              stopCondition = { duration = Duration
+  --                                              }
+  --                            }
+  --                 }
+  --               )
 
-  
---  local AITask = { id = 'ControlledTask', 
---                   params = { task = { id = 'Orbit', 
---                                       params = { pattern = AI.Task.OrbitPattern.CIRCLE, 
---                                                  point = Point, 
---                                                  speed = Speed, 
---                                                  altitude = Altitude + LandHeight
---                                                } 
---                                     }, 
---                              stopCondition = { duration = Duration 
---                                              } 
---                            } 
---                 }
---               )
-               
   return DCSTask
 end
 
---- Orbit at the current position of the first unit of the group at a specified alititude
+--- (AIR) Orbit at the current position of the first unit of the group at a specified alititude
 -- @param #GROUP self
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #GROUP self
 function GROUP:TaskOrbitCircle( Altitude, Speed )
-	self:F2( { self.GroupName, Altitude, Speed } )
+  self:F2( { self.GroupName, Altitude, Speed } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupPoint = self:GetPointVec2()
     return self:TaskOrbitCircleAtVec2( GroupPoint, Altitude, Speed )
   end
-  
+
   return nil
 end
 
 
 
---- Hold position at the current position of the first unit of the group.
+--- (AIR) Hold position at the current position of the first unit of the group.
 -- @param #GROUP self
 -- @param #number Duration The maximum duration in seconds to hold the position.
 -- @return #GROUP self
 function GROUP:TaskHoldPosition()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   return self:TaskOrbitCircle( 30, 10 )
 end
 
 
---- Land the group at a Vec2Point.
+
+
+--- (AIR) Attacking the map object (building, structure, e.t.c).
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the point the map object is closest to. The distance between the point and the map object must not be greater than 2000 meters. Object id is not used here because Mission Editor doesn't support map object identificators.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackMapObject( PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  AttackMapObject = { 
+--    id = 'AttackMapObject', 
+--    params = { 
+--      point = Vec2,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'AttackMapObject',
+    params = {
+    point = PointVec2,
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Delivering weapon on the runway.
+-- @param #GROUP self
+-- @param Airbase#AIRBASE Airbase Airbase to attack.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskBombingRunway( Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  BombingRunway = { 
+--    id = 'BombingRunway', 
+--    params = { 
+--      runwayId = AirdromeId,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'BombingRunway',
+    params = {
+    point = Airbase:GetID(),
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Refueling from the nearest tanker. No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskRefueling()
+  self:F2( { self.GroupName } )
+
+--  Refueling = { 
+--    id = 'Refueling', 
+--    params = {} 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Refueling',
+    params = {
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR HELICOPTER) Landing at the ground. For helicopters only.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 Point The point where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
 -- @return #GROUP self
 function GROUP:TaskLandAtVec2( Point, Duration )
-	self:F2( { self.GroupName, Point, Duration } )
+  self:F2( { self.GroupName, Point, Duration } )
 
+--  Land = {
+--    id= 'Land',
+--    params = {
+--      point = Vec2,
+--      durationFlag = boolean,
+--      duration = Time
+--    }
+--  }
+ 
   local DCSTask
-  
-	if Duration and Duration > 0 then
-		DCSTask = { id = 'Land', params = { point = Point, durationFlag = true, duration = Duration } }
-	else
-		DCSTask = { id = 'Land', params = { point = Point, durationFlag = false } }
-	end
+  if Duration and Duration > 0 then
+    DCSTask = { id = 'Land', 
+      params = { 
+        point = Point, 
+        durationFlag = true, 
+        duration = Duration,
+      }, 
+    }
+  else
+    DCSTask = { id = 'Land', 
+      params = { 
+        point = Point, 
+        durationFlag = false, 
+      }, 
+    }
+  end
 
   self:T3( DCSTask )
-	return DCSTask
+  return DCSTask
 end
 
---- Land the group at a @{Zone#ZONE).
+--- (AIR) Land the group at a @{Zone#ZONE).
 -- @param #GROUP self
 -- @param Zone#ZONE Zone The zone where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
@@ -980,80 +1267,104 @@ function GROUP:TaskLandAtZone( Zone, Duration, RandomPoint )
   else
     Point = Zone:GetPointVec2()
   end
-  
+
   local DCSTask = self:TaskLandAtVec2( Point, Duration )
 
   self:T3( DCSTask )
   return DCSTask
 end
 
-
---- Attack the Unit.
+--- (AIR) Following another airborne group. 
+-- The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+-- If another group is on land the unit / group will orbit around. 
 -- @param #GROUP self
--- @param Unit#UNIT The unit.
+-- @param Group#GROUP FollowGroup The group to be followed.
+-- @param DCSTypes#Vec3 PointVec3 Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.
+-- @param #number LastWaypointIndex Detach waypoint of another group. Once reached the unit / group Follow task is finished.
 -- @return DCSTask#Task The DCS task structure.
-function GROUP:TaskAttackUnit( AttackUnit )
-	self:F2( { self.GroupName, AttackUnit } )
+function GROUP:TaskFollow( FollowGroup, PointVec3, LastWaypointIndex )
+  self:F2( { self.GroupName, FollowGroup, PointVec3, LastWaypointIndex } )
 
---  AttackUnit = { 
---    id = 'AttackUnit', 
---    params = { 
---      unitId = Unit.ID, 
---      weaponType = number, 
---      expend = enum AI.Task.WeaponExpend
---      attackQty = number, 
---      direction = Azimuth, 
---      attackQtyLimit = boolean, 
---      groupAttack = boolean, 
---    } 
+--  Follow = {
+--    id = 'Follow',
+--    params = {
+--      groupId = Group.ID,
+--      pos = Vec3,
+--      lastWptIndexFlag = boolean,
+--      lastWptIndex = number
+--    }    
 --  }
+
+  local LastWaypointIndexFlag = nil
+  if LastWaypointIndex then
+    LastWaypointIndexFlag = true
+  end
   
-  local DCSTask    
-  DCSTask = { id = 'AttackUnit', 
-              params = { unitId = AttackUnit:GetID(), 
-                         expend = AI.Task.WeaponExpend.TWO,
-                         groupAttack = true, 
-                       }, 
-            }, 
-  
+  local DCSTask
+  DCSTask = { id = 'Follow',
+    params = {
+      groupId = FollowGroup:GetID(),
+      pos = PointVec3,
+      lastWptIndexFlag = LastWaypointIndexFlag,
+      lastWptIndex = LastWaypointIndex,
+    },
+  },
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
---- Attack a Group.
+
+--- (AIR) Escort another airborne group. 
+-- The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+-- The unit / group will also protect that group from threats of specified types.
 -- @param #GROUP self
--- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param Group#GROUP EscortGroup The group to be escorted.
+-- @param DCSTypes#Vec3 PointVec3 Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.
+-- @param #number LastWaypointIndex Detach waypoint of another group. Once reached the unit / group Follow task is finished.
+-- @param #number EngagementDistanceMax Maximal distance from escorted group to threat. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax. 
+-- @param #list<DCSTypes#AttributeName> TargetTypes Array of AttributeName that is contains threat categories allowed to engage. 
 -- @return DCSTask#Task The DCS task structure.
-function GROUP:TaskAttackGroup( AttackGroup )
-  self:F2( { self.GroupName, AttackGroup } )
+function GROUP:TaskEscort( FollowGroup, PointVec3, LastWaypointIndex, EngagementDistance, TargetTypes )
+  self:F2( { self.GroupName, FollowGroup, PointVec3, LastWaypointIndex, EngagementDistance, TargetTypes } )
 
---  AttackGroup = { 
---   id = 'AttackGroup', 
---   params = { 
---     groupId = Group.ID,
---     weaponType = number,
---     expend = enum AI.Task.WeaponExpend,
---     attackQty = number,
---     directionEnabled = boolean,
---     direction = Azimuth,
---     altitudeEnabled = boolean,
---     altitude = Distance,
---     attackQtyLimit = boolean,
---   } 
--- }  
+--  Escort = {
+--    id = 'Escort',
+--    params = {
+--      groupId = Group.ID,
+--      pos = Vec3,
+--      lastWptIndexFlag = boolean,
+--      lastWptIndex = number,
+--      engagementDistMax = Distance,
+--      targetTypes = array of AttributeName,
+--    }    
+--  }
 
-  local DCSTask    
-  DCSTask = { id = 'AttackGroup', 
-              params = { groupId = AttackGroup:GetID(), 
-                         expend = AI.Task.WeaponExpend.TWO,
-                       }, 
-            }, 
+  local LastWaypointIndexFlag = nil
+  if LastWaypointIndex then
+    LastWaypointIndexFlag = true
+  end
   
+  local DCSTask
+  DCSTask = { id = 'Follow',
+    params = {
+      groupId = FollowGroup:GetID(),
+      pos = PointVec3,
+      lastWptIndexFlag = LastWaypointIndexFlag,
+      lastWptIndex = LastWaypointIndex,
+      engagementDistMax = EngagementDistance,
+      targetTypes = TargetTypes,
+    },
+  },
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
---- Fires at a VEC2 point.
+
+-- GROUND TASKS
+
+--- (GROUND) Fire at a VEC2 point until ammunition is finished.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 The point to fire at.
 -- @param DCSTypes#Distance Radius The radius of the zone to deploy the fire at.
@@ -1061,25 +1372,406 @@ end
 function GROUP:TaskFireAtPoint( PointVec2, Radius )
   self:F2( { self.GroupName, PointVec2, Radius } )
 
--- FireAtPoint = { 
---   id = 'FireAtPoint', 
---   params = { 
---     point = Vec2,
---     radius = Distance, 
---   } 
--- }
-   
-  local DCSTask    
-  DCSTask = { id = 'FireAtPoint', 
-              params = { point = PointVec2, 
-                         radius = Radius, 
-                       } 
-            } 
-  
+  -- FireAtPoint = {
+  --   id = 'FireAtPoint',
+  --   params = {
+  --     point = Vec2,
+  --     radius = Distance,
+  --   }
+  -- }
+
+  local DCSTask
+  DCSTask = { id = 'FireAtPoint',
+    params = {
+      point = PointVec2,
+      radius = Radius,
+    }
+  }
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
+--- (GROUND) Hold ground group from moving.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskHold()
+  self:F2( { self.GroupName } )
+
+--  Hold = { 
+--    id = 'Hold', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Hold',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+-- TASKS FOR AIRBORNE AND GROUND UNITS/GROUPS
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup Target GROUP.
+-- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
+-- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskFAC_AttackGroup( AttackGroup, WeaponType, Designation, Datalink )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, Designation, Datalink } )
+
+--  FAC_AttackGroup = { 
+--    id = 'FAC_AttackGroup', 
+--    params = { 
+--      groupId = Group.ID,
+--      weaponType = number,
+--      designation = enum AI.Task.Designation,
+--      datalink = boolean
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC_AttackGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      designation = Designation,
+      datalink = Datalink,
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+-- EN-ROUTE TASKS FOR AIRBORNE GROUPS
+
+--- (AIR) Engaging targets of defined types.
+-- @param #GROUP self
+-- @param DCSTypes#Distance Distance Maximal distance from the target to a route leg. If the target is on a greater distance it will be ignored. 
+-- @param #list<#DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. 
+-- @param #number Priority All enroute tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageTargets( Distance, TargetTypes, Priority )
+  self:F2( { self.GroupName, Distance, TargetTypes, Priority } )
+
+--  EngageTargets ={ 
+--    id = 'EngageTargets', 
+--    params = { 
+--      maxDist = Distance, 
+--      targetTypes = array of AttributeName, 
+--      priority = number 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageTargets',
+    params = {
+      maxDist = Distance, 
+      targetTypes = TargetTypes, 
+      priority = Priority 
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Engaging a targets of defined types at circle-shaped zone.
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the zone. 
+-- @param DCSTypes#Distance Radius Radius of the zone. 
+-- @param #list<#DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. 
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageTargets( PointVec2, Radius, TargetTypes, Priority )
+  self:F2( { self.GroupName, PointVec2, Radius, TargetTypes, Priority } )
+
+--  EngageTargetsInZone = { 
+--    id = 'EngageTargetsInZone', 
+--    params = { 
+--      point = Vec2, 
+--      zoneRadius = Distance, 
+--      targetTypes = array of AttributeName,  
+--      priority = number 
+--    }
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageTargetsInZone',
+    params = {
+      point = PointVec2, 
+      zoneRadius = Radius, 
+      targetTypes = TargetTypes,  
+      priority = Priority 
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+--- (AIR) Engaging a group. The task does not assign the target group to the unit/group to attack now; it just allows the unit/group to engage the target group as well as other assigned targets.
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
+  self:F2( { self.GroupName, AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
+
+  --  EngageGroup  = {
+  --   id = 'EngageGroup ',
+  --   params = {
+  --     groupId = Group.ID,
+  --     weaponType = number,
+  --     expend = enum AI.Task.WeaponExpend,
+  --     attackQty = number,
+  --     directionEnabled = boolean,
+  --     direction = Azimuth,
+  --     altitudeEnabled = boolean,
+  --     altitude = Distance,
+  --     attackQtyLimit = boolean,
+  --     priority = number,
+  --   }
+  -- }
+
+  local DirectionEnabled = nil
+  if Direction then
+    DirectionEnabled = true
+  end
+
+  local AltitudeEnabled = nil
+  if Altitude then
+    AltitudeEnabled = true
+  end
+
+  local DCSTask
+  DCSTask = { id = 'EngageGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      directionEnabled = DirectionEnabled,
+      direction = Direction,
+      altitudeEnabled = AltitudeEnabled,
+      altitude = Altitude,
+      attackQtyLimit = AttackQtyLimit,
+      priority = Priority,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Attack the Unit.
+-- @param #GROUP self
+-- @param Unit#UNIT AttackUnit The UNIT.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageUnit( AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack )
+  self:F2( { self.GroupName, AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack } )
+
+  --  EngageUnit = {
+  --    id = 'EngageUnit',
+  --    params = {
+  --      unitId = Unit.ID,
+  --      weaponType = number,
+  --      expend = enum AI.Task.WeaponExpend
+  --      attackQty = number,
+  --      direction = Azimuth,
+  --      attackQtyLimit = boolean,
+  --      groupAttack = boolean,
+  --      priority = number,
+  --    }
+  --  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageUnit',
+    params = {
+      unitId = AttackUnit:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      direction = Direction,
+      attackQtyLimit = AttackQtyLimit,
+      groupAttack = GroupAttack,
+      priority = Priority,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskAWACS( )
+  self:F2( { self.GroupName } )
+
+--  AWACS = { 
+--    id = 'AWACS', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'AWACS',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Aircraft will act as a tanker for friendly units. No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskTanker( )
+  self:F2( { self.GroupName } )
+
+--  Tanker = { 
+--    id = 'Tanker', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Tanker',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+-- En-route tasks for ground units/groups
+
+--- (GROUND) Ground unit (EW-radar) will act as an EWR for friendly units (will provide them with information about contacts). No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEWR( )
+  self:F2( { self.GroupName } )
+
+--  EWR = { 
+--    id = 'EWR', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EWR',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+-- En-route tasks for airborne and ground units/groups 
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup Target GROUP.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
+-- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponType, Designation, Datalink )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, Priority, Designation, Datalink } )
+
+--  FAC_EngageGroup  = { 
+--    id = 'FAC_EngageGroup', 
+--    params = { 
+--      groupId = Group.ID,
+--      weaponType = number,
+--      designation = enum AI.Task.Designation,
+--      datalink = boolean,
+--      priority = number,
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC_EngageGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      designation = Designation,
+      datalink = Datalink,
+      priority = Priority,
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param DCSTypes#Distance Radius  The maximal distance from the FAC to a target.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskFAC( Radius, Priority )
+  self:F2( { self.GroupName, Radius, Priority } )
+
+--  FAC = { 
+--    id = 'FAC', 
+--    params = { 
+--      radius = Distance,
+--      priority = number
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC',
+    params = {
+      radius = Radius,
+      priority = Priority
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
 
 
 --- Move the group to a Vec2 Point, wait for a defined duration and embark a group.
@@ -1089,22 +1781,22 @@ end
 -- @param #GROUP EmbarkingGroup The group to be embarked.
 -- @return DCSTask#Task The DCS task structure
 function GROUP:TaskEmbarkingAtVec2( Point, Duration, EmbarkingGroup )
-	self:F2( { self.GroupName, Point, Duration, EmbarkingGroup.DCSGroup } )
+  self:F2( { self.GroupName, Point, Duration, EmbarkingGroup.DCSGroup } )
 
-	local DCSTask 
-	DCSTask =  { id = 'Embarking', 
-	             params = { x = Point.x, 
-    	                    y = Point.y, 
-    		  							  duration = Duration, 
-    			  						  groupsForEmbarking = { EmbarkingGroup.GroupID },
-    				  					  durationFlag = true,
-    					  				  distributionFlag = false,
-    						  			  distribution = {},
-    						  			} 
-    				 }
-	
-	self:T3( { DCSTask } )
-	return DCSTask
+  local DCSTask
+  DCSTask =  { id = 'Embarking',
+    params = { x = Point.x,
+      y = Point.y,
+      duration = Duration,
+      groupsForEmbarking = { EmbarkingGroup.GroupID },
+      durationFlag = true,
+      distributionFlag = false,
+      distribution = {},
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
 end
 
 --- Move to a defined Vec2 Point, and embark to a group when arrived within a defined Radius.
@@ -1113,30 +1805,30 @@ end
 -- @param #number Radius The radius of the embarking zone around the Point.
 -- @return DCSTask#Task The DCS task structure.
 function GROUP:TaskEmbarkToTransportAtVec2( Point, Radius )
-	self:F2( { self.GroupName, Point, Radius } )
+  self:F2( { self.GroupName, Point, Radius } )
 
   local DCSTask --DCSTask#Task
-	DCSTask = { id = 'EmbarkToTransport', 
-	            params = { x = Point.x, 
-				  	             y = Point.y, 
-		    							   zoneRadius = Radius,
-						           } 
-						} 
+  DCSTask = { id = 'EmbarkToTransport',
+    params = { x = Point.x,
+      y = Point.y,
+      zoneRadius = Radius,
+    }
+  }
 
   self:T3( { DCSTask } )
-	return DCSTask
+  return DCSTask
 end
 
 --- Return a Misson task from a mission template.
 -- @param #GROUP self
 -- @param #table TaskMission A table containing the mission task.
--- @return DCSTask#Task 
+-- @return DCSTask#Task
 function GROUP:TaskMission( TaskMission )
-	self:F2( Points )
-  
+  self:F2( Points )
+
   local DCSTask
   DCSTask = { id = 'Mission', params = { TaskMission, }, }
-  
+
   self:T3( { DCSTask } )
   return DCSTask
 end
@@ -1144,13 +1836,13 @@ end
 --- Return a Misson task to follow a given route defined by Points.
 -- @param #GROUP self
 -- @param #table Points A table of route points.
--- @return DCSTask#Task 
+-- @return DCSTask#Task
 function GROUP:TaskRoute( Points )
   self:F2( Points )
-  
+
   local DCSTask
   DCSTask = { id = 'Mission', params = { route = { points = Points, }, }, }
-  
+
   self:T3( { DCSTask } )
   return DCSTask
 end
@@ -1164,22 +1856,22 @@ function GROUP:TaskRouteToVec2( Point, Speed )
   self:F2( { Point, Speed } )
 
   local GroupPoint = self:GetUnit( 1 ):GetPointVec2()
-  
+
   local PointFrom = {}
   PointFrom.x = GroupPoint.x
   PointFrom.y = GroupPoint.y
   PointFrom.type = "Turning Point"
   PointFrom.action = "Turning Point"
-  PointFrom.speed = Speed  
+  PointFrom.speed = Speed
   PointFrom.speed_locked = true
   PointFrom.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
-  
+
 
   local PointTo = {}
   PointTo.x = Point.x
@@ -1189,18 +1881,18 @@ function GROUP:TaskRouteToVec2( Point, Speed )
   PointTo.speed = Speed
   PointTo.speed_locked = true
   PointTo.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
 
-  
+
   local Points = { PointFrom, PointTo }
-  
+
   self:T3( Points )
-  
+
   self:Route( Points )
 
   return self
@@ -1215,7 +1907,7 @@ function GROUP:TaskRouteToVec3( Point, Speed )
   self:F2( { Point, Speed } )
 
   local GroupPoint = self:GetUnit( 1 ):GetPointVec3()
-  
+
   local PointFrom = {}
   PointFrom.x = GroupPoint.x
   PointFrom.y = GroupPoint.z
@@ -1223,39 +1915,39 @@ function GROUP:TaskRouteToVec3( Point, Speed )
   PointFrom.alt_type = "BARO"
   PointFrom.type = "Turning Point"
   PointFrom.action = "Turning Point"
-  PointFrom.speed = Speed  
+  PointFrom.speed = Speed
   PointFrom.speed_locked = true
   PointFrom.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
-  
+
 
   local PointTo = {}
   PointTo.x = Point.x
   PointTo.y = Point.z
-  PointTo.alt = Point.y  
+  PointTo.alt = Point.y
   PointTo.alt_type = "BARO"
   PointTo.type = "Turning Point"
   PointTo.action = "Fly Over Point"
   PointTo.speed = Speed
   PointTo.speed_locked = true
   PointTo.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
 
-  
+
   local Points = { PointFrom, PointTo }
-  
+
   self:T3( Points )
-  
+
   self:Route( Points )
 
   return self
@@ -1266,22 +1958,22 @@ end
 --- Make the group to follow a given route.
 -- @param #GROUP self
 -- @param #table GoPoints A table of Route Points.
--- @return #GROUP self 
+-- @return #GROUP self
 function GROUP:Route( GoPoints )
-	self:F2( GoPoints )
+  self:F2( GoPoints )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local Points = routines.utils.deepCopy( GoPoints )
-  	local MissionTask = { id = 'Mission', params = { route = { points = Points, }, }, }
-  	local Controller = self:_GetController()
+    local Points = routines.utils.deepCopy( GoPoints )
+    local MissionTask = { id = 'Mission', params = { route = { points = Points, }, }, }
+    local Controller = self:_GetController()
     --Controller.setTask( Controller, MissionTask )
-  	--routines.scheduleFunction( Controller.setTask, { Controller, MissionTask}, timer.getTime() + 1 )
+    --routines.scheduleFunction( Controller.setTask, { Controller, MissionTask}, timer.getTime() + 1 )
     SCHEDULER:New( Controller, Controller.setTask, { MissionTask }, 1 )
-  	return self
+    return self
   end
-  
+
   return nil
 end
 
@@ -1297,56 +1989,56 @@ end
 -- @param #number Speed The speed.
 -- @param Base#FORMATION Formation The formation string.
 function GROUP:TaskRouteToZone( Zone, Randomize, Speed, Formation )
-	self:F2( Zone )
+  self:F2( Zone )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	
-  	local GroupPoint = self:GetPointVec2()
-  	
-  	local PointFrom = {}
-  	PointFrom.x = GroupPoint.x
-  	PointFrom.y = GroupPoint.y
-  	PointFrom.type = "Turning Point"
-  	PointFrom.action = "Cone"
-  	PointFrom.speed = 20 / 1.6
-  	
-  
-  	local PointTo = {}
-  	local ZonePoint 
-  	
-  	if Randomize then
-  		ZonePoint = Zone:GetRandomPointVec2()
-  	else
-  		ZonePoint = Zone:GetPointVec2()
-  	end
-  
-  	PointTo.x = ZonePoint.x
-  	PointTo.y = ZonePoint.y
-  	PointTo.type = "Turning Point"
-  	
-  	if Formation then
-  		PointTo.action = Formation
-  	else
-  		PointTo.action = "Cone"
-  	end
-  	
-  	if Speed then
-  		PointTo.speed = Speed
-  	else
-  		PointTo.speed = 20 / 1.6
-  	end
-  	
-  	local Points = { PointFrom, PointTo }
-  	
-  	self:T3( Points )
-  	
-  	self:Route( Points )
-  	
-  	return self
+
+    local GroupPoint = self:GetPointVec2()
+
+    local PointFrom = {}
+    PointFrom.x = GroupPoint.x
+    PointFrom.y = GroupPoint.y
+    PointFrom.type = "Turning Point"
+    PointFrom.action = "Cone"
+    PointFrom.speed = 20 / 1.6
+
+
+    local PointTo = {}
+    local ZonePoint
+
+    if Randomize then
+      ZonePoint = Zone:GetRandomPointVec2()
+    else
+      ZonePoint = Zone:GetPointVec2()
+    end
+
+    PointTo.x = ZonePoint.x
+    PointTo.y = ZonePoint.y
+    PointTo.type = "Turning Point"
+
+    if Formation then
+      PointTo.action = Formation
+    else
+      PointTo.action = "Cone"
+    end
+
+    if Speed then
+      PointTo.speed = Speed
+    else
+      PointTo.speed = 20 / 1.6
+    end
+
+    local Points = { PointFrom, PointTo }
+
+    self:T3( Points )
+
+    self:Route( Points )
+
+    return self
   end
-  
+
   return nil
 end
 
@@ -1393,48 +2085,48 @@ end
 -- @param #number Begin The route point from where the copy will start. The base route point is 0.
 -- @param #number End The route point where the copy will end. The End point is the last point - the End point. The last point has base 0.
 -- @param #boolean Randomize Randomization of the route, when true.
--- @param #number Radius When randomization is on, the randomization is within the radius. 
+-- @param #number Radius When randomization is on, the randomization is within the radius.
 function GROUP:CopyRoute( Begin, End, Randomize, Radius )
-	self:F2( { Begin, End } )
+  self:F2( { Begin, End } )
 
-	local Points = {}
-	
-	-- Could be a Spawned Group
-	local GroupName = string.match( self:GetName(), ".*#" )
-	if GroupName then
-		GroupName = GroupName:sub( 1, -2 )
-	else
-		GroupName = self:GetName()
-	end
-	
-	self:T3( { GroupName } )
-	
-	local Template = _DATABASE.Templates.Groups[GroupName].Template
-	
-	if Template then
-		if not Begin then
-			Begin = 0
-		end
-		if not End then
-			End = 0
-		end
-	
-		for TPointID = Begin + 1, #Template.route.points - End do
-			if Template.route.points[TPointID] then
-				Points[#Points+1] = routines.utils.deepCopy( Template.route.points[TPointID] )
-				if Randomize then
-					if not Radius then
-						Radius = 500
-					end
-					Points[#Points].x = Points[#Points].x + math.random( Radius * -1, Radius )
-					Points[#Points].y = Points[#Points].y + math.random( Radius * -1, Radius )
-				end	
-			end
-		end
-		return Points
-	end
-	
-	return nil
+  local Points = {}
+
+  -- Could be a Spawned Group
+  local GroupName = string.match( self:GetName(), ".*#" )
+  if GroupName then
+    GroupName = GroupName:sub( 1, -2 )
+  else
+    GroupName = self:GetName()
+  end
+
+  self:T3( { GroupName } )
+
+  local Template = _DATABASE.Templates.Groups[GroupName].Template
+
+  if Template then
+    if not Begin then
+      Begin = 0
+    end
+    if not End then
+      End = 0
+    end
+
+    for TPointID = Begin + 1, #Template.route.points - End do
+      if Template.route.points[TPointID] then
+        Points[#Points+1] = routines.utils.deepCopy( Template.route.points[TPointID] )
+        if Randomize then
+          if not Radius then
+            Radius = 500
+          end
+          Points[#Points].x = Points[#Points].x + math.random( Radius * -1, Radius )
+          Points[#Points].y = Points[#Points].y + math.random( Radius * -1, Radius )
+        end
+      end
+    end
+    return Points
+  end
+
+  return nil
 end
 
 
@@ -1445,28 +2137,28 @@ function GROUP:GetDetectedTargets()
   if DCSGroup then
     return self:_GetController():getDetectedTargets()
   end
-  
+
   return nil
 end
 
 function GROUP:IsTargetDetected( DCSObject )
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
-  
+
     local TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity
-          = self:_GetController().isTargetDetected( self:_GetController(), DCSObject, 
-                                                    Controller.Detection.VISUAL,
-                                                    Controller.Detection.OPTIC,
-                                                    Controller.Detection.RADAR,
-                                                    Controller.Detection.IRST,
-                                                    Controller.Detection.RWR,
-                                                    Controller.Detection.DLINK
-                                                  )
+      = self:_GetController().isTargetDetected( self:_GetController(), DCSObject,
+        Controller.Detection.VISUAL,
+        Controller.Detection.OPTIC,
+        Controller.Detection.RADAR,
+        Controller.Detection.IRST,
+        Controller.Detection.RWR,
+        Controller.Detection.DLINK
+      )
     return TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity
   end
-   
+
   return nil
 end
 
@@ -1477,16 +2169,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEHoldFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1494,12 +2186,12 @@ end
 -- @param Group#GROUP self
 -- @return Group#GROUP self
 function GROUP:OptionROEHoldFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_HOLD )
     elseif self:IsGround() then
@@ -1507,10 +2199,10 @@ function GROUP:OptionROEHoldFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.WEAPON_HOLD )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1519,16 +2211,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEReturnFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1536,12 +2228,12 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEReturnFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.RETURN_FIRE )
     elseif self:IsGround() then
@@ -1549,10 +2241,10 @@ function GROUP:OptionROEReturnFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.RETURN_FIRE )
     end
-     
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1567,10 +2259,10 @@ function GROUP:OptionROEOpenFirePossible()
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1578,12 +2270,12 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEOpenFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.OPEN_FIRE )
     elseif self:IsGround() then
@@ -1591,10 +2283,10 @@ function GROUP:OptionROEOpenFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.OPEN_FIRE )
     end
-  
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1603,16 +2295,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEWeaponFreePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1620,19 +2312,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEWeaponFree()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_FREE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1641,16 +2333,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTNoReactionPossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1659,19 +2351,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTNoReaction()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.NO_REACTION )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1686,10 +2378,10 @@ function GROUP:OptionROTPassiveDefensePossible()
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1697,19 +2389,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTPassiveDefense()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENCE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1718,16 +2410,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTEvadeFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1736,19 +2428,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTEvadeFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.EVADE_FIRE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1757,16 +2449,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTVerticalPossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -1775,19 +2467,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTVertical()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.BYPASS_AND_ESCAPE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -1800,12 +2492,12 @@ end
 -- @return Message#MESSAGE
 function GROUP:Message( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     return MESSAGE:New( Message, self:GetCallsign() .. " (" .. self:GetTypeName() .. ")", Duration, self:GetClassNameAndID() )
   end
-  
+
   return nil
 end
 
@@ -1816,12 +2508,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToAll( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToAll()
   end
-  
+
   return nil
 end
 
@@ -1832,12 +2524,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToRed( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToRed()
   end
-  
+
   return nil
 end
 
@@ -1848,12 +2540,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToBlue( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToBlue()
   end
-  
+
   return nil
 end
 
@@ -1865,11 +2557,11 @@ end
 -- @param Client#CLIENT Client The client object receiving the message.
 function GROUP:MessageToClient( Message, Duration, Client )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToClient( Client )
   end
-  
+
   return nil
 end
diff --git a/Moose Development/Moose/GroupSet.lua b/Moose Development/Moose/GroupSet.lua
new file mode 100644
index 000000000..6ef3e8488
--- /dev/null
+++ b/Moose Development/Moose/GroupSet.lua	
@@ -0,0 +1,321 @@
+--- Create and manage a set of groups. 
+-- 
+-- @{#GROUPSET} class
+-- ==================
+-- Mission designers can use the GROUPSET class to build sets of groups belonging to certain:
+-- 
+--  * Coalitions
+--  * Categories
+--  * Countries
+--  * Starting with certain prefix strings.
+--  
+-- GROUPSET construction methods:
+-- =================================
+-- Create a new GROUPSET object with the @{#GROUPSET.New} method:
+-- 
+--    * @{#GROUPSET.New}: Creates a new GROUPSET object.
+--   
+-- 
+-- GROUPSET filter criteria: 
+-- =========================
+-- You can set filter criteria to define the set of groups within the GROUPSET.
+-- Filter criteria are defined by:
+-- 
+--    * @{#GROUPSET.FilterCoalitions}: Builds the GROUPSET with the groups belonging to the coalition(s).
+--    * @{#GROUPSET.FilterCategories}: Builds the GROUPSET with the groups belonging to the category(ies).
+--    * @{#GROUPSET.FilterCountries}: Builds the GROUPSET with the gruops belonging to the country(ies).
+--    * @{#GROUPSET.FilterPrefixes}: Builds the GROUPSET with the groups starting with the same prefix string(s).
+--   
+-- Once the filter criteria have been set for the GROUPSET, you can start filtering using:
+-- 
+--   * @{#GROUPSET.FilterStart}: Starts the filtering of the groups within the GROUPSET.
+-- 
+-- Planned filter criteria within development are (so these are not yet available):
+-- 
+--    * @{#GROUPSET.FilterZones}: Builds the GROUPSET with the groups within a @{Zone#ZONE}.
+-- 
+-- 
+-- GROUPSET iterators:
+-- ===================
+-- Once the filters have been defined and the GROUPSET has been built, you can iterate the GROUPSET with the available iterator methods.
+-- The iterator methods will walk the GROUPSET set, and call for each element within the set a function that you provide.
+-- The following iterator methods are currently available within the GROUPSET:
+-- 
+--   * @{#GROUPSET.ForEachGroup}: Calls a function for each alive group it finds within the GROUPSET.
+-- 
+-- @module GroupSet
+-- @author FlightControl
+
+Include.File( "Routines" )
+Include.File( "Base" )
+Include.File( "Group" )
+Include.File( "Set" )
+
+
+--- GROUPSET class
+-- @type GROUPSET
+-- @extends Set#SET
+GROUPSET = {
+  ClassName = "GROUPSET",
+  Filter = {
+    Coalitions = nil,
+    Categories = nil,
+    Countries = nil,
+    GroupPrefixes = nil,
+  },
+  FilterMeta = {
+    Coalitions = {
+      red = coalition.side.RED,
+      blue = coalition.side.BLUE,
+      neutral = coalition.side.NEUTRAL,
+    },
+    Categories = {
+      plane = Group.Category.AIRPLANE,
+      helicopter = Group.Category.HELICOPTER,
+      ground = Group.Category.GROUND_UNIT,
+      ship = Group.Category.SHIP,
+      structure = Group.Category.STRUCTURE,
+    },
+  },
+}
+
+
+--- Creates a new GROUPSET object, building a set of groups belonging to a coalitions, categories, countries, types or with defined prefix names.
+-- @param #GROUPSET self
+-- @return #GROUPSET
+-- @usage
+-- -- Define a new GROUPSET Object. This DBObject will contain a reference to all alive GROUPS.
+-- DBObject = GROUPSET:New()
+function GROUPSET:New()
+
+  -- Inherits from BASE
+  local self = BASE:Inherit( self, SET:New( _DATABASE.GROUPS ) )
+
+  return self
+end
+
+
+--- Finds a Group based on the Group Name.
+-- @param #GROUPSET self
+-- @param #string GroupName
+-- @return Group#GROUP The found Group.
+function GROUPSET:FindGroup( GroupName )
+
+  local GroupFound = self.Set[GroupName]
+  return GroupFound
+end
+
+
+
+--- Builds a set of groups of coalitions.
+-- Possible current coalitions are red, blue and neutral.
+-- @param #GROUPSET self
+-- @param #string Coalitions Can take the following values: "red", "blue", "neutral".
+-- @return #GROUPSET self
+function GROUPSET:FilterCoalitions( Coalitions )
+  if not self.Filter.Coalitions then
+    self.Filter.Coalitions = {}
+  end
+  if type( Coalitions ) ~= "table" then
+    Coalitions = { Coalitions }
+  end
+  for CoalitionID, Coalition in pairs( Coalitions ) do
+    self.Filter.Coalitions[Coalition] = Coalition
+  end
+  return self
+end
+
+
+--- Builds a set of groups out of categories.
+-- Possible current categories are plane, helicopter, ground, ship.
+-- @param #GROUPSET self
+-- @param #string Categories Can take the following values: "plane", "helicopter", "ground", "ship".
+-- @return #GROUPSET self
+function GROUPSET:FilterCategories( Categories )
+  if not self.Filter.Categories then
+    self.Filter.Categories = {}
+  end
+  if type( Categories ) ~= "table" then
+    Categories = { Categories }
+  end
+  for CategoryID, Category in pairs( Categories ) do
+    self.Filter.Categories[Category] = Category
+  end
+  return self
+end
+
+--- Builds a set of groups of defined countries.
+-- Possible current countries are those known within DCS world.
+-- @param #GROUPSET self
+-- @param #string Countries Can take those country strings known within DCS world.
+-- @return #GROUPSET self
+function GROUPSET:FilterCountries( Countries )
+  if not self.Filter.Countries then
+    self.Filter.Countries = {}
+  end
+  if type( Countries ) ~= "table" then
+    Countries = { Countries }
+  end
+  for CountryID, Country in pairs( Countries ) do
+    self.Filter.Countries[Country] = Country
+  end
+  return self
+end
+
+
+--- Builds a set of groups of defined GROUP prefixes.
+-- All the groups starting with the given prefixes will be included within the set.
+-- @param #GROUPSET self
+-- @param #string Prefixes The prefix of which the group name starts with.
+-- @return #GROUPSET self
+function GROUPSET:FilterPrefixes( Prefixes )
+  if not self.Filter.GroupPrefixes then
+    self.Filter.GroupPrefixes = {}
+  end
+  if type( Prefixes ) ~= "table" then
+    Prefixes = { Prefixes }
+  end
+  for PrefixID, Prefix in pairs( Prefixes ) do
+    self.Filter.GroupPrefixes[Prefix] = Prefix
+  end
+  return self
+end
+
+
+--- Starts the filtering.
+-- @param #GROUPSET self
+-- @return #GROUPSET self
+function GROUPSET:FilterStart()
+
+  if _DATABASE then
+    self:_FilterStart()
+  end
+  
+  return self
+end
+
+--- Handles the Database to check on an event (birth) that the Object was added in the Database.
+-- This is required, because sometimes the _DATABASE birth event gets called later than the SET birth event!
+-- @param #GROUPSET self
+-- @param Event#EVENTDATA Event
+-- @return #string The name of the GROUP
+-- @return #table The GROUP
+function GROUPSET:AddInDatabase( Event )
+  self:F3( { Event } )
+
+  if not self.Database[Event.IniDCSGroupName] then
+    self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName )
+    self:T3( self.Database[Event.IniDCSGroupName] )
+  end
+  
+  return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName]
+end
+
+--- Handles the Database to check on any event that Object exists in the Database.
+-- This is required, because sometimes the _DATABASE event gets called later than the SET event or vise versa!
+-- @param #GROUPSET self
+-- @param Event#EVENTDATA Event
+-- @return #string The name of the GROUP
+-- @return #table The GROUP
+function GROUPSET:FindInDatabase( Event )
+  self:F3( { Event } )
+
+  return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName]
+end
+
+--- Interate the GROUPSET and call an interator function for each **alive** GROUP, providing the GROUP and optional parameters.
+-- @param #GROUPSET self
+-- @param #function IteratorFunction The function that will be called when there is an alive GROUP in the GROUPSET. The function needs to accept a GROUP parameter.
+-- @return #GROUPSET self
+function GROUPSET:ForEachGroup( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.Set )
+
+  return self
+end
+
+
+----- Interate the GROUPSET and call an interator function for each **alive** player, providing the Group of the player and optional parameters.
+---- @param #GROUPSET self
+---- @param #function IteratorFunction The function that will be called when there is an alive player in the GROUPSET. The function needs to accept a GROUP parameter.
+---- @return #GROUPSET self
+--function GROUPSET:ForEachPlayer( IteratorFunction, ... )
+--  self:F2( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
+--  
+--  return self
+--end
+--
+--
+----- Interate the GROUPSET and call an interator function for each client, providing the Client to the function and optional parameters.
+---- @param #GROUPSET self
+---- @param #function IteratorFunction The function that will be called when there is an alive player in the GROUPSET. The function needs to accept a CLIENT parameter.
+---- @return #GROUPSET self
+--function GROUPSET:ForEachClient( IteratorFunction, ... )
+--  self:F2( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.Clients )
+--
+--  return self
+--end
+
+
+---
+-- @param #GROUPSET self
+-- @param Group#GROUP MooseGroup
+-- @return #GROUPSET self
+function GROUPSET:IsIncludeObject( MooseGroup )
+  self:F2( MooseGroup )
+  local MooseGroupInclude = true
+
+  if self.Filter.Coalitions then
+    local MooseGroupCoalition = false
+    for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
+      self:T3( { "Coalition:", MooseGroup:GetCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
+      if self.FilterMeta.Coalitions[CoalitionName] and self.FilterMeta.Coalitions[CoalitionName] == MooseGroup:GetCoalition() then
+        MooseGroupCoalition = true
+      end
+    end
+    MooseGroupInclude = MooseGroupInclude and MooseGroupCoalition
+  end
+  
+  if self.Filter.Categories then
+    local MooseGroupCategory = false
+    for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
+      self:T3( { "Category:", MooseGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
+      if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MooseGroup:GetCategory() then
+        MooseGroupCategory = true
+      end
+    end
+    MooseGroupInclude = MooseGroupInclude and MooseGroupCategory
+  end
+  
+  if self.Filter.Countries then
+    local MooseGroupCountry = false
+    for CountryID, CountryName in pairs( self.Filter.Countries ) do
+      self:T3( { "Country:", MooseGroup:GetCountry(), CountryName } )
+      if country.id[CountryName] == MooseGroup:GetCountry() then
+        MooseGroupCountry = true
+      end
+    end
+    MooseGroupInclude = MooseGroupInclude and MooseGroupCountry
+  end
+
+  if self.Filter.GroupPrefixes then
+    local MooseGroupPrefix = false
+    for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
+      self:T3( { "Prefix:", string.find( MooseGroup:GetName(), GroupPrefix, 1 ), GroupPrefix } )
+      if string.find( MooseGroup:GetName(), GroupPrefix, 1 ) then
+        MooseGroupPrefix = true
+      end
+    end
+    MooseGroupInclude = MooseGroupInclude and MooseGroupPrefix
+  end
+
+  self:T2( MooseGroupInclude )
+  return MooseGroupInclude
+end
+
+
diff --git a/Moose Development/Moose/Moose.lua b/Moose Development/Moose/Moose.lua
index b9df585ce..123f51481 100644
--- a/Moose Development/Moose/Moose.lua	
+++ b/Moose Development/Moose/Moose.lua	
@@ -11,5 +11,5 @@ Include.File( "Event" )
 _EVENTDISPATCHER = EVENT:New() -- #EVENT
 
 --- Declare the main database object, which is used internally by the MOOSE classes.
-_DATABASE = DATABASE:New():ScanEnvironment() -- Database#DATABASE
+_DATABASE = DATABASE:New() -- Database#DATABASE
 
diff --git a/Moose Development/Moose/Set.lua b/Moose Development/Moose/Set.lua
index 063ec2fe0..feff204a4 100644
--- a/Moose Development/Moose/Set.lua	
+++ b/Moose Development/Moose/Set.lua	
@@ -75,371 +75,109 @@ Include.File( "Client" )
 -- @extends Base#BASE
 SET = {
   ClassName = "SET",
-  Templates = {
-    Units = {},
-    Groups = {},
-    ClientsByName = {},
-    ClientsByID = {},
-  },
-  DCSUnits = {},
-  DCSUnitsAlive = {},
-  DCSGroups = {},
-  DCSGroupsAlive = {},
-  Units = {},
-  UnitsAlive = {},
-  Groups = {},
-  GroupsAlive = {},
-  NavPoints = {},
-  Statics = {},
-  Players = {},
-  PlayersAlive = {},
-  Clients = {},
-  ClientsAlive = {},
-  Filter = {
-    Coalitions = nil,
-    Categories = nil,
-    Types = nil,
-    Countries = nil,
-    UnitPrefixes = nil,
-    GroupPrefixes = nil,
-  },
-  FilterMeta = {
-    Coalitions = {
-      red = coalition.side.RED,
-      blue = coalition.side.BLUE,
-      neutral = coalition.side.NEUTRAL,
-    },
-    Categories = {
-      plane = Unit.Category.AIRPLANE,
-      helicopter = Unit.Category.HELICOPTER,
-      ground = Unit.Category.GROUND_UNIT,
-      ship = Unit.Category.SHIP,
-      structure = Unit.Category.STRUCTURE,
-    },
-  },
+  Set = {},
+  Database = {},
 }
 
-local _DATABASECoalition =
-  {
-    [1] = "Red",
-    [2] = "Blue",
-  }
-
-local _DATABASECategory =
-  {
-    [Unit.Category.AIRPLANE] = "Plane",
-    [Unit.Category.HELICOPTER] = "Helicopter",
-    [Unit.Category.GROUND_UNIT] = "Vehicle",
-    [Unit.Category.SHIP] = "Ship",
-    [Unit.Category.STRUCTURE] = "Structure",
-  }
-
-
 --- Creates a new SET object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.
 -- @param #SET self
 -- @return #SET
 -- @usage
 -- -- Define a new SET Object. This DBObject will contain a reference to all Group and Unit Templates defined within the ME and the DCSRTE.
 -- DBObject = SET:New()
-function SET:New()
+function SET:New( Database )
 
   -- Inherits from BASE
   local self = BASE:Inherit( self, BASE:New() )
   
+  self.Database = Database
+
+  return self
+end
+
+--- Finds an Object based on the Object Name.
+-- @param #SET self
+-- @param #string ObjectName
+-- @return #table The Object found.
+function SET:_Find( ObjectName )
+
+  local ObjectFound = self.Set[ObjectName]
+  return ObjectFound
+end
+
+--- Adds a Object based on the Object Name.
+-- @param #SET self
+-- @param #string ObjectName
+-- @param #table Object
+-- @return #table The added Object.
+function SET:_Add( ObjectName, Object )
+
+  self.Set[ObjectName] = Object
+end
+
+--- Starts the filtering for the defined collection.
+-- @param #SET self
+-- @return #SET self
+function SET:_FilterStart()
+
+  for ObjectName, Object in pairs( self.Database ) do
+
+    if self:IsIncludeObject( Object ) then
+      self:E( { "Adding Object:", ObjectName } )
+      self:_Add( ObjectName, Object )
+    end
+  end
+  
   _EVENTDISPATCHER:OnBirth( self._EventOnBirth, self )
   _EVENTDISPATCHER:OnDead( self._EventOnDeadOrCrash, self )
   _EVENTDISPATCHER:OnCrash( self._EventOnDeadOrCrash, self )
   
-  
-  -- Add SET with registered clients and already alive players
-  
   -- Follow alive players and clients
-  _EVENTDISPATCHER:OnPlayerEnterUnit( self._EventOnPlayerEnterUnit, self )
-  _EVENTDISPATCHER:OnPlayerLeaveUnit( self._EventOnPlayerLeaveUnit, self )
+--  _EVENTDISPATCHER:OnPlayerEnterUnit( self._EventOnPlayerEnterUnit, self )
+--  _EVENTDISPATCHER:OnPlayerLeaveUnit( self._EventOnPlayerLeaveUnit, self )
   
   
   return self
 end
 
---- Finds a Unit based on the Unit Name.
--- @param #SET self
--- @param #string UnitName
--- @return Unit#UNIT The found Unit.
-function SET:FindUnit( UnitName )
-
-  local UnitFound = self.Units[UnitName]
-  return UnitFound
-end
-
---- Finds a Unit based on the Unit Name.
--- @param #SET self
--- @param Unit#UNIT UnitToAdd
--- @return Unit#UNIT The added Unit.
-function SET:AddUnit( UnitToAdd )
-
-  self.Units[UnitToAdd.UnitName] = UnitToAdd
-  return self.Units[UnitToAdd.UnitName]
-end
 
 
-
---- Builds a set of units of coalitons.
--- Possible current coalitions are red, blue and neutral.
--- @param #SET self
--- @param #string Coalitions Can take the following values: "red", "blue", "neutral".
--- @return #SET self
-function SET:FilterCoalitions( Coalitions )
-  if not self.Filter.Coalitions then
-    self.Filter.Coalitions = {}
-  end
-  if type( Coalitions ) ~= "table" then
-    Coalitions = { Coalitions }
-  end
-  for CoalitionID, Coalition in pairs( Coalitions ) do
-    self.Filter.Coalitions[Coalition] = Coalition
-  end
-  return self
-end
-
---- Builds a set of units out of categories.
--- Possible current categories are plane, helicopter, ground, ship.
--- @param #SET self
--- @param #string Categories Can take the following values: "plane", "helicopter", "ground", "ship".
--- @return #SET self
-function SET:FilterCategories( Categories )
-  if not self.Filter.Categories then
-    self.Filter.Categories = {}
-  end
-  if type( Categories ) ~= "table" then
-    Categories = { Categories }
-  end
-  for CategoryID, Category in pairs( Categories ) do
-    self.Filter.Categories[Category] = Category
-  end
-  return self
-end
-
---- Builds a set of units of defined unit types.
--- Possible current types are those types known within DCS world.
--- @param #SET self
--- @param #string Types Can take those type strings known within DCS world.
--- @return #SET self
-function SET:FilterTypes( Types )
-  if not self.Filter.Types then
-    self.Filter.Types = {}
-  end
-  if type( Types ) ~= "table" then
-    Types = { Types }
-  end
-  for TypeID, Type in pairs( Types ) do
-    self.Filter.Types[Type] = Type
-  end
-  return self
-end
-
---- Builds a set of units of defined countries.
--- Possible current countries are those known within DCS world.
--- @param #SET self
--- @param #string Countries Can take those country strings known within DCS world.
--- @return #SET self
-function SET:FilterCountries( Countries )
-  if not self.Filter.Countries then
-    self.Filter.Countries = {}
-  end
-  if type( Countries ) ~= "table" then
-    Countries = { Countries }
-  end
-  for CountryID, Country in pairs( Countries ) do
-    self.Filter.Countries[Country] = Country
-  end
-  return self
-end
-
---- Builds a set of units of defined unit prefixes.
--- All the units starting with the given prefixes will be included within the set.
--- @param #SET self
--- @param #string Prefixes The prefix of which the unit name starts with.
--- @return #SET self
-function SET:FilterUnitPrefixes( Prefixes )
-  if not self.Filter.UnitPrefixes then
-    self.Filter.UnitPrefixes = {}
-  end
-  if type( Prefixes ) ~= "table" then
-    Prefixes = { Prefixes }
-  end
-  for PrefixID, Prefix in pairs( Prefixes ) do
-    self.Filter.UnitPrefixes[Prefix] = Prefix
-  end
-  return self
-end
-
---- Builds a set of units of defined group prefixes.
--- All the units starting with the given group prefixes will be included within the set.
--- @param #SET self
--- @param #string Prefixes The prefix of which the group name where the unit belongs to starts with.
--- @return #SET self
-function SET:FilterGroupPrefixes( Prefixes )
-  if not self.Filter.GroupPrefixes then
-    self.Filter.GroupPrefixes = {}
-  end
-  if type( Prefixes ) ~= "table" then
-    Prefixes = { Prefixes }
-  end
-  for PrefixID, Prefix in pairs( Prefixes ) do
-    self.Filter.GroupPrefixes[Prefix] = Prefix
-  end
-  return self
-end
-
---- Starts the filtering.
--- @param #SET self
--- @return #SET self
-function SET:FilterStart()
-
-  if _DATABASE then
-    -- OK, we have a _DATABASE
-    -- Now use the different filters to build the set.
-    -- We first take ALL of the Units of the _DATABASE.
-    
-    self:E( { "Adding Set Datapoints with filters" } )
-    for DCSUnitName, DCSUnit in pairs( _DATABASE.DCSUnits ) do
-
-      if self:_IsIncludeDCSUnit( DCSUnit ) then
-
-        self:E( { "Adding Unit:", DCSUnitName } )
-        self.DCSUnits[DCSUnitName] = _DATABASE.DCSUnits[DCSUnitName]
-        self.Units[DCSUnitName] = _DATABASE:FindUnit( DCSUnitName )
-        
-        if _DATABASE.DCSUnitsAlive[DCSUnitName] then
-          self.DCSUnitsAlive[DCSUnitName] = _DATABASE.DCSUnitsAlive[DCSUnitName]
-          self.UnitsAlive[DCSUnitName] = _DATABASE.UnitsAlive[DCSUnitName]
-        end
-        
-      end
-    end
-    
-    for DCSGroupName, DCSGroup in pairs( _DATABASE.DCSGroups ) do
-      
-      --if self:_IsIncludeDCSGroup( DCSGroup ) then
-      self:E( { "Adding Group:", DCSGroupName } )
-      self.DCSGroups[DCSGroupName] = _DATABASE.DCSGroups[DCSGroupName]
-      self.Groups[DCSGroupName] = _DATABASE:FindGroups( DCSGroupName )
-      --end
-      
-      if _DATABASE.DCSGroupsAlive[DCSGroupName] then
-        self.DCSGroupsAlive[DCSGroupName] = _DATABASE.DCSGroupsAlive[DCSGroupName]
-        self.GroupsAlive[DCSGroupName] = _DATABASE.GroupsAlive[DCSGroupName]
-      end
-    end
-
-    for DCSUnitName, Client in pairs( _DATABASE.CLIENTS ) do
-      self:E( { "Adding Client for Unit:", DCSUnitName } )
-      self.Clients[DCSUnitName] = _DATABASE.Clients[DCSUnitName]
-    end
-    
-  else
-    self:E( "There is a structural error in MOOSE. No _DATABASE has been defined! Cannot build this custom SET." )
-  end
-  
-  return self
-end
-
-
-
---- Private method that registers all alive players in the mission.
--- @param #SET self
--- @return #SET self
-function SET:_RegisterPlayers()
-
-  local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) }
-  for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
-    for UnitId, UnitData in pairs( CoalitionData ) do
-      self:T3( { "UnitData:", UnitData } )
-      if UnitData and UnitData:isExist() then
-        local UnitName = UnitData:getName()
-        if not self.PlayersAlive[UnitName] then
-          self:E( { "Add player for unit:", UnitName, UnitData:getPlayerName() } )
-          self.PlayersAlive[UnitName] = UnitData:getPlayerName()
-        end
-      end
-    end
-  end
-  
-  return self
-end
-
---- Private method that registers all datapoints within in the mission.
--- @param #SET self
--- @return #SET self
-function SET:_RegisterDatabase()
-
-  local CoalitionsData = { AlivePlayersRed = coalition.getGroups( coalition.side.RED ), AlivePlayersBlue = coalition.getGroups( coalition.side.BLUE ) }
-  for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
-    for DCSGroupId, DCSGroup in pairs( CoalitionData ) do
-
-      if DCSGroup:isExist() then
-        local DCSGroupName = DCSGroup:getName()
-  
-        self:E( { "Register Group:", DCSGroup, DCSGroupName } )
-        self.DCSGroups[DCSGroupName] = DCSGroup
-        self.Groups[DCSGroupName] = GROUP:New( DCSGroup )
-  
-        if self:_IsAliveDCSGroup(DCSGroup) then
-          self:E( { "Register Alive Group:", DCSGroup, DCSGroupName } )
-          self.DCSGroupsAlive[DCSGroupName] = DCSGroup
-          self.GroupsAlive[DCSGroupName] = self.Groups[DCSGroupName]  
-        end
-  
-        for DCSUnitId, DCSUnit in pairs( DCSGroup:getUnits() ) do
-  
-          local DCSUnitName = DCSUnit:getName()
-          self:E( { "Register Unit:", DCSUnit, DCSUnitName } )
-  
-          self.DCSUnits[DCSUnitName] = DCSUnit
-          self:AddUnit( UNIT:Find( DCSUnit ) )
-          --self.Units[DCSUnitName] = UNIT:Register( DCSUnit )
-  
-          if self:_IsAliveDCSUnit(DCSUnit) then
-            self:E( { "Register Alive Unit:", DCSUnit, DCSUnitName } )
-            self.DCSUnitsAlive[DCSUnitName] = DCSUnit
-            self.UnitsAlive[DCSUnitName] = self.Units[DCSUnitName]  
-          end
-        end
-      else
-        self:E( "Group does not exist: " .. DCSGroup )
-      end
-      
-      for ClientName, ClientTemplate in pairs( self.Templates.ClientsByName ) do
-        self.Clients[ClientName] = CLIENT:Find( ClientName )
-      end
-    end
-  end
-  
-  return self
-end
-
+----- Private method that registers all alive players in the mission.
+---- @param #SET self
+---- @return #SET self
+--function SET:_RegisterPlayers()
+--
+--  local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) }
+--  for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
+--    for UnitId, UnitData in pairs( CoalitionData ) do
+--      self:T3( { "UnitData:", UnitData } )
+--      if UnitData and UnitData:isExist() then
+--        local UnitName = UnitData:getName()
+--        if not self.PlayersAlive[UnitName] then
+--          self:E( { "Add player for unit:", UnitName, UnitData:getPlayerName() } )
+--          self.PlayersAlive[UnitName] = UnitData:getPlayerName()
+--        end
+--      end
+--    end
+--  end
+--  
+--  return self
+--end
 
 --- Events
 
---- Handles the OnBirth event for the alive units set.
+--- Handles the OnBirth event for the Set.
 -- @param #SET self
 -- @param Event#EVENTDATA Event
 function SET:_EventOnBirth( Event )
-  self:F( { Event } )
+  self:F3( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      self.DCSUnits[Event.IniDCSUnitName] = Event.IniDCSUnit 
-      self.DCSUnitsAlive[Event.IniDCSUnitName] = Event.IniDCSUnit
-      self:AddUnit( UNIT:Register( Event.IniDCSUnit ) )
-      --self.Units[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnit )
-      
-      --if not self.DCSGroups[Event.IniDCSGroupName] then
-      --  self.DCSGroups[Event.IniDCSGroupName] = Event.IniDCSGroupName
-      --  self.DCSGroupsAlive[Event.IniDCSGroupName] = Event.IniDCSGroupName
-      --  self.Groups[Event.IniDCSGroupName] = GROUP:New( Event.IniDCSGroup )
-      --end
-      self:_EventOnPlayerEnterUnit( Event )
+    local ObjectName, Object = self:AddInDatabase( Event )
+    self:T3( ObjectName, Object )
+    if self:IsIncludeObject( Object ) then
+      self:_Add( ObjectName, Object )
+      --self:_EventOnPlayerEnterUnit( Event )
     end
   end
 end
@@ -448,49 +186,49 @@ end
 -- @param #SET self
 -- @param Event#EVENTDATA Event
 function SET:_EventOnDeadOrCrash( Event )
-  self:F( { Event } )
+  self:F3( { Event } )
 
   if Event.IniDCSUnit then
-    if self.DCSUnitsAlive[Event.IniDCSUnitName] then
-      self.DCSUnits[Event.IniDCSUnitName] = nil 
-      self.DCSUnitsAlive[Event.IniDCSUnitName] = nil
+    local ObjectName, Object = self:FindInDatabase( Event )
+    if ObjectName and Object then
+      self:_Delete( ObjectName )
     end
   end
 end
 
---- Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).
--- @param #SET self
--- @param Event#EVENTDATA Event
-function SET:_EventOnPlayerEnterUnit( Event )
-  self:F( { Event } )
-
-  if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if not self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Add player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = Event.IniDCSUnit:getPlayerName()
-        self.ClientsAlive[Event.IniDCSUnitName] = _DATABASE.Clients[ Event.IniDCSUnitName ]
-      end
-    end
-  end
-end
-
---- Handles the OnPlayerLeaveUnit event to clean the active players table.
--- @param #SET self
--- @param Event#EVENTDATA Event
-function SET:_EventOnPlayerLeaveUnit( Event )
-  self:F( { Event } )
-
-  if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Cleaning player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = nil
-        self.ClientsAlive[Event.IniDCSUnitName] = nil
-      end
-    end
-  end
-end
+----- Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).
+---- @param #SET self
+---- @param Event#EVENTDATA Event
+--function SET:_EventOnPlayerEnterUnit( Event )
+--  self:F3( { Event } )
+--
+--  if Event.IniDCSUnit then
+--    if self:IsIncludeObject( Event.IniDCSUnit ) then
+--      if not self.PlayersAlive[Event.IniDCSUnitName] then
+--        self:E( { "Add player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
+--        self.PlayersAlive[Event.IniDCSUnitName] = Event.IniDCSUnit:getPlayerName()
+--        self.ClientsAlive[Event.IniDCSUnitName] = _DATABASE.Clients[ Event.IniDCSUnitName ]
+--      end
+--    end
+--  end
+--end
+--
+----- Handles the OnPlayerLeaveUnit event to clean the active players table.
+---- @param #SET self
+---- @param Event#EVENTDATA Event
+--function SET:_EventOnPlayerLeaveUnit( Event )
+--  self:F3( { Event } )
+--
+--  if Event.IniDCSUnit then
+--    if self:IsIncludeObject( Event.IniDCSUnit ) then
+--      if self.PlayersAlive[Event.IniDCSUnitName] then
+--        self:E( { "Cleaning player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
+--        self.PlayersAlive[Event.IniDCSUnitName] = nil
+--        self.ClientsAlive[Event.IniDCSUnitName] = nil
+--      end
+--    end
+--  end
+--end
 
 --- Iterators
 
@@ -499,7 +237,7 @@ end
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET.
 -- @return #SET self
 function SET:ForEach( IteratorFunction, arg, Set )
-  self:F( arg )
+  self:F3( arg )
   
   local function CoRoutine()
     local Count = 0
@@ -519,7 +257,7 @@ function SET:ForEach( IteratorFunction, arg, Set )
   local function Schedule()
   
     local status, res = coroutine.resume( co )
-    self:T( { status, res } )
+    self:T3( { status, res } )
     
     if status == false then
       error( res )
@@ -537,222 +275,67 @@ function SET:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Interate the SET and call an interator function for each **alive** unit, providing the Unit and optional parameters.
+----- Interate the SET and call an interator function for each **alive** unit, providing the Unit and optional parameters.
+---- @param #SET self
+---- @param #function IteratorFunction The function that will be called when there is an alive unit in the SET. The function needs to accept a UNIT parameter.
+---- @return #SET self
+--function SET:ForEachDCSUnitAlive( IteratorFunction, ... )
+--  self:F3( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.DCSUnitsAlive )
+--
+--  return self
+--end
+--
+----- Interate the SET and call an interator function for each **alive** player, providing the Unit of the player and optional parameters.
+---- @param #SET self
+---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET. The function needs to accept a UNIT parameter.
+---- @return #SET self
+--function SET:ForEachPlayer( IteratorFunction, ... )
+--  self:F3( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
+--  
+--  return self
+--end
+--
+--
+----- Interate the SET and call an interator function for each client, providing the Client to the function and optional parameters.
+---- @param #SET self
+---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET. The function needs to accept a CLIENT parameter.
+---- @return #SET self
+--function SET:ForEachClient( IteratorFunction, ... )
+--  self:F3( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.Clients )
+--
+--  return self
+--end
+
+
+--- Decides whether to include the Object
 -- @param #SET self
--- @param #function IteratorFunction The function that will be called when there is an alive unit in the SET. The function needs to accept a UNIT parameter.
+-- @param #table Object
 -- @return #SET self
-function SET:ForEachDCSUnitAlive( IteratorFunction, ... )
-  self:F( arg )
+function SET:IsIncludeObject( Object )
+  self:F3( Object )
   
-  self:ForEach( IteratorFunction, arg, self.DCSUnitsAlive )
-
-  return self
+  return true
 end
 
---- Interate the SET and call an interator function for each **alive** player, providing the Unit of the player and optional parameters.
+--- Flushes the current SET contents in the log ... (for debug reasons).
 -- @param #SET self
--- @param #function IteratorFunction The function that will be called when there is an alive player in the SET. The function needs to accept a UNIT parameter.
--- @return #SET self
-function SET:ForEachPlayer( IteratorFunction, ... )
-  self:F( arg )
+-- @return #string A string with the names of the objects.
+function SET:Flush()
+  self:F3()
+
+  local ObjectNames = ""
+  for ObjectName, Object in pairs( self.Set ) do
+    ObjectNames = ObjectNames .. ObjectName .. ", "
+  end
+  self:T( { "Objects in Set:", ObjectNames } )
   
-  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
-  
-  return self
-end
-
-
---- Interate the SET and call an interator function for each client, providing the Client to the function and optional parameters.
--- @param #SET self
--- @param #function IteratorFunction The function that will be called when there is an alive player in the SET. The function needs to accept a CLIENT parameter.
--- @return #SET self
-function SET:ForEachClient( IteratorFunction, ... )
-  self:F( arg )
-  
-  self:ForEach( IteratorFunction, arg, self.Clients )
-
-  return self
-end
-
-
-function SET:ScanEnvironment()
-  self:F()
-
-  self.Navpoints = {}
-  self.Units = {}
-  --Build routines.db.units and self.Navpoints
-  for coa_name, coa_data in pairs(env.mission.coalition) do
-
-    if (coa_name == 'red' or coa_name == 'blue') and type(coa_data) == 'table' then
-      --self.Units[coa_name] = {}
-
-      ----------------------------------------------
-      -- build nav points DB
-      self.Navpoints[coa_name] = {}
-      if coa_data.nav_points then --navpoints
-        for nav_ind, nav_data in pairs(coa_data.nav_points) do
-
-          if type(nav_data) == 'table' then
-            self.Navpoints[coa_name][nav_ind] = routines.utils.deepCopy(nav_data)
-
-            self.Navpoints[coa_name][nav_ind]['name'] = nav_data.callsignStr  -- name is a little bit more self-explanatory.
-            self.Navpoints[coa_name][nav_ind]['point'] = {}  -- point is used by SSE, support it.
-            self.Navpoints[coa_name][nav_ind]['point']['x'] = nav_data.x
-            self.Navpoints[coa_name][nav_ind]['point']['y'] = 0
-            self.Navpoints[coa_name][nav_ind]['point']['z'] = nav_data.y
-          end
-      end
-      end
-      -------------------------------------------------
-      if coa_data.country then --there is a country table
-        for cntry_id, cntry_data in pairs(coa_data.country) do
-
-          local countryName = string.lower(cntry_data.name)
-          --self.Units[coa_name][countryName] = {}
-          --self.Units[coa_name][countryName]["countryId"] = cntry_data.id
-
-          if type(cntry_data) == 'table' then  --just making sure
-
-            for obj_type_name, obj_type_data in pairs(cntry_data) do
-
-              if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then --should be an unncessary check
-
-                local category = obj_type_name
-
-                if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then  --there's a group!
-
-                  --self.Units[coa_name][countryName][category] = {}
-
-                  for group_num, GroupTemplate in pairs(obj_type_data.group) do
-
-                    if GroupTemplate and GroupTemplate.units and type(GroupTemplate.units) == 'table' then  --making sure again- this is a valid group
-                      self:_RegisterGroup( GroupTemplate )
-                    end --if GroupTemplate and GroupTemplate.units then
-                  end --for group_num, GroupTemplate in pairs(obj_type_data.group) do
-                end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
-              end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then
-          end --for obj_type_name, obj_type_data in pairs(cntry_data) do
-          end --if type(cntry_data) == 'table' then
-      end --for cntry_id, cntry_data in pairs(coa_data.country) do
-      end --if coa_data.country then --there is a country table
-    end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
-  end --for coa_name, coa_data in pairs(mission.coalition) do
-
-  self:_RegisterDatabase()
-  self:_RegisterPlayers()
-
-  return self
-end
-
-
----
--- @param #SET self
--- @param DCSUnit#Unit DCSUnit
--- @return #SET self
-function SET:_IsIncludeDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitInclude = true
-
-  if self.Filter.Coalitions then
-    local DCSUnitCoalition = false
-    for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
-      self:T( { "Coalition:", DCSUnit:getCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
-      if self.FilterMeta.Coalitions[CoalitionName] and self.FilterMeta.Coalitions[CoalitionName] == DCSUnit:getCoalition() then
-        DCSUnitCoalition = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCoalition
-  end
-  
-  if self.Filter.Categories then
-    local DCSUnitCategory = false
-    for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
-      self:T( { "Category:", DCSUnit:getDesc().category, self.FilterMeta.Categories[CategoryName], CategoryName } )
-      if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == DCSUnit:getDesc().category then
-        DCSUnitCategory = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCategory
-  end
-  
-  if self.Filter.Types then
-    local DCSUnitType = false
-    for TypeID, TypeName in pairs( self.Filter.Types ) do
-      self:T( { "Type:", DCSUnit:getTypeName(), TypeName } )
-      if TypeName == DCSUnit:getTypeName() then
-        DCSUnitType = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitType
-  end
-  
-  if self.Filter.Countries then
-    local DCSUnitCountry = false
-    for CountryID, CountryName in pairs( self.Filter.Countries ) do
-      self:T( { "Country:", DCSUnit:getCountry(), CountryName } )
-      if country.id[CountryName] == DCSUnit:getCountry() then
-        DCSUnitCountry = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCountry
-  end
-
-  if self.Filter.UnitPrefixes then
-    local DCSUnitPrefix = false
-    for UnitPrefixId, UnitPrefix in pairs( self.Filter.UnitPrefixes ) do
-      self:T( { "Unit Prefix:", string.find( DCSUnit:getName(), UnitPrefix, 1 ), UnitPrefix } )
-      if string.find( DCSUnit:getName(), UnitPrefix, 1 ) then
-        DCSUnitPrefix = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitPrefix
-  end
-
-  self:T( DCSUnitInclude )
-  return DCSUnitInclude
-end
-
----
--- @param #SET self
--- @param DCSUnit#Unit DCSUnit
--- @return #SET self
-function SET:_IsAliveDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitAlive = false
-  if DCSUnit and DCSUnit:isExist() and DCSUnit:isActive() then
-    if self.DCSUnits[DCSUnit:getName()] then
-      DCSUnitAlive = true
-    end
-  end
-  self:T( DCSUnitAlive )
-  return DCSUnitAlive
-end
-
----
--- @param #SET self
--- @param DCSGroup#Group DCSGroup
--- @return #SET self
-function SET:_IsAliveDCSGroup( DCSGroup )
-  self:F( DCSGroup )
-  local DCSGroupAlive = false
-  if DCSGroup and DCSGroup:isExist() then
-    if self.DCSGroups[DCSGroup:getName()] then
-      DCSGroupAlive = true
-    end
-  end
-  self:T( DCSGroupAlive )
-  return DCSGroupAlive
-end
-
-
---- Traces the current SET contents in the log ... (for debug reasons).
--- @param #SET self
--- @return #SET self
-function SET:TraceDatabase()
-  self:F()
-  
-  self:T( { "DCSUnits:", self.DCSUnits } )
-  self:T( { "DCSUnitsAlive:", self.DCSUnitsAlive } )
+  return ObjectNames
 end
 
 
diff --git a/Moose Development/Moose/UnitSet.lua b/Moose Development/Moose/UnitSet.lua
new file mode 100644
index 000000000..5bd542727
--- /dev/null
+++ b/Moose Development/Moose/UnitSet.lua	
@@ -0,0 +1,363 @@
+--- Create and manage a set of units. 
+-- 
+-- @{#UNITSET} class
+-- ==================
+-- Mission designers can use the UNITSET class to build sets of units belonging to certain:
+-- 
+--  * Coalitions
+--  * Categories
+--  * Countries
+--  * Unit types
+--  * Starting with certain prefix strings.
+--  
+-- UNITSET construction methods:
+-- =================================
+-- Create a new UNITSET object with the @{#UNITSET.New} method:
+-- 
+--    * @{#UNITSET.New}: Creates a new UNITSET object.
+--   
+-- 
+-- UNITSET filter criteria: 
+-- =========================
+-- You can set filter criteria to define the set of units within the UNITSET.
+-- Filter criteria are defined by:
+-- 
+--    * @{#UNITSET.FilterCoalitions}: Builds the UNITSET with the units belonging to the coalition(s).
+--    * @{#UNITSET.FilterCategories}: Builds the UNITSET with the units belonging to the category(ies).
+--    * @{#UNITSET.FilterTypes}: Builds the UNITSET with the units belonging to the unit type(s).
+--    * @{#UNITSET.FilterCountries}: Builds the UNITSET with the units belonging to the country(ies).
+--    * @{#UNITSET.FilterPrefixes}: Builds the UNITSET with the units starting with the same prefix string(s).
+--   
+-- Once the filter criteria have been set for the UNITSET, you can start filtering using:
+-- 
+--   * @{#UNITSET.FilterStart}: Starts the filtering of the units within the UNITSET.
+-- 
+-- Planned filter criteria within development are (so these are not yet available):
+-- 
+--    * @{#UNITSET.FilterZones}: Builds the UNITSET with the units within a @{Zone#ZONE}.
+-- 
+-- 
+-- UNITSET iterators:
+-- ===================
+-- Once the filters have been defined and the UNITSET has been built, you can iterate the UNITSET with the available iterator methods.
+-- The iterator methods will walk the UNITSET set, and call for each element within the set a function that you provide.
+-- The following iterator methods are currently available within the UNITSET:
+-- 
+--   * @{#UNITSET.ForEachUnit}: Calls a function for each alive unit it finds within the UNITSET.
+--   
+-- Planned iterators methods in development are (so these are not yet available):
+-- 
+--   * @{#UNITSET.ForEachUnitInGroup}: Calls a function for each group contained within the UNITSET.
+--   * @{#UNITSET.ForEachUnitInZone}: Calls a function for each unit within a certain zone contained within the UNITSET.
+-- 
+-- @module UnitSet
+-- @author FlightControl
+
+Include.File( "Routines" )
+Include.File( "Base" )
+Include.File( "Unit" )
+Include.File( "Set" )
+
+
+--- UNITSET class
+-- @type UNITSET
+-- @extends Set#SET
+UNITSET = {
+  ClassName = "UNITSET",
+  Units = {},
+  Filter = {
+    Coalitions = nil,
+    Categories = nil,
+    Types = nil,
+    Countries = nil,
+    UnitPrefixes = nil,
+  },
+  FilterMeta = {
+    Coalitions = {
+      red = coalition.side.RED,
+      blue = coalition.side.BLUE,
+      neutral = coalition.side.NEUTRAL,
+    },
+    Categories = {
+      plane = Unit.Category.AIRPLANE,
+      helicopter = Unit.Category.HELICOPTER,
+      ground = Unit.Category.GROUND_UNIT,
+      ship = Unit.Category.SHIP,
+      structure = Unit.Category.STRUCTURE,
+    },
+  },
+}
+
+
+--- Creates a new UNITSET object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.
+-- @param #UNITSET self
+-- @return #UNITSET
+-- @usage
+-- -- Define a new UNITSET Object. This DBObject will contain a reference to all alive Units.
+-- DBObject = UNITSET:New()
+function UNITSET:New()
+
+  -- Inherits from BASE
+  local self = BASE:Inherit( self, SET:New( _DATABASE.UNITS ) )
+
+  return self
+end
+
+
+--- Finds a Unit based on the Unit Name.
+-- @param #UNITSET self
+-- @param #string UnitName
+-- @return Unit#UNIT The found Unit.
+function UNITSET:FindUnit( UnitName )
+
+  local UnitFound = self.Set[UnitName]
+  return UnitFound
+end
+
+
+
+--- Builds a set of units of coalitions.
+-- Possible current coalitions are red, blue and neutral.
+-- @param #UNITSET self
+-- @param #string Coalitions Can take the following values: "red", "blue", "neutral".
+-- @return #UNITSET self
+function UNITSET:FilterCoalitions( Coalitions )
+  if not self.Filter.Coalitions then
+    self.Filter.Coalitions = {}
+  end
+  if type( Coalitions ) ~= "table" then
+    Coalitions = { Coalitions }
+  end
+  for CoalitionID, Coalition in pairs( Coalitions ) do
+    self.Filter.Coalitions[Coalition] = Coalition
+  end
+  return self
+end
+
+
+--- Builds a set of units out of categories.
+-- Possible current categories are plane, helicopter, ground, ship.
+-- @param #UNITSET self
+-- @param #string Categories Can take the following values: "plane", "helicopter", "ground", "ship".
+-- @return #UNITSET self
+function UNITSET:FilterCategories( Categories )
+  if not self.Filter.Categories then
+    self.Filter.Categories = {}
+  end
+  if type( Categories ) ~= "table" then
+    Categories = { Categories }
+  end
+  for CategoryID, Category in pairs( Categories ) do
+    self.Filter.Categories[Category] = Category
+  end
+  return self
+end
+
+
+--- Builds a set of units of defined unit types.
+-- Possible current types are those types known within DCS world.
+-- @param #UNITSET self
+-- @param #string Types Can take those type strings known within DCS world.
+-- @return #UNITSET self
+function UNITSET:FilterTypes( Types )
+  if not self.Filter.Types then
+    self.Filter.Types = {}
+  end
+  if type( Types ) ~= "table" then
+    Types = { Types }
+  end
+  for TypeID, Type in pairs( Types ) do
+    self.Filter.Types[Type] = Type
+  end
+  return self
+end
+
+
+--- Builds a set of units of defined countries.
+-- Possible current countries are those known within DCS world.
+-- @param #UNITSET self
+-- @param #string Countries Can take those country strings known within DCS world.
+-- @return #UNITSET self
+function UNITSET:FilterCountries( Countries )
+  if not self.Filter.Countries then
+    self.Filter.Countries = {}
+  end
+  if type( Countries ) ~= "table" then
+    Countries = { Countries }
+  end
+  for CountryID, Country in pairs( Countries ) do
+    self.Filter.Countries[Country] = Country
+  end
+  return self
+end
+
+
+--- Builds a set of units of defined unit prefixes.
+-- All the units starting with the given prefixes will be included within the set.
+-- @param #UNITSET self
+-- @param #string Prefixes The prefix of which the unit name starts with.
+-- @return #UNITSET self
+function UNITSET:FilterPrefixes( Prefixes )
+  if not self.Filter.UnitPrefixes then
+    self.Filter.UnitPrefixes = {}
+  end
+  if type( Prefixes ) ~= "table" then
+    Prefixes = { Prefixes }
+  end
+  for PrefixID, Prefix in pairs( Prefixes ) do
+    self.Filter.UnitPrefixes[Prefix] = Prefix
+  end
+  return self
+end
+
+
+
+
+--- Starts the filtering.
+-- @param #UNITSET self
+-- @return #UNITSET self
+function UNITSET:FilterStart()
+
+  if _DATABASE then
+    self:_FilterStart()
+  end
+  
+  return self
+end
+
+--- Handles the Database to check on an event (birth) that the Object was added in the Database.
+-- This is required, because sometimes the _DATABASE birth event gets called later than the SET birth event!
+-- @param #UNITSET self
+-- @param Event#EVENTDATA Event
+-- @return #string The name of the UNIT
+-- @return #table The UNIT
+function UNITSET:AddInDatabase( Event )
+  self:F3( { Event } )
+
+  if not self.Database[Event.IniDCSUnitName] then
+    self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName )
+    self:T3( self.Database[Event.IniDCSUnitName] )
+  end
+  
+  return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName]
+end
+
+--- Handles the Database to check on any event that Object exists in the Database.
+-- This is required, because sometimes the _DATABASE event gets called later than the SET event or vise versa!
+-- @param #UNITSET self
+-- @param Event#EVENTDATA Event
+-- @return #string The name of the UNIT
+-- @return #table The UNIT
+function UNITSET:FindInDatabase( Event )
+  self:F3( { Event } )
+
+  return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName]
+end
+
+--- Interate the UNITSET and call an interator function for each **alive** UNIT, providing the UNIT and optional parameters.
+-- @param #UNITSET self
+-- @param #function IteratorFunction The function that will be called when there is an alive UNIT in the UNITSET. The function needs to accept a UNIT parameter.
+-- @return #UNITSET self
+function UNITSET:ForEachUnit( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.Set )
+
+  return self
+end
+
+
+----- Interate the UNITSET and call an interator function for each **alive** player, providing the Unit of the player and optional parameters.
+---- @param #UNITSET self
+---- @param #function IteratorFunction The function that will be called when there is an alive player in the UNITSET. The function needs to accept a UNIT parameter.
+---- @return #UNITSET self
+--function UNITSET:ForEachPlayer( IteratorFunction, ... )
+--  self:F2( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
+--  
+--  return self
+--end
+--
+--
+----- Interate the UNITSET and call an interator function for each client, providing the Client to the function and optional parameters.
+---- @param #UNITSET self
+---- @param #function IteratorFunction The function that will be called when there is an alive player in the UNITSET. The function needs to accept a CLIENT parameter.
+---- @return #UNITSET self
+--function UNITSET:ForEachClient( IteratorFunction, ... )
+--  self:F2( arg )
+--  
+--  self:ForEach( IteratorFunction, arg, self.Clients )
+--
+--  return self
+--end
+
+
+---
+-- @param #UNITSET self
+-- @param Unit#UNIT MUnit
+-- @return #UNITSET self
+function UNITSET:IsIncludeObject( MUnit )
+  self:F2( MUnit )
+  local MUnitInclude = true
+
+  if self.Filter.Coalitions then
+    local MUnitCoalition = false
+    for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
+      self:T3( { "Coalition:", MUnit:GetCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
+      if self.FilterMeta.Coalitions[CoalitionName] and self.FilterMeta.Coalitions[CoalitionName] == MUnit:GetCoalition() then
+        MUnitCoalition = true
+      end
+    end
+    MUnitInclude = MUnitInclude and MUnitCoalition
+  end
+  
+  if self.Filter.Categories then
+    local MUnitCategory = false
+    for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
+      self:T3( { "Category:", MUnit:GetDesc().category, self.FilterMeta.Categories[CategoryName], CategoryName } )
+      if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MUnit:GetDesc().category then
+        MUnitCategory = true
+      end
+    end
+    MUnitInclude = MUnitInclude and MUnitCategory
+  end
+  
+  if self.Filter.Types then
+    local MUnitType = false
+    for TypeID, TypeName in pairs( self.Filter.Types ) do
+      self:T3( { "Type:", MUnit:GetTypeName(), TypeName } )
+      if TypeName == MUnit:GetTypeName() then
+        MUnitType = true
+      end
+    end
+    MUnitInclude = MUnitInclude and MUnitType
+  end
+  
+  if self.Filter.Countries then
+    local MUnitCountry = false
+    for CountryID, CountryName in pairs( self.Filter.Countries ) do
+      self:T3( { "Country:", MUnit:GetCountry(), CountryName } )
+      if country.id[CountryName] == MUnit:GetCountry() then
+        MUnitCountry = true
+      end
+    end
+    MUnitInclude = MUnitInclude and MUnitCountry
+  end
+
+  if self.Filter.UnitPrefixes then
+    local MUnitPrefix = false
+    for UnitPrefixId, UnitPrefix in pairs( self.Filter.UnitPrefixes ) do
+      self:T3( { "Prefix:", string.find( MUnit:GetName(), UnitPrefix, 1 ), UnitPrefix } )
+      if string.find( MUnit:GetName(), UnitPrefix, 1 ) then
+        MUnitPrefix = true
+      end
+    end
+    MUnitInclude = MUnitInclude and MUnitPrefix
+  end
+
+  self:T2( MUnitInclude )
+  return MUnitInclude
+end
+
+
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 8f1d04ce8..07c019def 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: 20160526_1413' ) 
+env.info( 'Moose Generation Timestamp: 20160602_1448' ) 
 local base = _G
 env.info("Loading MOOSE " .. base.timer.getAbsTime() )
 
@@ -3037,7 +3037,10 @@ function BASE:E( Arguments )
 	end
 
 	local LineCurrent = DebugInfoCurrent.currentline
-	local LineFrom = DebugInfoFrom.currentline
+  local LineFrom = -1 
+	if DebugInfoFrom then
+	  LineFrom = DebugInfoFrom.currentline
+	end
 
 	env.info( string.format( "%6d(%6d)/%1s:%20s%05d.%s(%s)" , LineCurrent, LineFrom, "E", self.ClassName, self.ClassID, Function, routines.utils.oneLineSerialize( Arguments ) ) )
 end
@@ -3252,7 +3255,7 @@ local _EVENTCODES = {
 
 function EVENT:New()
   local self = BASE:Inherit( self, BASE:New() )
-  self:F()
+  self:F2()
   self.EventHandler = world.addEventHandler( self )
   return self
 end
@@ -3342,7 +3345,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnBirthForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnBirthForUnit )
   
@@ -3355,7 +3358,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnBirth( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_BIRTH )
   
@@ -3369,7 +3372,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnBirthForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
   
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_BIRTH )
   
@@ -3383,7 +3386,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnCrashForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnCrashForUnit )
 
@@ -3396,7 +3399,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnCrash( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_CRASH )
   
@@ -3410,7 +3413,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnCrashForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
   
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_CRASH )
 
@@ -3424,7 +3427,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnDeadForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
   
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnDeadForUnit )
 
@@ -3437,7 +3440,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnDead( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_DEAD )
   
@@ -3452,7 +3455,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnDeadForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_DEAD )
   
@@ -3466,7 +3469,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPilotDeadForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_PILOT_DEAD )
 
@@ -3480,7 +3483,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnLandForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnLandForUnit )
   
@@ -3494,7 +3497,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnLandForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_LAND )
 
@@ -3508,7 +3511,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnTakeOffForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnTakeOffForUnit )
 
@@ -3522,7 +3525,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnTakeOffForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_TAKEOFF )
 
@@ -3536,7 +3539,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineShutDownForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnEngineShutDownForUnit )
   
@@ -3550,7 +3553,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineShutDownForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_ENGINE_SHUTDOWN )
   
@@ -3564,7 +3567,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineStartUpForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_ENGINE_STARTUP )
   
@@ -3577,7 +3580,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnShot( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_SHOT )
   
@@ -3591,7 +3594,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnShotForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_SHOT )
   
@@ -3604,7 +3607,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnHit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_HIT )
   
@@ -3618,7 +3621,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnHitForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_HIT )
   
@@ -3631,7 +3634,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPlayerEnterUnit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_PLAYER_ENTER_UNIT )
   
@@ -3644,7 +3647,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPlayerLeaveUnit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_PLAYER_LEAVE_UNIT )
   
@@ -3654,7 +3657,7 @@ end
 
 
 function EVENT:onEvent( Event )
-  self:F( { _EVENTCODES[Event.id], Event } )
+  self:F2( { _EVENTCODES[Event.id], Event } )
 
   if self and self.Events and self.Events[Event.id] then
     if Event.initiator and Event.initiator:getCategory() == Object.Category.UNIT then
@@ -4068,35 +4071,35 @@ function MENU_COALITION_COMMAND:Remove()
   self.ParentMenu.Menus[self.MenuPath] = nil
   return nil
 end
---- GROUP class. 
--- 
+--- GROUP class.
+--
 -- @{GROUP} class
 -- ==============
 -- The @{GROUP} class is a wrapper class to handle the DCS Group objects:
--- 
+--
 --  * Support all DCS Group APIs.
 --  * Enhance with Group specific APIs not in the DCS Group API set.
 --  * Handle local Group Controller.
 --  * Manage the "state" of the DCS Group.
---  
---  
+--
+--
 -- GROUP reference methods
--- ======================= 
+-- =======================
 -- For each DCS Group object alive within a running mission, a GROUP wrapper object (instance) will be created within the _@{DATABASE} object.
 -- This is done at the beginning of the mission (when the mission starts), and dynamically when new DCS Group objects are spawned (using the @{SPAWN} class).
---  
+--
 -- The GROUP class does not contain a :New() method, rather it provides :Find() methods to retrieve the object reference
 -- using the DCS Group or the DCS GroupName.
--- 
--- Another thing to know is that GROUP objects do not "contain" the DCS Group object. 
+--
+-- Another thing to know is that GROUP objects do not "contain" the DCS Group object.
 -- The GROUP methods will reference the DCS Group object by name when it is needed during API execution.
 -- If the DCS Group object does not exist or is nil, the GROUP methods will return nil and log an exception in the DCS.log file.
---  
+--
 -- The GROUP class provides the following functions to retrieve quickly the relevant GROUP instance:
--- 
+--
 --  * @{#GROUP.Find}(): Find a GROUP instance from the _DATABASE object using a DCS Group object.
 --  * @{#GROUP.FindByName}(): Find a GROUP instance from the _DATABASE object using a DCS Group name.
---  
+--
 -- IMPORTANT: ONE SHOULD NEVER SANATIZE these GROUP OBJECT REFERENCES! (make the GROUP object references nil).
 -- @module Group
 -- @author FlightControl
@@ -4112,14 +4115,14 @@ Include.File( "Unit" )
 -- @field DCSGroup#Group DCSGroup The DCS group class.
 -- @field #string GroupName The name of the group.
 GROUP = {
-	ClassName = "GROUP",
-	GroupName = "",
-	GroupID = 0,
-	Controller = nil,
-	DCSGroup = nil,
-	WayPointFunctions = {},
-	}
-	
+  ClassName = "GROUP",
+  GroupName = "",
+  GroupID = 0,
+  Controller = nil,
+  DCSGroup = nil,
+  WayPointFunctions = {},
+}
+
 --- A DCSGroup
 -- @type DCSGroup
 -- @field id_ The ID of the group in DCS
@@ -4129,10 +4132,10 @@ GROUP = {
 -- @param DCSGroup#Group GroupName The DCS Group name
 -- @return #GROUP self
 function GROUP:Register( GroupName )
-	local self = BASE:Inherit( self, BASE:New() )
-	self:F2( GroupName )
-	self.GroupName = GroupName
-	return self
+  local self = BASE:Inherit( self, BASE:New() )
+  self:F2( GroupName )
+  self.GroupName = GroupName
+  return self
 end
 
 -- Reference methods.
@@ -4165,11 +4168,11 @@ end
 -- @return DCSGroup#Group The DCS Group.
 function GROUP:GetDCSGroup()
   local DCSGroup = Group.getByName( self.GroupName )
-  
+
   if DCSGroup then
     return DCSGroup
   end
-    
+
   return nil
 end
 
@@ -4180,27 +4183,27 @@ end
 -- @return #boolean true if the DCS Group is alive.
 function GROUP:IsAlive()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupIsAlive = DCSGroup:isExist()
     self:T3( GroupIsAlive )
     return GroupIsAlive
   end
-  
+
   return nil
 end
 
---- Destroys the DCS Group and all of its DCS Units. 
+--- Destroys the DCS Group and all of its DCS Units.
 -- Note that this destroy method also raises a destroy event at run-time.
 -- So all event listeners will catch the destroy event of this DCS Group.
 -- @param #GROUP self
 function GROUP:Destroy()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     for Index, UnitData in pairs( DCSGroup:getUnits() ) do
       self:CreateEventCrash( timer.getTime(), UnitData )
@@ -4208,11 +4211,11 @@ function GROUP:Destroy()
     DCSGroup:destroy()
     DCSGroup = nil
   end
-  
+
   return nil
 end
 
---- Returns category of the DCS Group. 
+--- Returns category of the DCS Group.
 -- @param #GROUP self
 -- @return DCSGroup#Group.Category The category ID
 function GROUP:GetCategory()
@@ -4224,7 +4227,7 @@ function GROUP:GetCategory()
     self:T3( GroupCategory )
     return GroupCategory
   end
-  
+
   return nil
 end
 
@@ -4240,14 +4243,14 @@ function GROUP:GetCategoryName()
       [Group.Category.AIRPLANE] = "Airplane",
       [Group.Category.HELICOPTER] = "Helicopter",
       [Group.Category.GROUND] = "Ground Unit",
-      [Group.Category.SHIP] = "Ship",  
+      [Group.Category.SHIP] = "Ship",
     }
     local GroupCategory = DCSGroup:getCategory()
     self:T3( GroupCategory )
-  
+
     return CategoryNames[GroupCategory]
   end
-  
+
   return nil
 end
 
@@ -4264,7 +4267,24 @@ function GROUP:GetCoalition()
     self:T3( GroupCoalition )
     return GroupCoalition
   end
-  
+
+  return nil
+end
+
+--- Returns the country of the DCS Group.
+-- @param #GROUP self
+-- @return DCScountry#country.id The country identifier.
+-- @return #nil The DCS Group is not existing or alive.
+function GROUP:GetCountry()
+  self:F2( self.GroupName )
+
+  local DCSGroup = self:GetDCSGroup()
+  if DCSGroup then
+    local GroupCountry = DCSGroup:getUnit(1):getCountry()
+    self:T3( GroupCountry )
+    return GroupCountry
+  end
+
   return nil
 end
 
@@ -4275,13 +4295,13 @@ function GROUP:GetName()
   self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupName = DCSGroup:getName()
     self:T3( GroupName )
     return GroupName
   end
-  
+
   return nil
 end
 
@@ -4290,19 +4310,19 @@ end
 -- @return #number The identifier of the DCS Group.
 function GROUP:GetID()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupID = DCSGroup:getID()
     self:T3( GroupID )
     return GroupID
   end
-  
+
   return nil
 end
 
---- Returns the UNIT wrapper class with number UnitNumber. 
+--- Returns the UNIT wrapper class with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the UNIT wrapper class to be returned.
@@ -4311,7 +4331,7 @@ function GROUP:GetUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local UnitFound = UNIT:Find( DCSGroup:getUnit( UnitNumber ) )
     self:T3( UnitFound.UnitName )
@@ -4322,7 +4342,7 @@ function GROUP:GetUnit( UnitNumber )
   return nil
 end
 
---- Returns the DCS Unit with number UnitNumber. 
+--- Returns the DCS Unit with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the DCS Unit to be returned.
@@ -4331,7 +4351,7 @@ function GROUP:GetDCSUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnitFound = DCSGroup:getUnit( UnitNumber )
     self:T3( DCSUnitFound )
@@ -4341,14 +4361,14 @@ function GROUP:GetDCSUnit( UnitNumber )
   return nil
 end
 
---- Returns current size of the DCS Group. 
--- If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed. 
+--- Returns current size of the DCS Group.
+-- If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed.
 -- @param #GROUP self
 -- @return #number The DCS Group size.
 function GROUP:GetSize()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupSize = DCSGroup:getSize()
     self:T3( GroupSize )
@@ -4358,15 +4378,15 @@ function GROUP:GetSize()
   return nil
 end
 
---- 
---- Returns the initial size of the DCS Group. 
--- If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged. 
+---
+--- Returns the initial size of the DCS Group.
+-- If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged.
 -- @param #GROUP self
 -- @return #number The DCS Group initial size.
 function GROUP:GetInitialSize()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupInitialSize = DCSGroup:getInitialSize()
     self:T3( GroupInitialSize )
@@ -4382,7 +4402,7 @@ end
 function GROUP:GetUnits()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnits = DCSGroup:getUnits()
     local Units = {}
@@ -4403,7 +4423,7 @@ end
 function GROUP:GetDCSUnits()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnits = DCSGroup:getUnits()
     self:T3( DCSUnits )
@@ -4419,7 +4439,7 @@ end
 function GROUP:_GetController()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupController = DCSGroup:getController()
     self:T3( GroupController )
@@ -4439,7 +4459,7 @@ end
 function GROUP:WayPointInitialize()
 
   self.WayPoints = self:GetTaskRoute()
-  
+
   return self
 end
 
@@ -4452,7 +4472,7 @@ end
 -- @return #GROUP
 function GROUP:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
   self:F2( { WayPoint, WayPointIndex, WayPointFunction } )
-  
+
   table.insert( self.WayPoints[WayPoint].task.params.tasks, WayPointIndex )
   self.WayPoints[WayPoint].task.params.tasks[WayPointIndex] = self:TaskFunction( WayPoint, WayPointIndex, WayPointFunction, arg )
   return self
@@ -4462,7 +4482,7 @@ end
 function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionArguments )
 
   local DCSTask
-  
+
   local DCSScript = {}
   DCSScript[#DCSScript+1] = "local MissionGroup = GROUP:Find( ... ) "
 
@@ -4470,16 +4490,16 @@ function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionAr
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup, " .. table.concat( FunctionArguments, "," ) .. ")"
   else
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup )"
-  end  
-  
-  DCSTask = self:TaskWrappedAction( 
+  end
+
+  DCSTask = self:TaskWrappedAction(
     self:CommandDoScript(
       table.concat( DCSScript )
     ), WayPointIndex
   )
-  
+
   self:T3( DCSTask )
-  
+
   return DCSTask
 
 end
@@ -4498,14 +4518,14 @@ function GROUP:WayPointExecute( WayPoint, WaitTime )
   if not WayPoint then
     WayPoint = 1
   end
-  
+
   -- When starting the mission from a certain point, the TaskPoints need to be deleted before the given WayPoint.
   for TaskPointID = 1, WayPoint - 1 do
     table.remove( self.WayPoints, 1 )
   end
 
   self:T3( self.WayPoints )
-  
+
   self:SetTask( self:TaskRoute( self.WayPoints ), WaitTime )
 
   return self
@@ -4515,9 +4535,9 @@ end
 --- Activates a GROUP.
 -- @param #GROUP self
 function GROUP:Activate()
-	self:F2( { self.GroupName } )
-	trigger.action.activateGroup( self:GetDCSGroup() )
-	return self:GetDCSGroup()
+  self:F2( { self.GroupName } )
+  trigger.action.activateGroup( self:GetDCSGroup() )
+  return self:GetDCSGroup()
 end
 
 
@@ -4528,13 +4548,13 @@ function GROUP:GetTypeName()
   self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupTypeName = DCSGroup:getUnit(1):getTypeName()
     self:T3( GroupTypeName )
     return( GroupTypeName )
   end
-  
+
   return nil
 end
 
@@ -4543,33 +4563,33 @@ end
 -- @return #string The CallSign of the first DCS Unit of the DCS Group.
 function GROUP:GetCallsign()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCallSign = DCSGroup:getUnit(1):getCallsign()
     self:T3( GroupCallSign )
     return GroupCallSign
   end
-  
+
   return nil
 end
 
 --- Returns the current point (Vec2 vector) of the first DCS Unit in the DCS Group.
 -- @return DCSTypes#Vec2 Current Vec2 point of the first DCS Unit of the DCS Group.
 function GROUP:GetPointVec2()
-	self:F2( self.GroupName )
-	
-	local GroupPointVec2 = self:GetUnit(1):GetPointVec2()
-	self:T3( GroupPointVec2 )
-	return GroupPointVec2
+  self:F2( self.GroupName )
+
+  local GroupPointVec2 = self:GetUnit(1):GetPointVec2()
+  self:T3( GroupPointVec2 )
+  return GroupPointVec2
 end
 
 --- Returns the current point (Vec3 vector) of the first DCS Unit in the DCS Group.
 -- @return DCSTypes#Vec3 Current Vec3 point of the first DCS Unit of the DCS Group.
 function GROUP:GetPointVec3()
-	self:F2( self.GroupName )
-  
+  self:F2( self.GroupName )
+
   local GroupPointVec3 = self:GetUnit(1):GetPointVec3()
   self:T3( GroupPointVec3 )
   return GroupPointVec3
@@ -4584,16 +4604,16 @@ end
 -- @param #GROUP self
 -- @return #boolean Air category evaluation result.
 function GROUP:IsAir()
-	self:F2( self.GroupName )
+  self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local IsAirResult = DCSGroup:getCategory() == Group.Category.AIRPLANE or DCSGroup:getCategory() == Group.Category.HELICOPTER
-  	self:T3( IsAirResult )
-  	return IsAirResult
+    local IsAirResult = DCSGroup:getCategory() == Group.Category.AIRPLANE or DCSGroup:getCategory() == Group.Category.HELICOPTER
+    self:T3( IsAirResult )
+    return IsAirResult
   end
-  
+
   return nil
 end
 
@@ -4602,15 +4622,15 @@ end
 -- @return #boolean true if DCS Group contains Helicopters.
 function GROUP:IsHelicopter()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.HELICOPTER
   end
-  
+
   return nil
 end
 
@@ -4619,15 +4639,15 @@ end
 -- @return #boolean true if DCS Group contains AirPlanes.
 function GROUP:IsAirPlane()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.AIRPLANE
   end
-  
+
   return nil
 end
 
@@ -4636,15 +4656,15 @@ end
 -- @return #boolean true if DCS Group contains Ground troops.
 function GROUP:IsGround()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.GROUND
   end
-  
+
   return nil
 end
 
@@ -4653,15 +4673,15 @@ end
 -- @return #boolean true if DCS Group contains Ships.
 function GROUP:IsShip()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.SHIP
   end
-  
+
   return nil
 end
 
@@ -4670,23 +4690,23 @@ end
 -- @param #GROUP self
 -- @return #boolean All units on the ground result.
 function GROUP:AllOnGround()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local AllOnGroundResult = true
-  
-  	for Index, UnitData in pairs( DCSGroup:getUnits() ) do
-  		if UnitData:inAir() then
-  			AllOnGroundResult = false
-  		end
-  	end
-  	
-  	self:T3( AllOnGroundResult )
-  	return AllOnGroundResult
+    local AllOnGroundResult = true
+
+    for Index, UnitData in pairs( DCSGroup:getUnits() ) do
+      if UnitData:inAir() then
+        AllOnGroundResult = false
+      end
+    end
+
+    self:T3( AllOnGroundResult )
+    return AllOnGroundResult
   end
-  
+
   return nil
 end
 
@@ -4695,26 +4715,26 @@ end
 -- @param #GROUP self
 -- @return #number Maximum velocity found.
 function GROUP:GetMaxVelocity()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local MaxVelocity = 0
-  	
-  	for Index, UnitData in pairs( DCSGroup:getUnits() ) do
-  
-  		local Velocity = UnitData:getVelocity()
-  		local VelocityTotal = math.abs( Velocity.x ) + math.abs( Velocity.y ) + math.abs( Velocity.z )
-  
-  		if VelocityTotal < MaxVelocity then
-  			MaxVelocity = VelocityTotal
-  		end 
-  	end
-  	
-  	return MaxVelocity
+    local MaxVelocity = 0
+
+    for Index, UnitData in pairs( DCSGroup:getUnits() ) do
+
+      local Velocity = UnitData:getVelocity()
+      local VelocityTotal = math.abs( Velocity.x ) + math.abs( Velocity.y ) + math.abs( Velocity.z )
+
+      if VelocityTotal < MaxVelocity then
+        MaxVelocity = VelocityTotal
+      end
+    end
+
+    return MaxVelocity
   end
- 
+
   return nil
 end
 
@@ -4723,7 +4743,7 @@ end
 -- @param #GROUP self
 -- @return #number Minimum height found.
 function GROUP:GetMinHeight()
-	self:F2()
+  self:F2()
 
 end
 
@@ -4732,7 +4752,7 @@ end
 -- @param #GROUP self
 -- @return #number Maximum height found.
 function GROUP:GetMaxHeight()
-	self:F2()
+  self:F2()
 
 end
 
@@ -4742,16 +4762,16 @@ end
 -- @param #GROUP self
 -- @return Group#GROUP self
 function GROUP:PopCurrentTask()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
     Controller:popTask()
     return self
   end
-  
+
   return nil
 end
 
@@ -4759,27 +4779,27 @@ end
 -- @param #GROUP self
 -- @return Group#GROUP self
 function GROUP:PushTask( DCSTask, WaitTime )
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     -- When a group SPAWNs, it takes about a second to get the group in the simulator. Setting tasks to unspawned groups provides unexpected results.
     -- Therefore we schedule the functions to set the mission and options for the Group.
     -- Controller:pushTask( DCSTask )
-  
+
     if WaitTime then
       --routines.scheduleFunction( Controller.pushTask, { Controller, DCSTask }, timer.getTime() + WaitTime )
       SCHEDULER:New( Controller, Controller.pushTask, { DCSTask }, WaitTime )
     else
       Controller:pushTask( DCSTask )
     end
-  
+
     return self
   end
-  
+
   return nil
 end
 
@@ -4790,24 +4810,24 @@ function GROUP:SetTask( DCSTask, WaitTime )
   self:F2( { DCSTask } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  
+
     local Controller = self:_GetController()
-    
+
     -- When a group SPAWNs, it takes about a second to get the group in the simulator. Setting tasks to unspawned groups provides unexpected results.
     -- Therefore we schedule the functions to set the mission and options for the Group.
     -- Controller.setTask( Controller, DCSTask )
-  
+
     if not WaitTime then
       WaitTime = 1
     end
     --routines.scheduleFunction( Controller.setTask, { Controller, DCSTask }, timer.getTime() + WaitTime )
     SCHEDULER:New( Controller, Controller.setTask, { DCSTask }, WaitTime )
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -4815,15 +4835,15 @@ end
 --- Return a condition section for a controlled task
 -- @param #GROUP self
 -- @param DCSTime#Time time
--- @param #string userFlag 
--- @param #boolean userFlagValue 
+-- @param #string userFlag
+-- @param #boolean userFlagValue
 -- @param #string condition
--- @param DCSTime#Time duration 
--- @param #number lastWayPoint 
+-- @param DCSTime#Time duration
+-- @param #number lastWayPoint
 -- return DCSTask#Task
 function GROUP:TaskCondition( time, userFlag, userFlagValue, condition, duration, lastWayPoint )
-	self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
-  
+  self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
+
   local DCSStopCondition = {}
   DCSStopCondition.time = time
   DCSStopCondition.userFlag = userFlag
@@ -4831,9 +4851,9 @@ function GROUP:TaskCondition( time, userFlag, userFlagValue, condition, duration
   DCSStopCondition.condition = condition
   DCSStopCondition.duration = duration
   DCSStopCondition.lastWayPoint = lastWayPoint
-  
+
   self:T3( { DCSStopCondition } )
-  return DCSStopCondition 
+  return DCSStopCondition
 end
 
 --- Return a Controlled Task taking a Task and a TaskCondition
@@ -4842,18 +4862,18 @@ end
 -- @param #DCSStopCondition DCSStopCondition
 -- @return DCSTask#Task
 function GROUP:TaskControlled( DCSTask, DCSStopCondition )
-	self:F2( { DCSTask, DCSStopCondition } )
+  self:F2( { DCSTask, DCSStopCondition } )
 
   local DCSTaskControlled
-  
-  DCSTaskControlled = { 
-    id = 'ControlledTask', 
-    params = { 
-      task = DCSTask, 
-      stopCondition = DCSStopCondition 
-    } 
+
+  DCSTaskControlled = {
+    id = 'ControlledTask',
+    params = {
+      task = DCSTask,
+      stopCondition = DCSStopCondition
+    }
   }
-  
+
   self:T3( { DCSTaskControlled } )
   return DCSTaskControlled
 end
@@ -4866,19 +4886,19 @@ function GROUP:TaskCombo( DCSTasks )
   self:F2( { DCSTasks } )
 
   local DCSTaskCombo
-  
-  DCSTaskCombo = { 
-    id = 'ComboTask', 
-    params = { 
+
+  DCSTaskCombo = {
+    id = 'ComboTask',
+    params = {
       tasks = DCSTasks
-    } 
+    }
   }
-  
+
   self:T3( { DCSTaskCombo } )
   return DCSTaskCombo
 end
 
---- Return a WrappedAction Task taking a Command 
+--- Return a WrappedAction Task taking a Command
 -- @param #GROUP self
 -- @param DCSCommand#Command DCSCommand
 -- @return DCSTask#Task
@@ -4886,8 +4906,8 @@ function GROUP:TaskWrappedAction( DCSCommand, Index )
   self:F2( { DCSCommand } )
 
   local DCSTaskWrappedAction
-  
-  DCSTaskWrappedAction = { 
+
+  DCSTaskWrappedAction = {
     id = "WrappedAction",
     enabled = true,
     number = Index,
@@ -4907,15 +4927,15 @@ end
 -- @return #GROUP self
 function GROUP:SetCommand( DCSCommand )
   self:F2( DCSCommand )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
     Controller:setCommand( DCSCommand )
     return self
   end
-  
+
   return nil
 end
 
@@ -4926,117 +4946,387 @@ end
 -- @return DCSTask#Task
 function GROUP:CommandSwitchWayPoint( FromWayPoint, ToWayPoint, Index )
   self:F2( { FromWayPoint, ToWayPoint, Index } )
-  
+
   local CommandSwitchWayPoint = {
-    id = 'SwitchWaypoint', 
-    params = { 
-      fromWaypointIndex = FromWayPoint,  
-      goToWaypointIndex = ToWayPoint, 
+    id = 'SwitchWaypoint',
+    params = {
+      fromWaypointIndex = FromWayPoint,
+      goToWaypointIndex = ToWayPoint,
     },
   }
-  
+
   self:T3( { CommandSwitchWayPoint } )
   return CommandSwitchWayPoint
 end
-  
 
---- Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
+
+-- TASKS FOR AIR GROUPS
+
+
+--- (AIR) Attack a Group.
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
+
+  --  AttackGroup = {
+  --   id = 'AttackGroup',
+  --   params = {
+  --     groupId = Group.ID,
+  --     weaponType = number,
+  --     expend = enum AI.Task.WeaponExpend,
+  --     attackQty = number,
+  --     directionEnabled = boolean,
+  --     direction = Azimuth,
+  --     altitudeEnabled = boolean,
+  --     altitude = Distance,
+  --     attackQtyLimit = boolean,
+  --   }
+  -- }
+
+  local DirectionEnabled = nil
+  if Direction then
+    DirectionEnabled = true
+  end
+
+  local AltitudeEnabled = nil
+  if Altitude then
+    AltitudeEnabled = true
+  end
+
+  local DCSTask
+  DCSTask = { id = 'AttackGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      directionEnabled = DirectionEnabled,
+      direction = Direction,
+      altitudeEnabled = AltitudeEnabled,
+      altitude = Altitude,
+      attackQtyLimit = AttackQtyLimit,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Attack the Unit.
+-- @param #GROUP self
+-- @param Unit#UNIT AttackUnit The unit.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackUnit( AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack )
+  self:F2( { self.GroupName, AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack } )
+
+  --  AttackUnit = {
+  --    id = 'AttackUnit',
+  --    params = {
+  --      unitId = Unit.ID,
+  --      weaponType = number,
+  --      expend = enum AI.Task.WeaponExpend
+  --      attackQty = number,
+  --      direction = Azimuth,
+  --      attackQtyLimit = boolean,
+  --      groupAttack = boolean,
+  --    }
+  --  }
+
+  local DCSTask
+  DCSTask = { id = 'AttackUnit',
+    params = {
+      unitId = AttackUnit:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      direction = Direction,
+      attackQtyLimit = AttackQtyLimit,
+      groupAttack = GroupAttack,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Delivering weapon at the point on the ground. 
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the point to deliver weapon at.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) Desired quantity of passes. The parameter is not the same in AttackGroup and AttackUnit tasks. 
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskBombing( PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  Bombing = { 
+--    id = 'Bombing', 
+--    params = { 
+--      point = Vec2,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'Bombing',
+    params = {
+    point = PointVec2,
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+--- (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 Point The point to hold the position.
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #GROUP self
 function GROUP:TaskOrbitCircleAtVec2( Point, Altitude, Speed )
-	self:F2( { self.GroupName, Point, Altitude, Speed } )
+  self:F2( { self.GroupName, Point, Altitude, Speed } )
+
+  --  pattern = enum AI.Task.OribtPattern,
+  --    point = Vec2,
+  --    point2 = Vec2,
+  --    speed = Distance,
+  --    altitude = Distance
 
---  pattern = enum AI.Task.OribtPattern,
---    point = Vec2,
---    point2 = Vec2,
---    speed = Distance,
---    altitude = Distance
-    
   local LandHeight = land.getHeight( Point )
-  
+
   self:T3( { LandHeight } )
 
-  local DCSTask = { id = 'Orbit', 
-                   params = { pattern = AI.Task.OrbitPattern.CIRCLE, 
-                              point = Point, 
-                              speed = Speed, 
-                              altitude = Altitude + LandHeight
-                            } 
-                 } 
+  local DCSTask = { id = 'Orbit',
+    params = { pattern = AI.Task.OrbitPattern.CIRCLE,
+      point = Point,
+      speed = Speed,
+      altitude = Altitude + LandHeight
+    }
+  }
+
+
+  --  local AITask = { id = 'ControlledTask',
+  --                   params = { task = { id = 'Orbit',
+  --                                       params = { pattern = AI.Task.OrbitPattern.CIRCLE,
+  --                                                  point = Point,
+  --                                                  speed = Speed,
+  --                                                  altitude = Altitude + LandHeight
+  --                                                }
+  --                                     },
+  --                              stopCondition = { duration = Duration
+  --                                              }
+  --                            }
+  --                 }
+  --               )
 
-  
---  local AITask = { id = 'ControlledTask', 
---                   params = { task = { id = 'Orbit', 
---                                       params = { pattern = AI.Task.OrbitPattern.CIRCLE, 
---                                                  point = Point, 
---                                                  speed = Speed, 
---                                                  altitude = Altitude + LandHeight
---                                                } 
---                                     }, 
---                              stopCondition = { duration = Duration 
---                                              } 
---                            } 
---                 }
---               )
-               
   return DCSTask
 end
 
---- Orbit at the current position of the first unit of the group at a specified alititude
+--- (AIR) Orbit at the current position of the first unit of the group at a specified alititude
 -- @param #GROUP self
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #GROUP self
 function GROUP:TaskOrbitCircle( Altitude, Speed )
-	self:F2( { self.GroupName, Altitude, Speed } )
+  self:F2( { self.GroupName, Altitude, Speed } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupPoint = self:GetPointVec2()
     return self:TaskOrbitCircleAtVec2( GroupPoint, Altitude, Speed )
   end
-  
+
   return nil
 end
 
 
 
---- Hold position at the current position of the first unit of the group.
+--- (AIR) Hold position at the current position of the first unit of the group.
 -- @param #GROUP self
 -- @param #number Duration The maximum duration in seconds to hold the position.
 -- @return #GROUP self
 function GROUP:TaskHoldPosition()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   return self:TaskOrbitCircle( 30, 10 )
 end
 
 
---- Land the group at a Vec2Point.
+
+
+--- (AIR) Attacking the map object (building, structure, e.t.c).
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the point the map object is closest to. The distance between the point and the map object must not be greater than 2000 meters. Object id is not used here because Mission Editor doesn't support map object identificators.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackMapObject( PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  AttackMapObject = { 
+--    id = 'AttackMapObject', 
+--    params = { 
+--      point = Vec2,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'AttackMapObject',
+    params = {
+    point = PointVec2,
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Delivering weapon on the runway.
+-- @param #GROUP self
+-- @param Airbase#AIRBASE Airbase Airbase to attack.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskBombingRunway( Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  BombingRunway = { 
+--    id = 'BombingRunway', 
+--    params = { 
+--      runwayId = AirdromeId,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'BombingRunway',
+    params = {
+    point = Airbase:GetID(),
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Refueling from the nearest tanker. No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskRefueling()
+  self:F2( { self.GroupName } )
+
+--  Refueling = { 
+--    id = 'Refueling', 
+--    params = {} 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Refueling',
+    params = {
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR HELICOPTER) Landing at the ground. For helicopters only.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 Point The point where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
 -- @return #GROUP self
 function GROUP:TaskLandAtVec2( Point, Duration )
-	self:F2( { self.GroupName, Point, Duration } )
+  self:F2( { self.GroupName, Point, Duration } )
 
+--  Land = {
+--    id= 'Land',
+--    params = {
+--      point = Vec2,
+--      durationFlag = boolean,
+--      duration = Time
+--    }
+--  }
+ 
   local DCSTask
-  
-	if Duration and Duration > 0 then
-		DCSTask = { id = 'Land', params = { point = Point, durationFlag = true, duration = Duration } }
-	else
-		DCSTask = { id = 'Land', params = { point = Point, durationFlag = false } }
-	end
+  if Duration and Duration > 0 then
+    DCSTask = { id = 'Land', 
+      params = { 
+        point = Point, 
+        durationFlag = true, 
+        duration = Duration,
+      }, 
+    }
+  else
+    DCSTask = { id = 'Land', 
+      params = { 
+        point = Point, 
+        durationFlag = false, 
+      }, 
+    }
+  end
 
   self:T3( DCSTask )
-	return DCSTask
+  return DCSTask
 end
 
---- Land the group at a @{Zone#ZONE).
+--- (AIR) Land the group at a @{Zone#ZONE).
 -- @param #GROUP self
 -- @param Zone#ZONE Zone The zone where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
@@ -5050,80 +5340,104 @@ function GROUP:TaskLandAtZone( Zone, Duration, RandomPoint )
   else
     Point = Zone:GetPointVec2()
   end
-  
+
   local DCSTask = self:TaskLandAtVec2( Point, Duration )
 
   self:T3( DCSTask )
   return DCSTask
 end
 
-
---- Attack the Unit.
+--- (AIR) Following another airborne group. 
+-- The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+-- If another group is on land the unit / group will orbit around. 
 -- @param #GROUP self
--- @param Unit#UNIT The unit.
+-- @param Group#GROUP FollowGroup The group to be followed.
+-- @param DCSTypes#Vec3 PointVec3 Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.
+-- @param #number LastWaypointIndex Detach waypoint of another group. Once reached the unit / group Follow task is finished.
 -- @return DCSTask#Task The DCS task structure.
-function GROUP:TaskAttackUnit( AttackUnit )
-	self:F2( { self.GroupName, AttackUnit } )
+function GROUP:TaskFollow( FollowGroup, PointVec3, LastWaypointIndex )
+  self:F2( { self.GroupName, FollowGroup, PointVec3, LastWaypointIndex } )
 
---  AttackUnit = { 
---    id = 'AttackUnit', 
---    params = { 
---      unitId = Unit.ID, 
---      weaponType = number, 
---      expend = enum AI.Task.WeaponExpend
---      attackQty = number, 
---      direction = Azimuth, 
---      attackQtyLimit = boolean, 
---      groupAttack = boolean, 
---    } 
+--  Follow = {
+--    id = 'Follow',
+--    params = {
+--      groupId = Group.ID,
+--      pos = Vec3,
+--      lastWptIndexFlag = boolean,
+--      lastWptIndex = number
+--    }    
 --  }
+
+  local LastWaypointIndexFlag = nil
+  if LastWaypointIndex then
+    LastWaypointIndexFlag = true
+  end
   
-  local DCSTask    
-  DCSTask = { id = 'AttackUnit', 
-              params = { unitId = AttackUnit:GetID(), 
-                         expend = AI.Task.WeaponExpend.TWO,
-                         groupAttack = true, 
-                       }, 
-            }, 
-  
+  local DCSTask
+  DCSTask = { id = 'Follow',
+    params = {
+      groupId = FollowGroup:GetID(),
+      pos = PointVec3,
+      lastWptIndexFlag = LastWaypointIndexFlag,
+      lastWptIndex = LastWaypointIndex,
+    },
+  },
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
---- Attack a Group.
+
+--- (AIR) Escort another airborne group. 
+-- The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+-- The unit / group will also protect that group from threats of specified types.
 -- @param #GROUP self
--- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param Group#GROUP EscortGroup The group to be escorted.
+-- @param DCSTypes#Vec3 PointVec3 Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.
+-- @param #number LastWaypointIndex Detach waypoint of another group. Once reached the unit / group Follow task is finished.
+-- @param #number EngagementDistanceMax Maximal distance from escorted group to threat. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax. 
+-- @param #list<DCSTypes#AttributeName> TargetTypes Array of AttributeName that is contains threat categories allowed to engage. 
 -- @return DCSTask#Task The DCS task structure.
-function GROUP:TaskAttackGroup( AttackGroup )
-  self:F2( { self.GroupName, AttackGroup } )
+function GROUP:TaskEscort( FollowGroup, PointVec3, LastWaypointIndex, EngagementDistance, TargetTypes )
+  self:F2( { self.GroupName, FollowGroup, PointVec3, LastWaypointIndex, EngagementDistance, TargetTypes } )
 
---  AttackGroup = { 
---   id = 'AttackGroup', 
---   params = { 
---     groupId = Group.ID,
---     weaponType = number,
---     expend = enum AI.Task.WeaponExpend,
---     attackQty = number,
---     directionEnabled = boolean,
---     direction = Azimuth,
---     altitudeEnabled = boolean,
---     altitude = Distance,
---     attackQtyLimit = boolean,
---   } 
--- }  
+--  Escort = {
+--    id = 'Escort',
+--    params = {
+--      groupId = Group.ID,
+--      pos = Vec3,
+--      lastWptIndexFlag = boolean,
+--      lastWptIndex = number,
+--      engagementDistMax = Distance,
+--      targetTypes = array of AttributeName,
+--    }    
+--  }
 
-  local DCSTask    
-  DCSTask = { id = 'AttackGroup', 
-              params = { groupId = AttackGroup:GetID(), 
-                         expend = AI.Task.WeaponExpend.TWO,
-                       }, 
-            }, 
+  local LastWaypointIndexFlag = nil
+  if LastWaypointIndex then
+    LastWaypointIndexFlag = true
+  end
   
+  local DCSTask
+  DCSTask = { id = 'Follow',
+    params = {
+      groupId = FollowGroup:GetID(),
+      pos = PointVec3,
+      lastWptIndexFlag = LastWaypointIndexFlag,
+      lastWptIndex = LastWaypointIndex,
+      engagementDistMax = EngagementDistance,
+      targetTypes = TargetTypes,
+    },
+  },
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
---- Fires at a VEC2 point.
+
+-- GROUND TASKS
+
+--- (GROUND) Fire at a VEC2 point until ammunition is finished.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 The point to fire at.
 -- @param DCSTypes#Distance Radius The radius of the zone to deploy the fire at.
@@ -5131,25 +5445,406 @@ end
 function GROUP:TaskFireAtPoint( PointVec2, Radius )
   self:F2( { self.GroupName, PointVec2, Radius } )
 
--- FireAtPoint = { 
---   id = 'FireAtPoint', 
---   params = { 
---     point = Vec2,
---     radius = Distance, 
---   } 
--- }
-   
-  local DCSTask    
-  DCSTask = { id = 'FireAtPoint', 
-              params = { point = PointVec2, 
-                         radius = Radius, 
-                       } 
-            } 
-  
+  -- FireAtPoint = {
+  --   id = 'FireAtPoint',
+  --   params = {
+  --     point = Vec2,
+  --     radius = Distance,
+  --   }
+  -- }
+
+  local DCSTask
+  DCSTask = { id = 'FireAtPoint',
+    params = {
+      point = PointVec2,
+      radius = Radius,
+    }
+  }
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
+--- (GROUND) Hold ground group from moving.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskHold()
+  self:F2( { self.GroupName } )
+
+--  Hold = { 
+--    id = 'Hold', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Hold',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+-- TASKS FOR AIRBORNE AND GROUND UNITS/GROUPS
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup Target GROUP.
+-- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
+-- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskFAC_AttackGroup( AttackGroup, WeaponType, Designation, Datalink )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, Designation, Datalink } )
+
+--  FAC_AttackGroup = { 
+--    id = 'FAC_AttackGroup', 
+--    params = { 
+--      groupId = Group.ID,
+--      weaponType = number,
+--      designation = enum AI.Task.Designation,
+--      datalink = boolean
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC_AttackGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      designation = Designation,
+      datalink = Datalink,
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+-- EN-ROUTE TASKS FOR AIRBORNE GROUPS
+
+--- (AIR) Engaging targets of defined types.
+-- @param #GROUP self
+-- @param DCSTypes#Distance Distance Maximal distance from the target to a route leg. If the target is on a greater distance it will be ignored. 
+-- @param #list<#DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. 
+-- @param #number Priority All enroute tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageTargets( Distance, TargetTypes, Priority )
+  self:F2( { self.GroupName, Distance, TargetTypes, Priority } )
+
+--  EngageTargets ={ 
+--    id = 'EngageTargets', 
+--    params = { 
+--      maxDist = Distance, 
+--      targetTypes = array of AttributeName, 
+--      priority = number 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageTargets',
+    params = {
+      maxDist = Distance, 
+      targetTypes = TargetTypes, 
+      priority = Priority 
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Engaging a targets of defined types at circle-shaped zone.
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the zone. 
+-- @param DCSTypes#Distance Radius Radius of the zone. 
+-- @param #list<#DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. 
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageTargets( PointVec2, Radius, TargetTypes, Priority )
+  self:F2( { self.GroupName, PointVec2, Radius, TargetTypes, Priority } )
+
+--  EngageTargetsInZone = { 
+--    id = 'EngageTargetsInZone', 
+--    params = { 
+--      point = Vec2, 
+--      zoneRadius = Distance, 
+--      targetTypes = array of AttributeName,  
+--      priority = number 
+--    }
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageTargetsInZone',
+    params = {
+      point = PointVec2, 
+      zoneRadius = Radius, 
+      targetTypes = TargetTypes,  
+      priority = Priority 
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+--- (AIR) Engaging a group. The task does not assign the target group to the unit/group to attack now; it just allows the unit/group to engage the target group as well as other assigned targets.
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
+  self:F2( { self.GroupName, AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
+
+  --  EngageGroup  = {
+  --   id = 'EngageGroup ',
+  --   params = {
+  --     groupId = Group.ID,
+  --     weaponType = number,
+  --     expend = enum AI.Task.WeaponExpend,
+  --     attackQty = number,
+  --     directionEnabled = boolean,
+  --     direction = Azimuth,
+  --     altitudeEnabled = boolean,
+  --     altitude = Distance,
+  --     attackQtyLimit = boolean,
+  --     priority = number,
+  --   }
+  -- }
+
+  local DirectionEnabled = nil
+  if Direction then
+    DirectionEnabled = true
+  end
+
+  local AltitudeEnabled = nil
+  if Altitude then
+    AltitudeEnabled = true
+  end
+
+  local DCSTask
+  DCSTask = { id = 'EngageGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      directionEnabled = DirectionEnabled,
+      direction = Direction,
+      altitudeEnabled = AltitudeEnabled,
+      altitude = Altitude,
+      attackQtyLimit = AttackQtyLimit,
+      priority = Priority,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Attack the Unit.
+-- @param #GROUP self
+-- @param Unit#UNIT AttackUnit The UNIT.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageUnit( AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack )
+  self:F2( { self.GroupName, AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack } )
+
+  --  EngageUnit = {
+  --    id = 'EngageUnit',
+  --    params = {
+  --      unitId = Unit.ID,
+  --      weaponType = number,
+  --      expend = enum AI.Task.WeaponExpend
+  --      attackQty = number,
+  --      direction = Azimuth,
+  --      attackQtyLimit = boolean,
+  --      groupAttack = boolean,
+  --      priority = number,
+  --    }
+  --  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageUnit',
+    params = {
+      unitId = AttackUnit:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      direction = Direction,
+      attackQtyLimit = AttackQtyLimit,
+      groupAttack = GroupAttack,
+      priority = Priority,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskAWACS( )
+  self:F2( { self.GroupName } )
+
+--  AWACS = { 
+--    id = 'AWACS', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'AWACS',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Aircraft will act as a tanker for friendly units. No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskTanker( )
+  self:F2( { self.GroupName } )
+
+--  Tanker = { 
+--    id = 'Tanker', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Tanker',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+-- En-route tasks for ground units/groups
+
+--- (GROUND) Ground unit (EW-radar) will act as an EWR for friendly units (will provide them with information about contacts). No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEWR( )
+  self:F2( { self.GroupName } )
+
+--  EWR = { 
+--    id = 'EWR', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EWR',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+-- En-route tasks for airborne and ground units/groups 
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup Target GROUP.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
+-- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponType, Designation, Datalink )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, Priority, Designation, Datalink } )
+
+--  FAC_EngageGroup  = { 
+--    id = 'FAC_EngageGroup', 
+--    params = { 
+--      groupId = Group.ID,
+--      weaponType = number,
+--      designation = enum AI.Task.Designation,
+--      datalink = boolean,
+--      priority = number,
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC_EngageGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      designation = Designation,
+      datalink = Datalink,
+      priority = Priority,
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param DCSTypes#Distance Radius  The maximal distance from the FAC to a target.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskFAC( Radius, Priority )
+  self:F2( { self.GroupName, Radius, Priority } )
+
+--  FAC = { 
+--    id = 'FAC', 
+--    params = { 
+--      radius = Distance,
+--      priority = number
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC',
+    params = {
+      radius = Radius,
+      priority = Priority
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
 
 
 --- Move the group to a Vec2 Point, wait for a defined duration and embark a group.
@@ -5159,22 +5854,22 @@ end
 -- @param #GROUP EmbarkingGroup The group to be embarked.
 -- @return DCSTask#Task The DCS task structure
 function GROUP:TaskEmbarkingAtVec2( Point, Duration, EmbarkingGroup )
-	self:F2( { self.GroupName, Point, Duration, EmbarkingGroup.DCSGroup } )
+  self:F2( { self.GroupName, Point, Duration, EmbarkingGroup.DCSGroup } )
 
-	local DCSTask 
-	DCSTask =  { id = 'Embarking', 
-	             params = { x = Point.x, 
-    	                    y = Point.y, 
-    		  							  duration = Duration, 
-    			  						  groupsForEmbarking = { EmbarkingGroup.GroupID },
-    				  					  durationFlag = true,
-    					  				  distributionFlag = false,
-    						  			  distribution = {},
-    						  			} 
-    				 }
-	
-	self:T3( { DCSTask } )
-	return DCSTask
+  local DCSTask
+  DCSTask =  { id = 'Embarking',
+    params = { x = Point.x,
+      y = Point.y,
+      duration = Duration,
+      groupsForEmbarking = { EmbarkingGroup.GroupID },
+      durationFlag = true,
+      distributionFlag = false,
+      distribution = {},
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
 end
 
 --- Move to a defined Vec2 Point, and embark to a group when arrived within a defined Radius.
@@ -5183,30 +5878,30 @@ end
 -- @param #number Radius The radius of the embarking zone around the Point.
 -- @return DCSTask#Task The DCS task structure.
 function GROUP:TaskEmbarkToTransportAtVec2( Point, Radius )
-	self:F2( { self.GroupName, Point, Radius } )
+  self:F2( { self.GroupName, Point, Radius } )
 
   local DCSTask --DCSTask#Task
-	DCSTask = { id = 'EmbarkToTransport', 
-	            params = { x = Point.x, 
-				  	             y = Point.y, 
-		    							   zoneRadius = Radius,
-						           } 
-						} 
+  DCSTask = { id = 'EmbarkToTransport',
+    params = { x = Point.x,
+      y = Point.y,
+      zoneRadius = Radius,
+    }
+  }
 
   self:T3( { DCSTask } )
-	return DCSTask
+  return DCSTask
 end
 
 --- Return a Misson task from a mission template.
 -- @param #GROUP self
 -- @param #table TaskMission A table containing the mission task.
--- @return DCSTask#Task 
+-- @return DCSTask#Task
 function GROUP:TaskMission( TaskMission )
-	self:F2( Points )
-  
+  self:F2( Points )
+
   local DCSTask
   DCSTask = { id = 'Mission', params = { TaskMission, }, }
-  
+
   self:T3( { DCSTask } )
   return DCSTask
 end
@@ -5214,13 +5909,13 @@ end
 --- Return a Misson task to follow a given route defined by Points.
 -- @param #GROUP self
 -- @param #table Points A table of route points.
--- @return DCSTask#Task 
+-- @return DCSTask#Task
 function GROUP:TaskRoute( Points )
   self:F2( Points )
-  
+
   local DCSTask
   DCSTask = { id = 'Mission', params = { route = { points = Points, }, }, }
-  
+
   self:T3( { DCSTask } )
   return DCSTask
 end
@@ -5234,22 +5929,22 @@ function GROUP:TaskRouteToVec2( Point, Speed )
   self:F2( { Point, Speed } )
 
   local GroupPoint = self:GetUnit( 1 ):GetPointVec2()
-  
+
   local PointFrom = {}
   PointFrom.x = GroupPoint.x
   PointFrom.y = GroupPoint.y
   PointFrom.type = "Turning Point"
   PointFrom.action = "Turning Point"
-  PointFrom.speed = Speed  
+  PointFrom.speed = Speed
   PointFrom.speed_locked = true
   PointFrom.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
-  
+
 
   local PointTo = {}
   PointTo.x = Point.x
@@ -5259,18 +5954,18 @@ function GROUP:TaskRouteToVec2( Point, Speed )
   PointTo.speed = Speed
   PointTo.speed_locked = true
   PointTo.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
 
-  
+
   local Points = { PointFrom, PointTo }
-  
+
   self:T3( Points )
-  
+
   self:Route( Points )
 
   return self
@@ -5285,7 +5980,7 @@ function GROUP:TaskRouteToVec3( Point, Speed )
   self:F2( { Point, Speed } )
 
   local GroupPoint = self:GetUnit( 1 ):GetPointVec3()
-  
+
   local PointFrom = {}
   PointFrom.x = GroupPoint.x
   PointFrom.y = GroupPoint.z
@@ -5293,39 +5988,39 @@ function GROUP:TaskRouteToVec3( Point, Speed )
   PointFrom.alt_type = "BARO"
   PointFrom.type = "Turning Point"
   PointFrom.action = "Turning Point"
-  PointFrom.speed = Speed  
+  PointFrom.speed = Speed
   PointFrom.speed_locked = true
   PointFrom.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
-  
+
 
   local PointTo = {}
   PointTo.x = Point.x
   PointTo.y = Point.z
-  PointTo.alt = Point.y  
+  PointTo.alt = Point.y
   PointTo.alt_type = "BARO"
   PointTo.type = "Turning Point"
   PointTo.action = "Fly Over Point"
   PointTo.speed = Speed
   PointTo.speed_locked = true
   PointTo.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
 
-  
+
   local Points = { PointFrom, PointTo }
-  
+
   self:T3( Points )
-  
+
   self:Route( Points )
 
   return self
@@ -5336,22 +6031,22 @@ end
 --- Make the group to follow a given route.
 -- @param #GROUP self
 -- @param #table GoPoints A table of Route Points.
--- @return #GROUP self 
+-- @return #GROUP self
 function GROUP:Route( GoPoints )
-	self:F2( GoPoints )
+  self:F2( GoPoints )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local Points = routines.utils.deepCopy( GoPoints )
-  	local MissionTask = { id = 'Mission', params = { route = { points = Points, }, }, }
-  	local Controller = self:_GetController()
+    local Points = routines.utils.deepCopy( GoPoints )
+    local MissionTask = { id = 'Mission', params = { route = { points = Points, }, }, }
+    local Controller = self:_GetController()
     --Controller.setTask( Controller, MissionTask )
-  	--routines.scheduleFunction( Controller.setTask, { Controller, MissionTask}, timer.getTime() + 1 )
+    --routines.scheduleFunction( Controller.setTask, { Controller, MissionTask}, timer.getTime() + 1 )
     SCHEDULER:New( Controller, Controller.setTask, { MissionTask }, 1 )
-  	return self
+    return self
   end
-  
+
   return nil
 end
 
@@ -5367,56 +6062,56 @@ end
 -- @param #number Speed The speed.
 -- @param Base#FORMATION Formation The formation string.
 function GROUP:TaskRouteToZone( Zone, Randomize, Speed, Formation )
-	self:F2( Zone )
+  self:F2( Zone )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	
-  	local GroupPoint = self:GetPointVec2()
-  	
-  	local PointFrom = {}
-  	PointFrom.x = GroupPoint.x
-  	PointFrom.y = GroupPoint.y
-  	PointFrom.type = "Turning Point"
-  	PointFrom.action = "Cone"
-  	PointFrom.speed = 20 / 1.6
-  	
-  
-  	local PointTo = {}
-  	local ZonePoint 
-  	
-  	if Randomize then
-  		ZonePoint = Zone:GetRandomPointVec2()
-  	else
-  		ZonePoint = Zone:GetPointVec2()
-  	end
-  
-  	PointTo.x = ZonePoint.x
-  	PointTo.y = ZonePoint.y
-  	PointTo.type = "Turning Point"
-  	
-  	if Formation then
-  		PointTo.action = Formation
-  	else
-  		PointTo.action = "Cone"
-  	end
-  	
-  	if Speed then
-  		PointTo.speed = Speed
-  	else
-  		PointTo.speed = 20 / 1.6
-  	end
-  	
-  	local Points = { PointFrom, PointTo }
-  	
-  	self:T3( Points )
-  	
-  	self:Route( Points )
-  	
-  	return self
+
+    local GroupPoint = self:GetPointVec2()
+
+    local PointFrom = {}
+    PointFrom.x = GroupPoint.x
+    PointFrom.y = GroupPoint.y
+    PointFrom.type = "Turning Point"
+    PointFrom.action = "Cone"
+    PointFrom.speed = 20 / 1.6
+
+
+    local PointTo = {}
+    local ZonePoint
+
+    if Randomize then
+      ZonePoint = Zone:GetRandomPointVec2()
+    else
+      ZonePoint = Zone:GetPointVec2()
+    end
+
+    PointTo.x = ZonePoint.x
+    PointTo.y = ZonePoint.y
+    PointTo.type = "Turning Point"
+
+    if Formation then
+      PointTo.action = Formation
+    else
+      PointTo.action = "Cone"
+    end
+
+    if Speed then
+      PointTo.speed = Speed
+    else
+      PointTo.speed = 20 / 1.6
+    end
+
+    local Points = { PointFrom, PointTo }
+
+    self:T3( Points )
+
+    self:Route( Points )
+
+    return self
   end
-  
+
   return nil
 end
 
@@ -5463,48 +6158,48 @@ end
 -- @param #number Begin The route point from where the copy will start. The base route point is 0.
 -- @param #number End The route point where the copy will end. The End point is the last point - the End point. The last point has base 0.
 -- @param #boolean Randomize Randomization of the route, when true.
--- @param #number Radius When randomization is on, the randomization is within the radius. 
+-- @param #number Radius When randomization is on, the randomization is within the radius.
 function GROUP:CopyRoute( Begin, End, Randomize, Radius )
-	self:F2( { Begin, End } )
+  self:F2( { Begin, End } )
 
-	local Points = {}
-	
-	-- Could be a Spawned Group
-	local GroupName = string.match( self:GetName(), ".*#" )
-	if GroupName then
-		GroupName = GroupName:sub( 1, -2 )
-	else
-		GroupName = self:GetName()
-	end
-	
-	self:T3( { GroupName } )
-	
-	local Template = _DATABASE.Templates.Groups[GroupName].Template
-	
-	if Template then
-		if not Begin then
-			Begin = 0
-		end
-		if not End then
-			End = 0
-		end
-	
-		for TPointID = Begin + 1, #Template.route.points - End do
-			if Template.route.points[TPointID] then
-				Points[#Points+1] = routines.utils.deepCopy( Template.route.points[TPointID] )
-				if Randomize then
-					if not Radius then
-						Radius = 500
-					end
-					Points[#Points].x = Points[#Points].x + math.random( Radius * -1, Radius )
-					Points[#Points].y = Points[#Points].y + math.random( Radius * -1, Radius )
-				end	
-			end
-		end
-		return Points
-	end
-	
-	return nil
+  local Points = {}
+
+  -- Could be a Spawned Group
+  local GroupName = string.match( self:GetName(), ".*#" )
+  if GroupName then
+    GroupName = GroupName:sub( 1, -2 )
+  else
+    GroupName = self:GetName()
+  end
+
+  self:T3( { GroupName } )
+
+  local Template = _DATABASE.Templates.Groups[GroupName].Template
+
+  if Template then
+    if not Begin then
+      Begin = 0
+    end
+    if not End then
+      End = 0
+    end
+
+    for TPointID = Begin + 1, #Template.route.points - End do
+      if Template.route.points[TPointID] then
+        Points[#Points+1] = routines.utils.deepCopy( Template.route.points[TPointID] )
+        if Randomize then
+          if not Radius then
+            Radius = 500
+          end
+          Points[#Points].x = Points[#Points].x + math.random( Radius * -1, Radius )
+          Points[#Points].y = Points[#Points].y + math.random( Radius * -1, Radius )
+        end
+      end
+    end
+    return Points
+  end
+
+  return nil
 end
 
 
@@ -5515,28 +6210,28 @@ function GROUP:GetDetectedTargets()
   if DCSGroup then
     return self:_GetController():getDetectedTargets()
   end
-  
+
   return nil
 end
 
 function GROUP:IsTargetDetected( DCSObject )
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
-  
+
     local TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity
-          = self:_GetController().isTargetDetected( self:_GetController(), DCSObject, 
-                                                    Controller.Detection.VISUAL,
-                                                    Controller.Detection.OPTIC,
-                                                    Controller.Detection.RADAR,
-                                                    Controller.Detection.IRST,
-                                                    Controller.Detection.RWR,
-                                                    Controller.Detection.DLINK
-                                                  )
+      = self:_GetController().isTargetDetected( self:_GetController(), DCSObject,
+        Controller.Detection.VISUAL,
+        Controller.Detection.OPTIC,
+        Controller.Detection.RADAR,
+        Controller.Detection.IRST,
+        Controller.Detection.RWR,
+        Controller.Detection.DLINK
+      )
     return TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity
   end
-   
+
   return nil
 end
 
@@ -5547,16 +6242,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEHoldFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5564,12 +6259,12 @@ end
 -- @param Group#GROUP self
 -- @return Group#GROUP self
 function GROUP:OptionROEHoldFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_HOLD )
     elseif self:IsGround() then
@@ -5577,10 +6272,10 @@ function GROUP:OptionROEHoldFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.WEAPON_HOLD )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5589,16 +6284,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEReturnFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5606,12 +6301,12 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEReturnFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.RETURN_FIRE )
     elseif self:IsGround() then
@@ -5619,10 +6314,10 @@ function GROUP:OptionROEReturnFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.RETURN_FIRE )
     end
-     
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5637,10 +6332,10 @@ function GROUP:OptionROEOpenFirePossible()
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5648,12 +6343,12 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEOpenFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.OPEN_FIRE )
     elseif self:IsGround() then
@@ -5661,10 +6356,10 @@ function GROUP:OptionROEOpenFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.OPEN_FIRE )
     end
-  
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5673,16 +6368,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEWeaponFreePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5690,19 +6385,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEWeaponFree()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_FREE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5711,16 +6406,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTNoReactionPossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5729,19 +6424,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTNoReaction()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.NO_REACTION )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5756,10 +6451,10 @@ function GROUP:OptionROTPassiveDefensePossible()
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5767,19 +6462,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTPassiveDefense()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENCE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5788,16 +6483,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTEvadeFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5806,19 +6501,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTEvadeFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.EVADE_FIRE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5827,16 +6522,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTVerticalPossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5845,19 +6540,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTVertical()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.BYPASS_AND_ESCAPE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5870,12 +6565,12 @@ end
 -- @return Message#MESSAGE
 function GROUP:Message( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     return MESSAGE:New( Message, self:GetCallsign() .. " (" .. self:GetTypeName() .. ")", Duration, self:GetClassNameAndID() )
   end
-  
+
   return nil
 end
 
@@ -5886,12 +6581,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToAll( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToAll()
   end
-  
+
   return nil
 end
 
@@ -5902,12 +6597,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToRed( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToRed()
   end
-  
+
   return nil
 end
 
@@ -5918,12 +6613,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToBlue( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToBlue()
   end
-  
+
   return nil
 end
 
@@ -5935,12 +6630,12 @@ end
 -- @param Client#CLIENT Client The client object receiving the message.
 function GROUP:MessageToClient( Message, Duration, Client )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToClient( Client )
   end
-  
+
   return nil
 end
 --- UNIT Class
@@ -7277,67 +7972,37 @@ function CLIENT:Message( Message, MessageDuration, MessageId, MessageCategory, M
 		end
 	end
 end
---- Manage sets of units and groups. 
+--- Manage the mission database. 
 -- 
--- @{#Database} class
+-- @{#DATABASE} class
 -- ==================
--- Mission designers can use the DATABASE class to build sets of units belonging to certain:
+-- Mission designers can use the DATABASE class to refer to:
 -- 
---  * Coalitions
---  * Categories
---  * Countries
---  * Unit types
---  * Starting with certain prefix strings.
+--  * UNITS
+--  * GROUPS
+--  * players
+--  * alive players
+--  * CLIENTS
+--  * alive CLIENTS
 --  
--- This list will grow over time. Planned developments are to include filters and iterators.
--- Additional filters will be added around @{Zone#ZONEs}, Radiuses, Active players, ...
--- More iterators will be implemented in the near future ...
---
--- Administers the Initial Sets of the Mission Templates as defined within the Mission Editor.
--- 
--- DATABASE construction methods:
--- =================================
--- Create a new DATABASE object with the @{#DATABASE.New} method:
--- 
---    * @{#DATABASE.New}: Creates a new DATABASE object.
---   
--- 
--- DATABASE filter criteria: 
--- =========================
--- You can set filter criteria to define the set of units within the database.
--- Filter criteria are defined by:
--- 
---    * @{#DATABASE.FilterCoalitions}: Builds the DATABASE with the units belonging to the coalition(s).
---    * @{#DATABASE.FilterCategories}: Builds the DATABASE with the units belonging to the category(ies).
---    * @{#DATABASE.FilterTypes}: Builds the DATABASE with the units belonging to the unit type(s).
---    * @{#DATABASE.FilterCountries}: Builds the DATABASE with the units belonging to the country(ies).
---    * @{#DATABASE.FilterUnitPrefixes}: Builds the DATABASE with the units starting with the same prefix string(s).
---   
--- Once the filter criteria have been set for the DATABASE, you can start filtering using:
--- 
---   * @{#DATABASE.FilterStart}: Starts the filtering of the units within the database.
--- 
--- Planned filter criteria within development are (so these are not yet available):
--- 
---    * @{#DATABASE.FilterGroupPrefixes}: Builds the DATABASE with the groups of the units starting with the same prefix string(s).
---    * @{#DATABASE.FilterZones}: Builds the DATABASE with the units within a @{Zone#ZONE}.
+-- On top, for internal MOOSE administration purposes, the DATBASE administers the Unit and Gruop templates as defined within the Mission Editor.
 -- 
+-- Moose will automatically create one instance of the DATABASE class into the **global** object _DATABASE.
+-- Moose refers to _DATABASE within the framework extensively, but you can also refer to the _DATABASE object within your missions if required.
 -- 
 -- DATABASE iterators:
 -- ===================
--- Once the filters have been defined and the DATABASE has been built, you can iterate the database with the available iterator methods.
+-- You can iterate the database with the available iterator methods.
 -- The iterator methods will walk the DATABASE set, and call for each element within the set a function that you provide.
 -- The following iterator methods are currently available within the DATABASE:
 -- 
---   * @{#DATABASE.ForEachAliveUnit}: Calls a function for each alive unit it finds within the DATABASE.
+--   * @{#DATABASE.ForEachUnit}: Calls a function for each @{UNIT} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachGroup}: Calls a function for each @{GROUP} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachPlayer}: Calls a function for each player it finds within the DATABASE.
+--   * @{#DATABASE.ForEachPlayerAlive}: Calls a function for each alive player it finds within the DATABASE.
+--   * @{#DATABASE.ForEachClient}: Calls a function for each @{CLIENT} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachClientAlive}: Calls a function for each alive @{CLIENT} it finds within the DATABASE.
 --   
--- Planned iterators methods in development are (so these are not yet available):
--- 
---   * @{#DATABASE.ForEachUnit}: Calls a function for each unit contained within the DATABASE.
---   * @{#DATABASE.ForEachGroup}: Calls a function for each group contained within the DATABASE.
---   * @{#DATABASE.ForEachUnitInZone}: Calls a function for each unit within a certain zone contained within the DATABASE.
--- 
--- ====
 -- @module Database
 -- @author FlightControl
 
@@ -7349,6 +8014,7 @@ Include.File( "Unit" )
 Include.File( "Event" )
 Include.File( "Client" )
 
+
 --- DATABASE class
 -- @type DATABASE
 -- @extends Base#BASE
@@ -7364,34 +8030,11 @@ DATABASE = {
   DCSGroups = {},
   UNITS = {},
   GROUPS = {},
-  NavPoints = {},
-  Statics = {},
-  Players = {},
-  PlayersAlive = {},
+  PLAYERS = {},
+  PLAYERSALIVE = {},
   CLIENTS = {},
-  ClientsAlive = {},
-  Filter = {
-    Coalitions = nil,
-    Categories = nil,
-    Types = nil,
-    Countries = nil,
-    UnitPrefixes = nil,
-    GroupPrefixes = nil,
-  },
-  FilterMeta = {
-    Coalitions = {
-      red = coalition.side.RED,
-      blue = coalition.side.BLUE,
-      neutral = coalition.side.NEUTRAL,
-    },
-    Categories = {
-      plane = Unit.Category.AIRPLANE,
-      helicopter = Unit.Category.HELICOPTER,
-      ground = Unit.Category.GROUND_UNIT,
-      ship = Unit.Category.SHIP,
-      structure = Unit.Category.STRUCTURE,
-    },
-  },
+  CLIENTSALIVE = {},
+  NavPoints = {},
 }
 
 local _DATABASECoalition =
@@ -7426,12 +8069,13 @@ function DATABASE:New()
   _EVENTDISPATCHER:OnCrash( self._EventOnDeadOrCrash, self )
   
   
-  -- Add database with registered clients and already alive players
-  
   -- Follow alive players and clients
   _EVENTDISPATCHER:OnPlayerEnterUnit( self._EventOnPlayerEnterUnit, self )
   _EVENTDISPATCHER:OnPlayerLeaveUnit( self._EventOnPlayerLeaveUnit, self )
   
+  self:_RegisterTemplates()
+  self:_RegisterDatabase()
+  self:_RegisterPlayers()
   
   return self
 end
@@ -7446,6 +8090,7 @@ function DATABASE:FindUnit( UnitName )
   return UnitFound
 end
 
+
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddUnit( DCSUnit, DCSUnitName )
@@ -7454,6 +8099,7 @@ function DATABASE:AddUnit( DCSUnit, DCSUnitName )
   self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
 end
 
+
 --- Deletes a Unit from the DATABASE based on the Unit Name.
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
@@ -7461,6 +8107,7 @@ function DATABASE:DeleteUnit( DCSUnitName )
   self.DCSUnits[DCSUnitName] = nil 
 end
 
+
 --- Finds a CLIENT based on the ClientName.
 -- @param #DATABASE self
 -- @param #string ClientName
@@ -7471,6 +8118,7 @@ function DATABASE:FindClient( ClientName )
   return ClientFound
 end
 
+
 --- Adds a CLIENT based on the ClientName in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddClient( ClientName )
@@ -7479,6 +8127,7 @@ function DATABASE:AddClient( ClientName )
   self:E( self.CLIENTS[ClientName]:GetClassNameAndID() )
 end
 
+
 --- Finds a GROUP based on the GroupName.
 -- @param #DATABASE self
 -- @param #string GroupName
@@ -7489,6 +8138,7 @@ function DATABASE:FindGroup( GroupName )
   return GroupFound
 end
 
+
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddGroup( DCSGroup, GroupName )
@@ -7497,6 +8147,30 @@ function DATABASE:AddGroup( DCSGroup, GroupName )
   self.GROUPS[GroupName] = GROUP:Register( GroupName )
 end
 
+--- Adds a player based on the Player Name in the DATABASE.
+-- @param #DATABASE self
+function DATABASE:AddPlayer( UnitName, PlayerName )
+
+  if PlayerName then
+    self:E( { "Add player for unit:", UnitName, PlayerName } )
+    self.PLAYERS[PlayerName] = PlayerName
+    self.PLAYERSALIVE[PlayerName] = PlayerName
+    self.CLIENTSALIVE[PlayerName] = self:FindClient( UnitName )
+  end
+end
+
+--- Deletes a player from the DATABASE based on the Player Name.
+-- @param #DATABASE self
+function DATABASE:DeletePlayer( PlayerName )
+
+  if PlayerName then
+    self:E( { "Clean player:", PlayerName } )
+    self.PLAYERSALIVE[PlayerName] = nil
+    self.CLIENTSALIVE[PlayerName] = nil
+  end
+end
+
+
 --- Instantiate new Groups within the DCSRTE.
 -- This method expects EXACTLY the same structure as a structure within the ME, and needs 2 additional fields defined:
 -- SpawnCountryID, SpawnCategoryID
@@ -7505,9 +8179,9 @@ end
 -- @param #table SpawnTemplate
 -- @return #DATABASE self
 function DATABASE:Spawn( SpawnTemplate )
-  self:F( SpawnTemplate.name )
+  self:F2( SpawnTemplate.name )
 
-  self:T( { SpawnTemplate.SpawnCountryID, SpawnTemplate.SpawnCategoryID } )
+  self:T2( { SpawnTemplate.SpawnCountryID, SpawnTemplate.SpawnCategoryID } )
 
   -- Copy the spawn variables of the template in temporary storage, nullify, and restore the spawn variables.
   local SpawnCoalitionID = SpawnTemplate.SpawnCoalitionID
@@ -7519,7 +8193,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.SpawnCountryID = nil
   SpawnTemplate.SpawnCategoryID = nil
 
-  self:_RegisterGroup( SpawnTemplate )
+  self:_RegisterTemplate( SpawnTemplate )
   coalition.addGroup( SpawnCountryID, SpawnCategoryID, SpawnTemplate )
 
   -- Restore
@@ -7532,18 +8206,16 @@ function DATABASE:Spawn( SpawnTemplate )
   return SpawnGroup
 end
 
-
 --- Set a status to a Group within the Database, this to check crossing events for example.
 function DATABASE:SetStatusGroup( GroupName, Status )
-  self:F( Status )
+  self:F2( Status )
 
   self.Templates.Groups[GroupName].Status = Status
 end
 
-
 --- Get a status to a Group within the Database, this to check crossing events for example.
 function DATABASE:GetStatusGroup( GroupName )
-  self:F( Status )
+  self:F2( Status )
 
   if self.Templates.Groups[GroupName] then
     return self.Templates.Groups[GroupName].Status
@@ -7552,11 +8224,12 @@ function DATABASE:GetStatusGroup( GroupName )
   end
 end
 
+
 --- Private method that registers new Group Templates within the DATABASE Object.
 -- @param #DATABASE self
 -- @param #table GroupTemplate
 -- @return #DATABASE self
-function DATABASE:_RegisterGroup( GroupTemplate )
+function DATABASE:_RegisterTemplate( GroupTemplate )
 
   local GroupTemplateName = env.getValueDictByKey(GroupTemplate.name)
 
@@ -7576,7 +8249,7 @@ function DATABASE:_RegisterGroup( GroupTemplate )
   self.Templates.Groups[GroupTemplateName].UnitCount = #GroupTemplate.units
   self.Templates.Groups[GroupTemplateName].Units = GroupTemplate.units
 
-  self:T( { "Group", self.Templates.Groups[GroupTemplateName].GroupName, self.Templates.Groups[GroupTemplateName].UnitCount } )
+  self:T2( { "Group", self.Templates.Groups[GroupTemplateName].GroupName, self.Templates.Groups[GroupTemplateName].UnitCount } )
 
   for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do
 
@@ -7596,6 +8269,7 @@ function DATABASE:_RegisterGroup( GroupTemplate )
   end
 end
 
+
 --- Private method that registers all alive players in the mission.
 -- @param #DATABASE self
 -- @return #DATABASE self
@@ -7607,9 +8281,10 @@ function DATABASE:_RegisterPlayers()
       self:T3( { "UnitData:", UnitData } )
       if UnitData and UnitData:isExist() then
         local UnitName = UnitData:getName()
-        if not self.PlayersAlive[UnitName] then
-          self:E( { "Add player for unit:", UnitName, UnitData:getPlayerName() } )
-          self.PlayersAlive[UnitName] = UnitData:getPlayerName()
+        local PlayerName = UnitData:getPlayerName()
+        if not self.PLAYERS[PlayerName] then
+          self:E( { "Add player for unit:", UnitName, PlayerName } )
+          self:AddPlayer( UnitName, PlayerName )
         end
       end
     end
@@ -7618,6 +8293,7 @@ function DATABASE:_RegisterPlayers()
   return self
 end
 
+
 --- Private method that registers all datapoints within in the mission.
 -- @param #DATABASE self
 -- @return #DATABASE self
@@ -7660,22 +8336,21 @@ end
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnBirth( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
-      self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
-      self:_EventOnPlayerEnterUnit( Event )
-    end
+    self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
+    self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
+    self:_EventOnPlayerEnterUnit( Event )
   end
 end
 
+
 --- Handles the OnDead or OnCrash event for alive units set.
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnDeadOrCrash( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
     if self.DCSUnits[Event.IniDCSUnitName] then
@@ -7685,48 +8360,44 @@ function DATABASE:_EventOnDeadOrCrash( Event )
   end
 end
 
+
 --- Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnPlayerEnterUnit( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if not self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Add player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = Event.IniDCSUnit:getPlayerName()
-        self.ClientsAlive[Event.IniDCSUnitName] = self.CLIENTS[ Event.IniDCSUnitName ]
-      end
+    local PlayerName = Event.IniDCSUnit:getPlayerName()
+    if not self.PLAYERSALIVE[PlayerName] then
+      self:AddPlayer( Event.IniDCSUnitName, PlayerName )
     end
   end
 end
 
+
 --- Handles the OnPlayerLeaveUnit event to clean the active players table.
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnPlayerLeaveUnit( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Cleaning player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = nil
-        self.ClientsAlive[Event.IniDCSUnitName] = nil
-      end
+    local PlayerName = Event.IniDCSUnit:getPlayerName()
+    if self.PLAYERSALIVE[PlayerName] then
+      self:DeletePlayer( PlayerName )
     end
   end
 end
 
 --- Iterators
 
---- Interate the DATABASE and call an interator function for the given set, providing the Object for each element within the set and optional parameters.
+--- Iterate the DATABASE and call an iterator function for the given set, providing the Object for each element within the set and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the database.
 -- @return #DATABASE self
 function DATABASE:ForEach( IteratorFunction, arg, Set )
-  self:F( arg )
+  self:F2( arg )
   
   local function CoRoutine()
     local Count = 0
@@ -7746,7 +8417,7 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
   local function Schedule()
   
     local status, res = coroutine.resume( co )
-    self:T( { status, res } )
+    self:T2( { status, res } )
     
     if status == false then
       error( res )
@@ -7764,46 +8435,96 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Interate the DATABASE and call an interator function for each **alive** unit, providing the Unit and optional parameters.
+--- 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 UNIT parameter.
+-- @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:F( arg )
+  self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.DCSUnits )
 
   return self
 end
 
---- Interate the DATABASE and call an interator function for each **alive** player, providing the Unit of the player and optional parameters.
+
+--- 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 player in the database. The function needs to accept a UNIT parameter.
+-- @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.
+-- @return #DATABASE self
+function DATABASE:ForEachUnit( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.UNITS )
+
+  return self
+end
+
+--- Iterate the DATABASE and call an iterator function for each **alive** GROUP, providing the GROUP and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive GROUP in the database. The function needs to accept a GROUP parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachGroup( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.GROUPS )
+
+  return self
+end
+
+
+--- Iterate the DATABASE and call an iterator function for each player, providing the player name and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an player in the database. The function needs to accept the player name.
 -- @return #DATABASE self
 function DATABASE:ForEachPlayer( IteratorFunction, ... )
-  self:F( arg )
+  self:F2( arg )
   
-  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
+  self:ForEach( IteratorFunction, arg, self.PLAYERS )
   
   return self
 end
 
 
---- Interate the DATABASE and call an interator function for each client, providing the Client to the function and optional parameters.
+--- Iterate the DATABASE and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive player in the database. The function needs to accept a UNIT parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachPlayerAlive( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.PLAYERSALIVE )
+  
+  return self
+end
+
+--- Iterate the DATABASE and call an iterator function for each CLIENT, providing the CLIENT to the function and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the database. The function needs to accept a CLIENT parameter.
 -- @return #DATABASE self
 function DATABASE:ForEachClient( IteratorFunction, ... )
-  self:F( arg )
+  self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.CLIENTS )
 
   return self
 end
 
+--- Iterate the DATABASE and call an iterator function for each **ALIVE** CLIENT, providing the CLIENT to the function and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive CLIENT in the database. The function needs to accept a CLIENT parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachClientAlive( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.CLIENTSALIVE )
 
-function DATABASE:ScanEnvironment()
-  self:F()
+  return self
+end
+
+
+function DATABASE:_RegisterTemplates()
+  self:F2()
 
   self.Navpoints = {}
   self.UNITS = {}
@@ -7853,7 +8574,7 @@ function DATABASE:ScanEnvironment()
                   for group_num, GroupTemplate in pairs(obj_type_data.group) do
 
                     if GroupTemplate and GroupTemplate.units and type(GroupTemplate.units) == 'table' then  --making sure again- this is a valid group
-                      self:_RegisterGroup( GroupTemplate )
+                      self:_RegisterTemplate( GroupTemplate )
                     end --if GroupTemplate and GroupTemplate.units then
                   end --for group_num, GroupTemplate in pairs(obj_type_data.group) do
                 end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
@@ -7865,121 +8586,10 @@ function DATABASE:ScanEnvironment()
     end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
   end --for coa_name, coa_data in pairs(mission.coalition) do
 
-  self:_RegisterDatabase()
-  self:_RegisterPlayers()
-
   return self
 end
 
 
----
--- @param #DATABASE self
--- @param DCSUnit#Unit DCSUnit
--- @return #DATABASE self
-function DATABASE:_IsIncludeDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitInclude = true
-
-  if self.Filter.Coalitions then
-    local DCSUnitCoalition = false
-    for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
-      self:T( { "Coalition:", DCSUnit:getCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
-      if self.FilterMeta.Coalitions[CoalitionName] and self.FilterMeta.Coalitions[CoalitionName] == DCSUnit:getCoalition() then
-        DCSUnitCoalition = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCoalition
-  end
-  
-  if self.Filter.Categories then
-    local DCSUnitCategory = false
-    for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
-      self:T( { "Category:", DCSUnit:getDesc().category, self.FilterMeta.Categories[CategoryName], CategoryName } )
-      if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == DCSUnit:getDesc().category then
-        DCSUnitCategory = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCategory
-  end
-  
-  if self.Filter.Types then
-    local DCSUnitType = false
-    for TypeID, TypeName in pairs( self.Filter.Types ) do
-      self:T( { "Type:", DCSUnit:getTypeName(), TypeName } )
-      if TypeName == DCSUnit:getTypeName() then
-        DCSUnitType = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitType
-  end
-  
-  if self.Filter.Countries then
-    local DCSUnitCountry = false
-    for CountryID, CountryName in pairs( self.Filter.Countries ) do
-      self:T( { "Country:", DCSUnit:getCountry(), CountryName } )
-      if country.id[CountryName] == DCSUnit:getCountry() then
-        DCSUnitCountry = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCountry
-  end
-
-  if self.Filter.UnitPrefixes then
-    local DCSUnitPrefix = false
-    for UnitPrefixId, UnitPrefix in pairs( self.Filter.UnitPrefixes ) do
-      self:T( { "Unit Prefix:", string.find( DCSUnit:getName(), UnitPrefix, 1 ), UnitPrefix } )
-      if string.find( DCSUnit:getName(), UnitPrefix, 1 ) then
-        DCSUnitPrefix = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitPrefix
-  end
-
-  self:T( DCSUnitInclude )
-  return DCSUnitInclude
-end
-
----
--- @param #DATABASE self
--- @param DCSUnit#Unit DCSUnit
--- @return #DATABASE self
-function DATABASE:_IsAliveDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitAlive = false
-  if DCSUnit and DCSUnit:isExist() and DCSUnit:isActive() then
-    if self.DCSUnits[DCSUnit:getName()] then
-      DCSUnitAlive = true
-    end
-  end
-  self:T( DCSUnitAlive )
-  return DCSUnitAlive
-end
-
----
--- @param #DATABASE self
--- @param DCSGroup#Group DCSGroup
--- @return #DATABASE self
-function DATABASE:_IsAliveDCSGroup( DCSGroup )
-  self:F( DCSGroup )
-  local DCSGroupAlive = false
-  if DCSGroup and DCSGroup:isExist() then
-    if self.DCSGroups[DCSGroup:getName()] then
-      DCSGroupAlive = true
-    end
-  end
-  self:T( DCSGroupAlive )
-  return DCSGroupAlive
-end
-
-
---- Traces the current database contents in the log ... (for debug reasons).
--- @param #DATABASE self
--- @return #DATABASE self
-function DATABASE:TraceDatabase()
-  self:F()
-  
-  self:T( { "DCSUnits:", self.DCSUnits } )
-end
 
 
 --- The main include file for the MOOSE system.
@@ -7995,7 +8605,7 @@ Include.File( "Event" )
 _EVENTDISPATCHER = EVENT:New() -- #EVENT
 
 --- Declare the main database object, which is used internally by the MOOSE classes.
-_DATABASE = DATABASE:New():ScanEnvironment() -- Database#DATABASE
+_DATABASE = DATABASE:New() -- Database#DATABASE
 
 --- Scoring system for MOOSE.
 -- This scoring class calculates the hits and kills that players make within a simulation session.
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index 8f1d04ce8..07c019def 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: 20160526_1413' ) 
+env.info( 'Moose Generation Timestamp: 20160602_1448' ) 
 local base = _G
 env.info("Loading MOOSE " .. base.timer.getAbsTime() )
 
@@ -3037,7 +3037,10 @@ function BASE:E( Arguments )
 	end
 
 	local LineCurrent = DebugInfoCurrent.currentline
-	local LineFrom = DebugInfoFrom.currentline
+  local LineFrom = -1 
+	if DebugInfoFrom then
+	  LineFrom = DebugInfoFrom.currentline
+	end
 
 	env.info( string.format( "%6d(%6d)/%1s:%20s%05d.%s(%s)" , LineCurrent, LineFrom, "E", self.ClassName, self.ClassID, Function, routines.utils.oneLineSerialize( Arguments ) ) )
 end
@@ -3252,7 +3255,7 @@ local _EVENTCODES = {
 
 function EVENT:New()
   local self = BASE:Inherit( self, BASE:New() )
-  self:F()
+  self:F2()
   self.EventHandler = world.addEventHandler( self )
   return self
 end
@@ -3342,7 +3345,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnBirthForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnBirthForUnit )
   
@@ -3355,7 +3358,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnBirth( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_BIRTH )
   
@@ -3369,7 +3372,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnBirthForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
   
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_BIRTH )
   
@@ -3383,7 +3386,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnCrashForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnCrashForUnit )
 
@@ -3396,7 +3399,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnCrash( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_CRASH )
   
@@ -3410,7 +3413,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnCrashForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
   
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_CRASH )
 
@@ -3424,7 +3427,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnDeadForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
   
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnDeadForUnit )
 
@@ -3437,7 +3440,7 @@ end
 -- @param Base#BASE EventSelf
 -- @return #EVENT
 function EVENT:OnDead( EventFunction, EventSelf )
-  self:F()
+  self:F2()
   
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_DEAD )
   
@@ -3452,7 +3455,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnDeadForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_DEAD )
   
@@ -3466,7 +3469,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPilotDeadForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_PILOT_DEAD )
 
@@ -3480,7 +3483,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnLandForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnLandForUnit )
   
@@ -3494,7 +3497,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnLandForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_LAND )
 
@@ -3508,7 +3511,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnTakeOffForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnTakeOffForUnit )
 
@@ -3522,7 +3525,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnTakeOffForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_TAKEOFF )
 
@@ -3536,7 +3539,7 @@ end
 -- @param EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineShutDownForTemplate( EventTemplate, EventFunction, EventSelf )
-  self:F( EventTemplate.name )
+  self:F2( EventTemplate.name )
 
   self:OnEventForTemplate( EventTemplate, EventFunction, EventSelf, self.OnEngineShutDownForUnit )
   
@@ -3550,7 +3553,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineShutDownForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_ENGINE_SHUTDOWN )
   
@@ -3564,7 +3567,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnEngineStartUpForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_ENGINE_STARTUP )
   
@@ -3577,7 +3580,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnShot( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_SHOT )
   
@@ -3591,7 +3594,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnShotForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_SHOT )
   
@@ -3604,7 +3607,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnHit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_HIT )
   
@@ -3618,7 +3621,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnHitForUnit( EventDCSUnitName, EventFunction, EventSelf )
-  self:F( EventDCSUnitName )
+  self:F2( EventDCSUnitName )
 
   self:OnEventForUnit( EventDCSUnitName, EventFunction, EventSelf, world.event.S_EVENT_HIT )
   
@@ -3631,7 +3634,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPlayerEnterUnit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_PLAYER_ENTER_UNIT )
   
@@ -3644,7 +3647,7 @@ end
 -- @param Base#BASE EventSelf The self instance of the class for which the event is.
 -- @return #EVENT
 function EVENT:OnPlayerLeaveUnit( EventFunction, EventSelf )
-  self:F()
+  self:F2()
 
   self:OnEventGeneric( EventFunction, EventSelf, world.event.S_EVENT_PLAYER_LEAVE_UNIT )
   
@@ -3654,7 +3657,7 @@ end
 
 
 function EVENT:onEvent( Event )
-  self:F( { _EVENTCODES[Event.id], Event } )
+  self:F2( { _EVENTCODES[Event.id], Event } )
 
   if self and self.Events and self.Events[Event.id] then
     if Event.initiator and Event.initiator:getCategory() == Object.Category.UNIT then
@@ -4068,35 +4071,35 @@ function MENU_COALITION_COMMAND:Remove()
   self.ParentMenu.Menus[self.MenuPath] = nil
   return nil
 end
---- GROUP class. 
--- 
+--- GROUP class.
+--
 -- @{GROUP} class
 -- ==============
 -- The @{GROUP} class is a wrapper class to handle the DCS Group objects:
--- 
+--
 --  * Support all DCS Group APIs.
 --  * Enhance with Group specific APIs not in the DCS Group API set.
 --  * Handle local Group Controller.
 --  * Manage the "state" of the DCS Group.
---  
---  
+--
+--
 -- GROUP reference methods
--- ======================= 
+-- =======================
 -- For each DCS Group object alive within a running mission, a GROUP wrapper object (instance) will be created within the _@{DATABASE} object.
 -- This is done at the beginning of the mission (when the mission starts), and dynamically when new DCS Group objects are spawned (using the @{SPAWN} class).
---  
+--
 -- The GROUP class does not contain a :New() method, rather it provides :Find() methods to retrieve the object reference
 -- using the DCS Group or the DCS GroupName.
--- 
--- Another thing to know is that GROUP objects do not "contain" the DCS Group object. 
+--
+-- Another thing to know is that GROUP objects do not "contain" the DCS Group object.
 -- The GROUP methods will reference the DCS Group object by name when it is needed during API execution.
 -- If the DCS Group object does not exist or is nil, the GROUP methods will return nil and log an exception in the DCS.log file.
---  
+--
 -- The GROUP class provides the following functions to retrieve quickly the relevant GROUP instance:
--- 
+--
 --  * @{#GROUP.Find}(): Find a GROUP instance from the _DATABASE object using a DCS Group object.
 --  * @{#GROUP.FindByName}(): Find a GROUP instance from the _DATABASE object using a DCS Group name.
---  
+--
 -- IMPORTANT: ONE SHOULD NEVER SANATIZE these GROUP OBJECT REFERENCES! (make the GROUP object references nil).
 -- @module Group
 -- @author FlightControl
@@ -4112,14 +4115,14 @@ Include.File( "Unit" )
 -- @field DCSGroup#Group DCSGroup The DCS group class.
 -- @field #string GroupName The name of the group.
 GROUP = {
-	ClassName = "GROUP",
-	GroupName = "",
-	GroupID = 0,
-	Controller = nil,
-	DCSGroup = nil,
-	WayPointFunctions = {},
-	}
-	
+  ClassName = "GROUP",
+  GroupName = "",
+  GroupID = 0,
+  Controller = nil,
+  DCSGroup = nil,
+  WayPointFunctions = {},
+}
+
 --- A DCSGroup
 -- @type DCSGroup
 -- @field id_ The ID of the group in DCS
@@ -4129,10 +4132,10 @@ GROUP = {
 -- @param DCSGroup#Group GroupName The DCS Group name
 -- @return #GROUP self
 function GROUP:Register( GroupName )
-	local self = BASE:Inherit( self, BASE:New() )
-	self:F2( GroupName )
-	self.GroupName = GroupName
-	return self
+  local self = BASE:Inherit( self, BASE:New() )
+  self:F2( GroupName )
+  self.GroupName = GroupName
+  return self
 end
 
 -- Reference methods.
@@ -4165,11 +4168,11 @@ end
 -- @return DCSGroup#Group The DCS Group.
 function GROUP:GetDCSGroup()
   local DCSGroup = Group.getByName( self.GroupName )
-  
+
   if DCSGroup then
     return DCSGroup
   end
-    
+
   return nil
 end
 
@@ -4180,27 +4183,27 @@ end
 -- @return #boolean true if the DCS Group is alive.
 function GROUP:IsAlive()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupIsAlive = DCSGroup:isExist()
     self:T3( GroupIsAlive )
     return GroupIsAlive
   end
-  
+
   return nil
 end
 
---- Destroys the DCS Group and all of its DCS Units. 
+--- Destroys the DCS Group and all of its DCS Units.
 -- Note that this destroy method also raises a destroy event at run-time.
 -- So all event listeners will catch the destroy event of this DCS Group.
 -- @param #GROUP self
 function GROUP:Destroy()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     for Index, UnitData in pairs( DCSGroup:getUnits() ) do
       self:CreateEventCrash( timer.getTime(), UnitData )
@@ -4208,11 +4211,11 @@ function GROUP:Destroy()
     DCSGroup:destroy()
     DCSGroup = nil
   end
-  
+
   return nil
 end
 
---- Returns category of the DCS Group. 
+--- Returns category of the DCS Group.
 -- @param #GROUP self
 -- @return DCSGroup#Group.Category The category ID
 function GROUP:GetCategory()
@@ -4224,7 +4227,7 @@ function GROUP:GetCategory()
     self:T3( GroupCategory )
     return GroupCategory
   end
-  
+
   return nil
 end
 
@@ -4240,14 +4243,14 @@ function GROUP:GetCategoryName()
       [Group.Category.AIRPLANE] = "Airplane",
       [Group.Category.HELICOPTER] = "Helicopter",
       [Group.Category.GROUND] = "Ground Unit",
-      [Group.Category.SHIP] = "Ship",  
+      [Group.Category.SHIP] = "Ship",
     }
     local GroupCategory = DCSGroup:getCategory()
     self:T3( GroupCategory )
-  
+
     return CategoryNames[GroupCategory]
   end
-  
+
   return nil
 end
 
@@ -4264,7 +4267,24 @@ function GROUP:GetCoalition()
     self:T3( GroupCoalition )
     return GroupCoalition
   end
-  
+
+  return nil
+end
+
+--- Returns the country of the DCS Group.
+-- @param #GROUP self
+-- @return DCScountry#country.id The country identifier.
+-- @return #nil The DCS Group is not existing or alive.
+function GROUP:GetCountry()
+  self:F2( self.GroupName )
+
+  local DCSGroup = self:GetDCSGroup()
+  if DCSGroup then
+    local GroupCountry = DCSGroup:getUnit(1):getCountry()
+    self:T3( GroupCountry )
+    return GroupCountry
+  end
+
   return nil
 end
 
@@ -4275,13 +4295,13 @@ function GROUP:GetName()
   self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupName = DCSGroup:getName()
     self:T3( GroupName )
     return GroupName
   end
-  
+
   return nil
 end
 
@@ -4290,19 +4310,19 @@ end
 -- @return #number The identifier of the DCS Group.
 function GROUP:GetID()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupID = DCSGroup:getID()
     self:T3( GroupID )
     return GroupID
   end
-  
+
   return nil
 end
 
---- Returns the UNIT wrapper class with number UnitNumber. 
+--- Returns the UNIT wrapper class with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the UNIT wrapper class to be returned.
@@ -4311,7 +4331,7 @@ function GROUP:GetUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local UnitFound = UNIT:Find( DCSGroup:getUnit( UnitNumber ) )
     self:T3( UnitFound.UnitName )
@@ -4322,7 +4342,7 @@ function GROUP:GetUnit( UnitNumber )
   return nil
 end
 
---- Returns the DCS Unit with number UnitNumber. 
+--- Returns the DCS Unit with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the DCS Unit to be returned.
@@ -4331,7 +4351,7 @@ function GROUP:GetDCSUnit( UnitNumber )
   self:F2( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnitFound = DCSGroup:getUnit( UnitNumber )
     self:T3( DCSUnitFound )
@@ -4341,14 +4361,14 @@ function GROUP:GetDCSUnit( UnitNumber )
   return nil
 end
 
---- Returns current size of the DCS Group. 
--- If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed. 
+--- Returns current size of the DCS Group.
+-- If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed.
 -- @param #GROUP self
 -- @return #number The DCS Group size.
 function GROUP:GetSize()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupSize = DCSGroup:getSize()
     self:T3( GroupSize )
@@ -4358,15 +4378,15 @@ function GROUP:GetSize()
   return nil
 end
 
---- 
---- Returns the initial size of the DCS Group. 
--- If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged. 
+---
+--- Returns the initial size of the DCS Group.
+-- If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged.
 -- @param #GROUP self
 -- @return #number The DCS Group initial size.
 function GROUP:GetInitialSize()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupInitialSize = DCSGroup:getInitialSize()
     self:T3( GroupInitialSize )
@@ -4382,7 +4402,7 @@ end
 function GROUP:GetUnits()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnits = DCSGroup:getUnits()
     local Units = {}
@@ -4403,7 +4423,7 @@ end
 function GROUP:GetDCSUnits()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local DCSUnits = DCSGroup:getUnits()
     self:T3( DCSUnits )
@@ -4419,7 +4439,7 @@ end
 function GROUP:_GetController()
   self:F2( { self.GroupName } )
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupController = DCSGroup:getController()
     self:T3( GroupController )
@@ -4439,7 +4459,7 @@ end
 function GROUP:WayPointInitialize()
 
   self.WayPoints = self:GetTaskRoute()
-  
+
   return self
 end
 
@@ -4452,7 +4472,7 @@ end
 -- @return #GROUP
 function GROUP:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... )
   self:F2( { WayPoint, WayPointIndex, WayPointFunction } )
-  
+
   table.insert( self.WayPoints[WayPoint].task.params.tasks, WayPointIndex )
   self.WayPoints[WayPoint].task.params.tasks[WayPointIndex] = self:TaskFunction( WayPoint, WayPointIndex, WayPointFunction, arg )
   return self
@@ -4462,7 +4482,7 @@ end
 function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionArguments )
 
   local DCSTask
-  
+
   local DCSScript = {}
   DCSScript[#DCSScript+1] = "local MissionGroup = GROUP:Find( ... ) "
 
@@ -4470,16 +4490,16 @@ function GROUP:TaskFunction( WayPoint, WayPointIndex, FunctionString, FunctionAr
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup, " .. table.concat( FunctionArguments, "," ) .. ")"
   else
     DCSScript[#DCSScript+1] = FunctionString .. "( MissionGroup )"
-  end  
-  
-  DCSTask = self:TaskWrappedAction( 
+  end
+
+  DCSTask = self:TaskWrappedAction(
     self:CommandDoScript(
       table.concat( DCSScript )
     ), WayPointIndex
   )
-  
+
   self:T3( DCSTask )
-  
+
   return DCSTask
 
 end
@@ -4498,14 +4518,14 @@ function GROUP:WayPointExecute( WayPoint, WaitTime )
   if not WayPoint then
     WayPoint = 1
   end
-  
+
   -- When starting the mission from a certain point, the TaskPoints need to be deleted before the given WayPoint.
   for TaskPointID = 1, WayPoint - 1 do
     table.remove( self.WayPoints, 1 )
   end
 
   self:T3( self.WayPoints )
-  
+
   self:SetTask( self:TaskRoute( self.WayPoints ), WaitTime )
 
   return self
@@ -4515,9 +4535,9 @@ end
 --- Activates a GROUP.
 -- @param #GROUP self
 function GROUP:Activate()
-	self:F2( { self.GroupName } )
-	trigger.action.activateGroup( self:GetDCSGroup() )
-	return self:GetDCSGroup()
+  self:F2( { self.GroupName } )
+  trigger.action.activateGroup( self:GetDCSGroup() )
+  return self:GetDCSGroup()
 end
 
 
@@ -4528,13 +4548,13 @@ function GROUP:GetTypeName()
   self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupTypeName = DCSGroup:getUnit(1):getTypeName()
     self:T3( GroupTypeName )
     return( GroupTypeName )
   end
-  
+
   return nil
 end
 
@@ -4543,33 +4563,33 @@ end
 -- @return #string The CallSign of the first DCS Unit of the DCS Group.
 function GROUP:GetCallsign()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCallSign = DCSGroup:getUnit(1):getCallsign()
     self:T3( GroupCallSign )
     return GroupCallSign
   end
-  
+
   return nil
 end
 
 --- Returns the current point (Vec2 vector) of the first DCS Unit in the DCS Group.
 -- @return DCSTypes#Vec2 Current Vec2 point of the first DCS Unit of the DCS Group.
 function GROUP:GetPointVec2()
-	self:F2( self.GroupName )
-	
-	local GroupPointVec2 = self:GetUnit(1):GetPointVec2()
-	self:T3( GroupPointVec2 )
-	return GroupPointVec2
+  self:F2( self.GroupName )
+
+  local GroupPointVec2 = self:GetUnit(1):GetPointVec2()
+  self:T3( GroupPointVec2 )
+  return GroupPointVec2
 end
 
 --- Returns the current point (Vec3 vector) of the first DCS Unit in the DCS Group.
 -- @return DCSTypes#Vec3 Current Vec3 point of the first DCS Unit of the DCS Group.
 function GROUP:GetPointVec3()
-	self:F2( self.GroupName )
-  
+  self:F2( self.GroupName )
+
   local GroupPointVec3 = self:GetUnit(1):GetPointVec3()
   self:T3( GroupPointVec3 )
   return GroupPointVec3
@@ -4584,16 +4604,16 @@ end
 -- @param #GROUP self
 -- @return #boolean Air category evaluation result.
 function GROUP:IsAir()
-	self:F2( self.GroupName )
+  self:F2( self.GroupName )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local IsAirResult = DCSGroup:getCategory() == Group.Category.AIRPLANE or DCSGroup:getCategory() == Group.Category.HELICOPTER
-  	self:T3( IsAirResult )
-  	return IsAirResult
+    local IsAirResult = DCSGroup:getCategory() == Group.Category.AIRPLANE or DCSGroup:getCategory() == Group.Category.HELICOPTER
+    self:T3( IsAirResult )
+    return IsAirResult
   end
-  
+
   return nil
 end
 
@@ -4602,15 +4622,15 @@ end
 -- @return #boolean true if DCS Group contains Helicopters.
 function GROUP:IsHelicopter()
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.HELICOPTER
   end
-  
+
   return nil
 end
 
@@ -4619,15 +4639,15 @@ end
 -- @return #boolean true if DCS Group contains AirPlanes.
 function GROUP:IsAirPlane()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.AIRPLANE
   end
-  
+
   return nil
 end
 
@@ -4636,15 +4656,15 @@ end
 -- @return #boolean true if DCS Group contains Ground troops.
 function GROUP:IsGround()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.GROUND
   end
-  
+
   return nil
 end
 
@@ -4653,15 +4673,15 @@ end
 -- @return #boolean true if DCS Group contains Ships.
 function GROUP:IsShip()
   self:F2()
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupCategory = DCSGroup:getCategory()
     self:T2( GroupCategory )
     return GroupCategory == Group.Category.SHIP
   end
-  
+
   return nil
 end
 
@@ -4670,23 +4690,23 @@ end
 -- @param #GROUP self
 -- @return #boolean All units on the ground result.
 function GROUP:AllOnGround()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local AllOnGroundResult = true
-  
-  	for Index, UnitData in pairs( DCSGroup:getUnits() ) do
-  		if UnitData:inAir() then
-  			AllOnGroundResult = false
-  		end
-  	end
-  	
-  	self:T3( AllOnGroundResult )
-  	return AllOnGroundResult
+    local AllOnGroundResult = true
+
+    for Index, UnitData in pairs( DCSGroup:getUnits() ) do
+      if UnitData:inAir() then
+        AllOnGroundResult = false
+      end
+    end
+
+    self:T3( AllOnGroundResult )
+    return AllOnGroundResult
   end
-  
+
   return nil
 end
 
@@ -4695,26 +4715,26 @@ end
 -- @param #GROUP self
 -- @return #number Maximum velocity found.
 function GROUP:GetMaxVelocity()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local MaxVelocity = 0
-  	
-  	for Index, UnitData in pairs( DCSGroup:getUnits() ) do
-  
-  		local Velocity = UnitData:getVelocity()
-  		local VelocityTotal = math.abs( Velocity.x ) + math.abs( Velocity.y ) + math.abs( Velocity.z )
-  
-  		if VelocityTotal < MaxVelocity then
-  			MaxVelocity = VelocityTotal
-  		end 
-  	end
-  	
-  	return MaxVelocity
+    local MaxVelocity = 0
+
+    for Index, UnitData in pairs( DCSGroup:getUnits() ) do
+
+      local Velocity = UnitData:getVelocity()
+      local VelocityTotal = math.abs( Velocity.x ) + math.abs( Velocity.y ) + math.abs( Velocity.z )
+
+      if VelocityTotal < MaxVelocity then
+        MaxVelocity = VelocityTotal
+      end
+    end
+
+    return MaxVelocity
   end
- 
+
   return nil
 end
 
@@ -4723,7 +4743,7 @@ end
 -- @param #GROUP self
 -- @return #number Minimum height found.
 function GROUP:GetMinHeight()
-	self:F2()
+  self:F2()
 
 end
 
@@ -4732,7 +4752,7 @@ end
 -- @param #GROUP self
 -- @return #number Maximum height found.
 function GROUP:GetMaxHeight()
-	self:F2()
+  self:F2()
 
 end
 
@@ -4742,16 +4762,16 @@ end
 -- @param #GROUP self
 -- @return Group#GROUP self
 function GROUP:PopCurrentTask()
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
     Controller:popTask()
     return self
   end
-  
+
   return nil
 end
 
@@ -4759,27 +4779,27 @@ end
 -- @param #GROUP self
 -- @return Group#GROUP self
 function GROUP:PushTask( DCSTask, WaitTime )
-	self:F2()
+  self:F2()
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     -- When a group SPAWNs, it takes about a second to get the group in the simulator. Setting tasks to unspawned groups provides unexpected results.
     -- Therefore we schedule the functions to set the mission and options for the Group.
     -- Controller:pushTask( DCSTask )
-  
+
     if WaitTime then
       --routines.scheduleFunction( Controller.pushTask, { Controller, DCSTask }, timer.getTime() + WaitTime )
       SCHEDULER:New( Controller, Controller.pushTask, { DCSTask }, WaitTime )
     else
       Controller:pushTask( DCSTask )
     end
-  
+
     return self
   end
-  
+
   return nil
 end
 
@@ -4790,24 +4810,24 @@ function GROUP:SetTask( DCSTask, WaitTime )
   self:F2( { DCSTask } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  
+
     local Controller = self:_GetController()
-    
+
     -- When a group SPAWNs, it takes about a second to get the group in the simulator. Setting tasks to unspawned groups provides unexpected results.
     -- Therefore we schedule the functions to set the mission and options for the Group.
     -- Controller.setTask( Controller, DCSTask )
-  
+
     if not WaitTime then
       WaitTime = 1
     end
     --routines.scheduleFunction( Controller.setTask, { Controller, DCSTask }, timer.getTime() + WaitTime )
     SCHEDULER:New( Controller, Controller.setTask, { DCSTask }, WaitTime )
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -4815,15 +4835,15 @@ end
 --- Return a condition section for a controlled task
 -- @param #GROUP self
 -- @param DCSTime#Time time
--- @param #string userFlag 
--- @param #boolean userFlagValue 
+-- @param #string userFlag
+-- @param #boolean userFlagValue
 -- @param #string condition
--- @param DCSTime#Time duration 
--- @param #number lastWayPoint 
+-- @param DCSTime#Time duration
+-- @param #number lastWayPoint
 -- return DCSTask#Task
 function GROUP:TaskCondition( time, userFlag, userFlagValue, condition, duration, lastWayPoint )
-	self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
-  
+  self:F2( { time, userFlag, userFlagValue, condition, duration, lastWayPoint } )
+
   local DCSStopCondition = {}
   DCSStopCondition.time = time
   DCSStopCondition.userFlag = userFlag
@@ -4831,9 +4851,9 @@ function GROUP:TaskCondition( time, userFlag, userFlagValue, condition, duration
   DCSStopCondition.condition = condition
   DCSStopCondition.duration = duration
   DCSStopCondition.lastWayPoint = lastWayPoint
-  
+
   self:T3( { DCSStopCondition } )
-  return DCSStopCondition 
+  return DCSStopCondition
 end
 
 --- Return a Controlled Task taking a Task and a TaskCondition
@@ -4842,18 +4862,18 @@ end
 -- @param #DCSStopCondition DCSStopCondition
 -- @return DCSTask#Task
 function GROUP:TaskControlled( DCSTask, DCSStopCondition )
-	self:F2( { DCSTask, DCSStopCondition } )
+  self:F2( { DCSTask, DCSStopCondition } )
 
   local DCSTaskControlled
-  
-  DCSTaskControlled = { 
-    id = 'ControlledTask', 
-    params = { 
-      task = DCSTask, 
-      stopCondition = DCSStopCondition 
-    } 
+
+  DCSTaskControlled = {
+    id = 'ControlledTask',
+    params = {
+      task = DCSTask,
+      stopCondition = DCSStopCondition
+    }
   }
-  
+
   self:T3( { DCSTaskControlled } )
   return DCSTaskControlled
 end
@@ -4866,19 +4886,19 @@ function GROUP:TaskCombo( DCSTasks )
   self:F2( { DCSTasks } )
 
   local DCSTaskCombo
-  
-  DCSTaskCombo = { 
-    id = 'ComboTask', 
-    params = { 
+
+  DCSTaskCombo = {
+    id = 'ComboTask',
+    params = {
       tasks = DCSTasks
-    } 
+    }
   }
-  
+
   self:T3( { DCSTaskCombo } )
   return DCSTaskCombo
 end
 
---- Return a WrappedAction Task taking a Command 
+--- Return a WrappedAction Task taking a Command
 -- @param #GROUP self
 -- @param DCSCommand#Command DCSCommand
 -- @return DCSTask#Task
@@ -4886,8 +4906,8 @@ function GROUP:TaskWrappedAction( DCSCommand, Index )
   self:F2( { DCSCommand } )
 
   local DCSTaskWrappedAction
-  
-  DCSTaskWrappedAction = { 
+
+  DCSTaskWrappedAction = {
     id = "WrappedAction",
     enabled = true,
     number = Index,
@@ -4907,15 +4927,15 @@ end
 -- @return #GROUP self
 function GROUP:SetCommand( DCSCommand )
   self:F2( DCSCommand )
-  
+
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local Controller = self:_GetController()
     Controller:setCommand( DCSCommand )
     return self
   end
-  
+
   return nil
 end
 
@@ -4926,117 +4946,387 @@ end
 -- @return DCSTask#Task
 function GROUP:CommandSwitchWayPoint( FromWayPoint, ToWayPoint, Index )
   self:F2( { FromWayPoint, ToWayPoint, Index } )
-  
+
   local CommandSwitchWayPoint = {
-    id = 'SwitchWaypoint', 
-    params = { 
-      fromWaypointIndex = FromWayPoint,  
-      goToWaypointIndex = ToWayPoint, 
+    id = 'SwitchWaypoint',
+    params = {
+      fromWaypointIndex = FromWayPoint,
+      goToWaypointIndex = ToWayPoint,
     },
   }
-  
+
   self:T3( { CommandSwitchWayPoint } )
   return CommandSwitchWayPoint
 end
-  
 
---- Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
+
+-- TASKS FOR AIR GROUPS
+
+
+--- (AIR) Attack a Group.
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
+
+  --  AttackGroup = {
+  --   id = 'AttackGroup',
+  --   params = {
+  --     groupId = Group.ID,
+  --     weaponType = number,
+  --     expend = enum AI.Task.WeaponExpend,
+  --     attackQty = number,
+  --     directionEnabled = boolean,
+  --     direction = Azimuth,
+  --     altitudeEnabled = boolean,
+  --     altitude = Distance,
+  --     attackQtyLimit = boolean,
+  --   }
+  -- }
+
+  local DirectionEnabled = nil
+  if Direction then
+    DirectionEnabled = true
+  end
+
+  local AltitudeEnabled = nil
+  if Altitude then
+    AltitudeEnabled = true
+  end
+
+  local DCSTask
+  DCSTask = { id = 'AttackGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      directionEnabled = DirectionEnabled,
+      direction = Direction,
+      altitudeEnabled = AltitudeEnabled,
+      altitude = Altitude,
+      attackQtyLimit = AttackQtyLimit,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Attack the Unit.
+-- @param #GROUP self
+-- @param Unit#UNIT AttackUnit The unit.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackUnit( AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack )
+  self:F2( { self.GroupName, AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack } )
+
+  --  AttackUnit = {
+  --    id = 'AttackUnit',
+  --    params = {
+  --      unitId = Unit.ID,
+  --      weaponType = number,
+  --      expend = enum AI.Task.WeaponExpend
+  --      attackQty = number,
+  --      direction = Azimuth,
+  --      attackQtyLimit = boolean,
+  --      groupAttack = boolean,
+  --    }
+  --  }
+
+  local DCSTask
+  DCSTask = { id = 'AttackUnit',
+    params = {
+      unitId = AttackUnit:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      direction = Direction,
+      attackQtyLimit = AttackQtyLimit,
+      groupAttack = GroupAttack,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Delivering weapon at the point on the ground. 
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the point to deliver weapon at.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) Desired quantity of passes. The parameter is not the same in AttackGroup and AttackUnit tasks. 
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskBombing( PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  Bombing = { 
+--    id = 'Bombing', 
+--    params = { 
+--      point = Vec2,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'Bombing',
+    params = {
+    point = PointVec2,
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+--- (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 Point The point to hold the position.
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #GROUP self
 function GROUP:TaskOrbitCircleAtVec2( Point, Altitude, Speed )
-	self:F2( { self.GroupName, Point, Altitude, Speed } )
+  self:F2( { self.GroupName, Point, Altitude, Speed } )
+
+  --  pattern = enum AI.Task.OribtPattern,
+  --    point = Vec2,
+  --    point2 = Vec2,
+  --    speed = Distance,
+  --    altitude = Distance
 
---  pattern = enum AI.Task.OribtPattern,
---    point = Vec2,
---    point2 = Vec2,
---    speed = Distance,
---    altitude = Distance
-    
   local LandHeight = land.getHeight( Point )
-  
+
   self:T3( { LandHeight } )
 
-  local DCSTask = { id = 'Orbit', 
-                   params = { pattern = AI.Task.OrbitPattern.CIRCLE, 
-                              point = Point, 
-                              speed = Speed, 
-                              altitude = Altitude + LandHeight
-                            } 
-                 } 
+  local DCSTask = { id = 'Orbit',
+    params = { pattern = AI.Task.OrbitPattern.CIRCLE,
+      point = Point,
+      speed = Speed,
+      altitude = Altitude + LandHeight
+    }
+  }
+
+
+  --  local AITask = { id = 'ControlledTask',
+  --                   params = { task = { id = 'Orbit',
+  --                                       params = { pattern = AI.Task.OrbitPattern.CIRCLE,
+  --                                                  point = Point,
+  --                                                  speed = Speed,
+  --                                                  altitude = Altitude + LandHeight
+  --                                                }
+  --                                     },
+  --                              stopCondition = { duration = Duration
+  --                                              }
+  --                            }
+  --                 }
+  --               )
 
-  
---  local AITask = { id = 'ControlledTask', 
---                   params = { task = { id = 'Orbit', 
---                                       params = { pattern = AI.Task.OrbitPattern.CIRCLE, 
---                                                  point = Point, 
---                                                  speed = Speed, 
---                                                  altitude = Altitude + LandHeight
---                                                } 
---                                     }, 
---                              stopCondition = { duration = Duration 
---                                              } 
---                            } 
---                 }
---               )
-               
   return DCSTask
 end
 
---- Orbit at the current position of the first unit of the group at a specified alititude
+--- (AIR) Orbit at the current position of the first unit of the group at a specified alititude
 -- @param #GROUP self
 -- @param #number Altitude The altitude to hold the position.
 -- @param #number Speed The speed flying when holding the position.
 -- @return #GROUP self
 function GROUP:TaskOrbitCircle( Altitude, Speed )
-	self:F2( { self.GroupName, Altitude, Speed } )
+  self:F2( { self.GroupName, Altitude, Speed } )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
     local GroupPoint = self:GetPointVec2()
     return self:TaskOrbitCircleAtVec2( GroupPoint, Altitude, Speed )
   end
-  
+
   return nil
 end
 
 
 
---- Hold position at the current position of the first unit of the group.
+--- (AIR) Hold position at the current position of the first unit of the group.
 -- @param #GROUP self
 -- @param #number Duration The maximum duration in seconds to hold the position.
 -- @return #GROUP self
 function GROUP:TaskHoldPosition()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   return self:TaskOrbitCircle( 30, 10 )
 end
 
 
---- Land the group at a Vec2Point.
+
+
+--- (AIR) Attacking the map object (building, structure, e.t.c).
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the point the map object is closest to. The distance between the point and the map object must not be greater than 2000 meters. Object id is not used here because Mission Editor doesn't support map object identificators.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskAttackMapObject( PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  AttackMapObject = { 
+--    id = 'AttackMapObject', 
+--    params = { 
+--      point = Vec2,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'AttackMapObject',
+    params = {
+    point = PointVec2,
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Delivering weapon on the runway.
+-- @param #GROUP self
+-- @param Airbase#AIRBASE Airbase Airbase to attack.
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskBombingRunway( Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack )
+  self:F2( { self.GroupName, Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack } )
+
+--  BombingRunway = { 
+--    id = 'BombingRunway', 
+--    params = { 
+--      runwayId = AirdromeId,
+--      weaponType = number, 
+--      expend = enum AI.Task.WeaponExpend,
+--      attackQty = number, 
+--      direction = Azimuth, 
+--      groupAttack = boolean, 
+--    } 
+--  } 
+
+  local DCSTask
+  DCSTask = { id = 'BombingRunway',
+    params = {
+    point = Airbase:GetID(),
+    weaponType = WeaponType, 
+    expend = WeaponExpend,
+    attackQty = AttackQty, 
+    direction = Direction, 
+    groupAttack = GroupAttack, 
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Refueling from the nearest tanker. No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskRefueling()
+  self:F2( { self.GroupName } )
+
+--  Refueling = { 
+--    id = 'Refueling', 
+--    params = {} 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Refueling',
+    params = {
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR HELICOPTER) Landing at the ground. For helicopters only.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 Point The point where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
 -- @return #GROUP self
 function GROUP:TaskLandAtVec2( Point, Duration )
-	self:F2( { self.GroupName, Point, Duration } )
+  self:F2( { self.GroupName, Point, Duration } )
 
+--  Land = {
+--    id= 'Land',
+--    params = {
+--      point = Vec2,
+--      durationFlag = boolean,
+--      duration = Time
+--    }
+--  }
+ 
   local DCSTask
-  
-	if Duration and Duration > 0 then
-		DCSTask = { id = 'Land', params = { point = Point, durationFlag = true, duration = Duration } }
-	else
-		DCSTask = { id = 'Land', params = { point = Point, durationFlag = false } }
-	end
+  if Duration and Duration > 0 then
+    DCSTask = { id = 'Land', 
+      params = { 
+        point = Point, 
+        durationFlag = true, 
+        duration = Duration,
+      }, 
+    }
+  else
+    DCSTask = { id = 'Land', 
+      params = { 
+        point = Point, 
+        durationFlag = false, 
+      }, 
+    }
+  end
 
   self:T3( DCSTask )
-	return DCSTask
+  return DCSTask
 end
 
---- Land the group at a @{Zone#ZONE).
+--- (AIR) Land the group at a @{Zone#ZONE).
 -- @param #GROUP self
 -- @param Zone#ZONE Zone The zone where to land.
 -- @param #number Duration The duration in seconds to stay on the ground.
@@ -5050,80 +5340,104 @@ function GROUP:TaskLandAtZone( Zone, Duration, RandomPoint )
   else
     Point = Zone:GetPointVec2()
   end
-  
+
   local DCSTask = self:TaskLandAtVec2( Point, Duration )
 
   self:T3( DCSTask )
   return DCSTask
 end
 
-
---- Attack the Unit.
+--- (AIR) Following another airborne group. 
+-- The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+-- If another group is on land the unit / group will orbit around. 
 -- @param #GROUP self
--- @param Unit#UNIT The unit.
+-- @param Group#GROUP FollowGroup The group to be followed.
+-- @param DCSTypes#Vec3 PointVec3 Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.
+-- @param #number LastWaypointIndex Detach waypoint of another group. Once reached the unit / group Follow task is finished.
 -- @return DCSTask#Task The DCS task structure.
-function GROUP:TaskAttackUnit( AttackUnit )
-	self:F2( { self.GroupName, AttackUnit } )
+function GROUP:TaskFollow( FollowGroup, PointVec3, LastWaypointIndex )
+  self:F2( { self.GroupName, FollowGroup, PointVec3, LastWaypointIndex } )
 
---  AttackUnit = { 
---    id = 'AttackUnit', 
---    params = { 
---      unitId = Unit.ID, 
---      weaponType = number, 
---      expend = enum AI.Task.WeaponExpend
---      attackQty = number, 
---      direction = Azimuth, 
---      attackQtyLimit = boolean, 
---      groupAttack = boolean, 
---    } 
+--  Follow = {
+--    id = 'Follow',
+--    params = {
+--      groupId = Group.ID,
+--      pos = Vec3,
+--      lastWptIndexFlag = boolean,
+--      lastWptIndex = number
+--    }    
 --  }
+
+  local LastWaypointIndexFlag = nil
+  if LastWaypointIndex then
+    LastWaypointIndexFlag = true
+  end
   
-  local DCSTask    
-  DCSTask = { id = 'AttackUnit', 
-              params = { unitId = AttackUnit:GetID(), 
-                         expend = AI.Task.WeaponExpend.TWO,
-                         groupAttack = true, 
-                       }, 
-            }, 
-  
+  local DCSTask
+  DCSTask = { id = 'Follow',
+    params = {
+      groupId = FollowGroup:GetID(),
+      pos = PointVec3,
+      lastWptIndexFlag = LastWaypointIndexFlag,
+      lastWptIndex = LastWaypointIndex,
+    },
+  },
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
---- Attack a Group.
+
+--- (AIR) Escort another airborne group. 
+-- The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+-- The unit / group will also protect that group from threats of specified types.
 -- @param #GROUP self
--- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param Group#GROUP EscortGroup The group to be escorted.
+-- @param DCSTypes#Vec3 PointVec3 Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.
+-- @param #number LastWaypointIndex Detach waypoint of another group. Once reached the unit / group Follow task is finished.
+-- @param #number EngagementDistanceMax Maximal distance from escorted group to threat. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax. 
+-- @param #list<DCSTypes#AttributeName> TargetTypes Array of AttributeName that is contains threat categories allowed to engage. 
 -- @return DCSTask#Task The DCS task structure.
-function GROUP:TaskAttackGroup( AttackGroup )
-  self:F2( { self.GroupName, AttackGroup } )
+function GROUP:TaskEscort( FollowGroup, PointVec3, LastWaypointIndex, EngagementDistance, TargetTypes )
+  self:F2( { self.GroupName, FollowGroup, PointVec3, LastWaypointIndex, EngagementDistance, TargetTypes } )
 
---  AttackGroup = { 
---   id = 'AttackGroup', 
---   params = { 
---     groupId = Group.ID,
---     weaponType = number,
---     expend = enum AI.Task.WeaponExpend,
---     attackQty = number,
---     directionEnabled = boolean,
---     direction = Azimuth,
---     altitudeEnabled = boolean,
---     altitude = Distance,
---     attackQtyLimit = boolean,
---   } 
--- }  
+--  Escort = {
+--    id = 'Escort',
+--    params = {
+--      groupId = Group.ID,
+--      pos = Vec3,
+--      lastWptIndexFlag = boolean,
+--      lastWptIndex = number,
+--      engagementDistMax = Distance,
+--      targetTypes = array of AttributeName,
+--    }    
+--  }
 
-  local DCSTask    
-  DCSTask = { id = 'AttackGroup', 
-              params = { groupId = AttackGroup:GetID(), 
-                         expend = AI.Task.WeaponExpend.TWO,
-                       }, 
-            }, 
+  local LastWaypointIndexFlag = nil
+  if LastWaypointIndex then
+    LastWaypointIndexFlag = true
+  end
   
+  local DCSTask
+  DCSTask = { id = 'Follow',
+    params = {
+      groupId = FollowGroup:GetID(),
+      pos = PointVec3,
+      lastWptIndexFlag = LastWaypointIndexFlag,
+      lastWptIndex = LastWaypointIndex,
+      engagementDistMax = EngagementDistance,
+      targetTypes = TargetTypes,
+    },
+  },
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
---- Fires at a VEC2 point.
+
+-- GROUND TASKS
+
+--- (GROUND) Fire at a VEC2 point until ammunition is finished.
 -- @param #GROUP self
 -- @param DCSTypes#Vec2 The point to fire at.
 -- @param DCSTypes#Distance Radius The radius of the zone to deploy the fire at.
@@ -5131,25 +5445,406 @@ end
 function GROUP:TaskFireAtPoint( PointVec2, Radius )
   self:F2( { self.GroupName, PointVec2, Radius } )
 
--- FireAtPoint = { 
---   id = 'FireAtPoint', 
---   params = { 
---     point = Vec2,
---     radius = Distance, 
---   } 
--- }
-   
-  local DCSTask    
-  DCSTask = { id = 'FireAtPoint', 
-              params = { point = PointVec2, 
-                         radius = Radius, 
-                       } 
-            } 
-  
+  -- FireAtPoint = {
+  --   id = 'FireAtPoint',
+  --   params = {
+  --     point = Vec2,
+  --     radius = Distance,
+  --   }
+  -- }
+
+  local DCSTask
+  DCSTask = { id = 'FireAtPoint',
+    params = {
+      point = PointVec2,
+      radius = Radius,
+    }
+  }
+
   self:T3( { DCSTask } )
   return DCSTask
 end
 
+--- (GROUND) Hold ground group from moving.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskHold()
+  self:F2( { self.GroupName } )
+
+--  Hold = { 
+--    id = 'Hold', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Hold',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+-- TASKS FOR AIRBORNE AND GROUND UNITS/GROUPS
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup Target GROUP.
+-- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
+-- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:TaskFAC_AttackGroup( AttackGroup, WeaponType, Designation, Datalink )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, Designation, Datalink } )
+
+--  FAC_AttackGroup = { 
+--    id = 'FAC_AttackGroup', 
+--    params = { 
+--      groupId = Group.ID,
+--      weaponType = number,
+--      designation = enum AI.Task.Designation,
+--      datalink = boolean
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC_AttackGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      designation = Designation,
+      datalink = Datalink,
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+-- EN-ROUTE TASKS FOR AIRBORNE GROUPS
+
+--- (AIR) Engaging targets of defined types.
+-- @param #GROUP self
+-- @param DCSTypes#Distance Distance Maximal distance from the target to a route leg. If the target is on a greater distance it will be ignored. 
+-- @param #list<#DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. 
+-- @param #number Priority All enroute tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageTargets( Distance, TargetTypes, Priority )
+  self:F2( { self.GroupName, Distance, TargetTypes, Priority } )
+
+--  EngageTargets ={ 
+--    id = 'EngageTargets', 
+--    params = { 
+--      maxDist = Distance, 
+--      targetTypes = array of AttributeName, 
+--      priority = number 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageTargets',
+    params = {
+      maxDist = Distance, 
+      targetTypes = TargetTypes, 
+      priority = Priority 
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Engaging a targets of defined types at circle-shaped zone.
+-- @param #GROUP self
+-- @param DCSTypes#Vec2 PointVec2 2D-coordinates of the zone. 
+-- @param DCSTypes#Distance Radius Radius of the zone. 
+-- @param #list<#DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. 
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageTargets( PointVec2, Radius, TargetTypes, Priority )
+  self:F2( { self.GroupName, PointVec2, Radius, TargetTypes, Priority } )
+
+--  EngageTargetsInZone = { 
+--    id = 'EngageTargetsInZone', 
+--    params = { 
+--      point = Vec2, 
+--      zoneRadius = Distance, 
+--      targetTypes = array of AttributeName,  
+--      priority = number 
+--    }
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageTargetsInZone',
+    params = {
+      point = PointVec2, 
+      zoneRadius = Radius, 
+      targetTypes = TargetTypes,  
+      priority = Priority 
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+--- (AIR) Engaging a group. The task does not assign the target group to the unit/group to attack now; it just allows the unit/group to engage the target group as well as other assigned targets.
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup The Group to be attacked.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param DCSTypes#Distance Altitude (optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
+  self:F2( { self.GroupName, AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit } )
+
+  --  EngageGroup  = {
+  --   id = 'EngageGroup ',
+  --   params = {
+  --     groupId = Group.ID,
+  --     weaponType = number,
+  --     expend = enum AI.Task.WeaponExpend,
+  --     attackQty = number,
+  --     directionEnabled = boolean,
+  --     direction = Azimuth,
+  --     altitudeEnabled = boolean,
+  --     altitude = Distance,
+  --     attackQtyLimit = boolean,
+  --     priority = number,
+  --   }
+  -- }
+
+  local DirectionEnabled = nil
+  if Direction then
+    DirectionEnabled = true
+  end
+
+  local AltitudeEnabled = nil
+  if Altitude then
+    AltitudeEnabled = true
+  end
+
+  local DCSTask
+  DCSTask = { id = 'EngageGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      directionEnabled = DirectionEnabled,
+      direction = Direction,
+      altitudeEnabled = AltitudeEnabled,
+      altitude = Altitude,
+      attackQtyLimit = AttackQtyLimit,
+      priority = Priority,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Attack the Unit.
+-- @param #GROUP self
+-- @param Unit#UNIT AttackUnit The UNIT.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.
+-- @param DCSTypes#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.
+-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.
+-- @param DCSTypes#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.
+-- @param #boolean AttackQtyLimit (optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.
+-- @param #boolean GroupAttack (optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEngageUnit( AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack )
+  self:F2( { self.GroupName, AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack } )
+
+  --  EngageUnit = {
+  --    id = 'EngageUnit',
+  --    params = {
+  --      unitId = Unit.ID,
+  --      weaponType = number,
+  --      expend = enum AI.Task.WeaponExpend
+  --      attackQty = number,
+  --      direction = Azimuth,
+  --      attackQtyLimit = boolean,
+  --      groupAttack = boolean,
+  --      priority = number,
+  --    }
+  --  }
+
+  local DCSTask
+  DCSTask = { id = 'EngageUnit',
+    params = {
+      unitId = AttackUnit:GetID(),
+      weaponType = WeaponType,
+      expend = WeaponExpend,
+      attackQty = AttackQty,
+      direction = Direction,
+      attackQtyLimit = AttackQtyLimit,
+      groupAttack = GroupAttack,
+      priority = Priority,
+    },
+  },
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskAWACS( )
+  self:F2( { self.GroupName } )
+
+--  AWACS = { 
+--    id = 'AWACS', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'AWACS',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR) Aircraft will act as a tanker for friendly units. No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskTanker( )
+  self:F2( { self.GroupName } )
+
+--  Tanker = { 
+--    id = 'Tanker', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'Tanker',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+-- En-route tasks for ground units/groups
+
+--- (GROUND) Ground unit (EW-radar) will act as an EWR for friendly units (will provide them with information about contacts). No parameters.
+-- @param #GROUP self
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskEWR( )
+  self:F2( { self.GroupName } )
+
+--  EWR = { 
+--    id = 'EWR', 
+--    params = { 
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'EWR',
+    params = {
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+-- En-route tasks for airborne and ground units/groups 
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param Group#GROUP AttackGroup Target GROUP.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @param #number WeaponType Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. 
+-- @param DCSTypes#AI.Task.Designation Designation (optional) Designation type.
+-- @param #boolean Datalink (optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponType, Designation, Datalink )
+  self:F2( { self.GroupName, AttackGroup, WeaponType, Priority, Designation, Datalink } )
+
+--  FAC_EngageGroup  = { 
+--    id = 'FAC_EngageGroup', 
+--    params = { 
+--      groupId = Group.ID,
+--      weaponType = number,
+--      designation = enum AI.Task.Designation,
+--      datalink = boolean,
+--      priority = number,
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC_EngageGroup',
+    params = {
+      groupId = AttackGroup:GetID(),
+      weaponType = WeaponType,
+      designation = Designation,
+      datalink = Datalink,
+      priority = Priority,
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
+--- (AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets. 
+-- The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+-- If the task is assigned to the group lead unit will be a FAC. 
+-- @param #GROUP self
+-- @param DCSTypes#Distance Radius  The maximal distance from the FAC to a target.
+-- @param #number Priority All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. 
+-- @return DCSTask#Task The DCS task structure.
+function GROUP:EnRouteTaskFAC( Radius, Priority )
+  self:F2( { self.GroupName, Radius, Priority } )
+
+--  FAC = { 
+--    id = 'FAC', 
+--    params = { 
+--      radius = Distance,
+--      priority = number
+--    } 
+--  }
+
+  local DCSTask
+  DCSTask = { id = 'FAC',
+    params = {
+      radius = Radius,
+      priority = Priority
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
+end
+
+
 
 
 --- Move the group to a Vec2 Point, wait for a defined duration and embark a group.
@@ -5159,22 +5854,22 @@ end
 -- @param #GROUP EmbarkingGroup The group to be embarked.
 -- @return DCSTask#Task The DCS task structure
 function GROUP:TaskEmbarkingAtVec2( Point, Duration, EmbarkingGroup )
-	self:F2( { self.GroupName, Point, Duration, EmbarkingGroup.DCSGroup } )
+  self:F2( { self.GroupName, Point, Duration, EmbarkingGroup.DCSGroup } )
 
-	local DCSTask 
-	DCSTask =  { id = 'Embarking', 
-	             params = { x = Point.x, 
-    	                    y = Point.y, 
-    		  							  duration = Duration, 
-    			  						  groupsForEmbarking = { EmbarkingGroup.GroupID },
-    				  					  durationFlag = true,
-    					  				  distributionFlag = false,
-    						  			  distribution = {},
-    						  			} 
-    				 }
-	
-	self:T3( { DCSTask } )
-	return DCSTask
+  local DCSTask
+  DCSTask =  { id = 'Embarking',
+    params = { x = Point.x,
+      y = Point.y,
+      duration = Duration,
+      groupsForEmbarking = { EmbarkingGroup.GroupID },
+      durationFlag = true,
+      distributionFlag = false,
+      distribution = {},
+    }
+  }
+
+  self:T3( { DCSTask } )
+  return DCSTask
 end
 
 --- Move to a defined Vec2 Point, and embark to a group when arrived within a defined Radius.
@@ -5183,30 +5878,30 @@ end
 -- @param #number Radius The radius of the embarking zone around the Point.
 -- @return DCSTask#Task The DCS task structure.
 function GROUP:TaskEmbarkToTransportAtVec2( Point, Radius )
-	self:F2( { self.GroupName, Point, Radius } )
+  self:F2( { self.GroupName, Point, Radius } )
 
   local DCSTask --DCSTask#Task
-	DCSTask = { id = 'EmbarkToTransport', 
-	            params = { x = Point.x, 
-				  	             y = Point.y, 
-		    							   zoneRadius = Radius,
-						           } 
-						} 
+  DCSTask = { id = 'EmbarkToTransport',
+    params = { x = Point.x,
+      y = Point.y,
+      zoneRadius = Radius,
+    }
+  }
 
   self:T3( { DCSTask } )
-	return DCSTask
+  return DCSTask
 end
 
 --- Return a Misson task from a mission template.
 -- @param #GROUP self
 -- @param #table TaskMission A table containing the mission task.
--- @return DCSTask#Task 
+-- @return DCSTask#Task
 function GROUP:TaskMission( TaskMission )
-	self:F2( Points )
-  
+  self:F2( Points )
+
   local DCSTask
   DCSTask = { id = 'Mission', params = { TaskMission, }, }
-  
+
   self:T3( { DCSTask } )
   return DCSTask
 end
@@ -5214,13 +5909,13 @@ end
 --- Return a Misson task to follow a given route defined by Points.
 -- @param #GROUP self
 -- @param #table Points A table of route points.
--- @return DCSTask#Task 
+-- @return DCSTask#Task
 function GROUP:TaskRoute( Points )
   self:F2( Points )
-  
+
   local DCSTask
   DCSTask = { id = 'Mission', params = { route = { points = Points, }, }, }
-  
+
   self:T3( { DCSTask } )
   return DCSTask
 end
@@ -5234,22 +5929,22 @@ function GROUP:TaskRouteToVec2( Point, Speed )
   self:F2( { Point, Speed } )
 
   local GroupPoint = self:GetUnit( 1 ):GetPointVec2()
-  
+
   local PointFrom = {}
   PointFrom.x = GroupPoint.x
   PointFrom.y = GroupPoint.y
   PointFrom.type = "Turning Point"
   PointFrom.action = "Turning Point"
-  PointFrom.speed = Speed  
+  PointFrom.speed = Speed
   PointFrom.speed_locked = true
   PointFrom.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
-  
+
 
   local PointTo = {}
   PointTo.x = Point.x
@@ -5259,18 +5954,18 @@ function GROUP:TaskRouteToVec2( Point, Speed )
   PointTo.speed = Speed
   PointTo.speed_locked = true
   PointTo.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
 
-  
+
   local Points = { PointFrom, PointTo }
-  
+
   self:T3( Points )
-  
+
   self:Route( Points )
 
   return self
@@ -5285,7 +5980,7 @@ function GROUP:TaskRouteToVec3( Point, Speed )
   self:F2( { Point, Speed } )
 
   local GroupPoint = self:GetUnit( 1 ):GetPointVec3()
-  
+
   local PointFrom = {}
   PointFrom.x = GroupPoint.x
   PointFrom.y = GroupPoint.z
@@ -5293,39 +5988,39 @@ function GROUP:TaskRouteToVec3( Point, Speed )
   PointFrom.alt_type = "BARO"
   PointFrom.type = "Turning Point"
   PointFrom.action = "Turning Point"
-  PointFrom.speed = Speed  
+  PointFrom.speed = Speed
   PointFrom.speed_locked = true
   PointFrom.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
-  
+
 
   local PointTo = {}
   PointTo.x = Point.x
   PointTo.y = Point.z
-  PointTo.alt = Point.y  
+  PointTo.alt = Point.y
   PointTo.alt_type = "BARO"
   PointTo.type = "Turning Point"
   PointTo.action = "Fly Over Point"
   PointTo.speed = Speed
   PointTo.speed_locked = true
   PointTo.properties = {
-        ["vnav"] = 1,
-        ["scale"] = 0,
-        ["angle"] = 0,
-        ["vangle"] = 0,
-        ["steer"] = 2,
+    ["vnav"] = 1,
+    ["scale"] = 0,
+    ["angle"] = 0,
+    ["vangle"] = 0,
+    ["steer"] = 2,
   }
 
-  
+
   local Points = { PointFrom, PointTo }
-  
+
   self:T3( Points )
-  
+
   self:Route( Points )
 
   return self
@@ -5336,22 +6031,22 @@ end
 --- Make the group to follow a given route.
 -- @param #GROUP self
 -- @param #table GoPoints A table of Route Points.
--- @return #GROUP self 
+-- @return #GROUP self
 function GROUP:Route( GoPoints )
-	self:F2( GoPoints )
+  self:F2( GoPoints )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	local Points = routines.utils.deepCopy( GoPoints )
-  	local MissionTask = { id = 'Mission', params = { route = { points = Points, }, }, }
-  	local Controller = self:_GetController()
+    local Points = routines.utils.deepCopy( GoPoints )
+    local MissionTask = { id = 'Mission', params = { route = { points = Points, }, }, }
+    local Controller = self:_GetController()
     --Controller.setTask( Controller, MissionTask )
-  	--routines.scheduleFunction( Controller.setTask, { Controller, MissionTask}, timer.getTime() + 1 )
+    --routines.scheduleFunction( Controller.setTask, { Controller, MissionTask}, timer.getTime() + 1 )
     SCHEDULER:New( Controller, Controller.setTask, { MissionTask }, 1 )
-  	return self
+    return self
   end
-  
+
   return nil
 end
 
@@ -5367,56 +6062,56 @@ end
 -- @param #number Speed The speed.
 -- @param Base#FORMATION Formation The formation string.
 function GROUP:TaskRouteToZone( Zone, Randomize, Speed, Formation )
-	self:F2( Zone )
+  self:F2( Zone )
 
   local DCSGroup = self:GetDCSGroup()
-  
+
   if DCSGroup then
-  	
-  	local GroupPoint = self:GetPointVec2()
-  	
-  	local PointFrom = {}
-  	PointFrom.x = GroupPoint.x
-  	PointFrom.y = GroupPoint.y
-  	PointFrom.type = "Turning Point"
-  	PointFrom.action = "Cone"
-  	PointFrom.speed = 20 / 1.6
-  	
-  
-  	local PointTo = {}
-  	local ZonePoint 
-  	
-  	if Randomize then
-  		ZonePoint = Zone:GetRandomPointVec2()
-  	else
-  		ZonePoint = Zone:GetPointVec2()
-  	end
-  
-  	PointTo.x = ZonePoint.x
-  	PointTo.y = ZonePoint.y
-  	PointTo.type = "Turning Point"
-  	
-  	if Formation then
-  		PointTo.action = Formation
-  	else
-  		PointTo.action = "Cone"
-  	end
-  	
-  	if Speed then
-  		PointTo.speed = Speed
-  	else
-  		PointTo.speed = 20 / 1.6
-  	end
-  	
-  	local Points = { PointFrom, PointTo }
-  	
-  	self:T3( Points )
-  	
-  	self:Route( Points )
-  	
-  	return self
+
+    local GroupPoint = self:GetPointVec2()
+
+    local PointFrom = {}
+    PointFrom.x = GroupPoint.x
+    PointFrom.y = GroupPoint.y
+    PointFrom.type = "Turning Point"
+    PointFrom.action = "Cone"
+    PointFrom.speed = 20 / 1.6
+
+
+    local PointTo = {}
+    local ZonePoint
+
+    if Randomize then
+      ZonePoint = Zone:GetRandomPointVec2()
+    else
+      ZonePoint = Zone:GetPointVec2()
+    end
+
+    PointTo.x = ZonePoint.x
+    PointTo.y = ZonePoint.y
+    PointTo.type = "Turning Point"
+
+    if Formation then
+      PointTo.action = Formation
+    else
+      PointTo.action = "Cone"
+    end
+
+    if Speed then
+      PointTo.speed = Speed
+    else
+      PointTo.speed = 20 / 1.6
+    end
+
+    local Points = { PointFrom, PointTo }
+
+    self:T3( Points )
+
+    self:Route( Points )
+
+    return self
   end
-  
+
   return nil
 end
 
@@ -5463,48 +6158,48 @@ end
 -- @param #number Begin The route point from where the copy will start. The base route point is 0.
 -- @param #number End The route point where the copy will end. The End point is the last point - the End point. The last point has base 0.
 -- @param #boolean Randomize Randomization of the route, when true.
--- @param #number Radius When randomization is on, the randomization is within the radius. 
+-- @param #number Radius When randomization is on, the randomization is within the radius.
 function GROUP:CopyRoute( Begin, End, Randomize, Radius )
-	self:F2( { Begin, End } )
+  self:F2( { Begin, End } )
 
-	local Points = {}
-	
-	-- Could be a Spawned Group
-	local GroupName = string.match( self:GetName(), ".*#" )
-	if GroupName then
-		GroupName = GroupName:sub( 1, -2 )
-	else
-		GroupName = self:GetName()
-	end
-	
-	self:T3( { GroupName } )
-	
-	local Template = _DATABASE.Templates.Groups[GroupName].Template
-	
-	if Template then
-		if not Begin then
-			Begin = 0
-		end
-		if not End then
-			End = 0
-		end
-	
-		for TPointID = Begin + 1, #Template.route.points - End do
-			if Template.route.points[TPointID] then
-				Points[#Points+1] = routines.utils.deepCopy( Template.route.points[TPointID] )
-				if Randomize then
-					if not Radius then
-						Radius = 500
-					end
-					Points[#Points].x = Points[#Points].x + math.random( Radius * -1, Radius )
-					Points[#Points].y = Points[#Points].y + math.random( Radius * -1, Radius )
-				end	
-			end
-		end
-		return Points
-	end
-	
-	return nil
+  local Points = {}
+
+  -- Could be a Spawned Group
+  local GroupName = string.match( self:GetName(), ".*#" )
+  if GroupName then
+    GroupName = GroupName:sub( 1, -2 )
+  else
+    GroupName = self:GetName()
+  end
+
+  self:T3( { GroupName } )
+
+  local Template = _DATABASE.Templates.Groups[GroupName].Template
+
+  if Template then
+    if not Begin then
+      Begin = 0
+    end
+    if not End then
+      End = 0
+    end
+
+    for TPointID = Begin + 1, #Template.route.points - End do
+      if Template.route.points[TPointID] then
+        Points[#Points+1] = routines.utils.deepCopy( Template.route.points[TPointID] )
+        if Randomize then
+          if not Radius then
+            Radius = 500
+          end
+          Points[#Points].x = Points[#Points].x + math.random( Radius * -1, Radius )
+          Points[#Points].y = Points[#Points].y + math.random( Radius * -1, Radius )
+        end
+      end
+    end
+    return Points
+  end
+
+  return nil
 end
 
 
@@ -5515,28 +6210,28 @@ function GROUP:GetDetectedTargets()
   if DCSGroup then
     return self:_GetController():getDetectedTargets()
   end
-  
+
   return nil
 end
 
 function GROUP:IsTargetDetected( DCSObject )
   self:F2( self.GroupName )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
-  
+
     local TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity
-          = self:_GetController().isTargetDetected( self:_GetController(), DCSObject, 
-                                                    Controller.Detection.VISUAL,
-                                                    Controller.Detection.OPTIC,
-                                                    Controller.Detection.RADAR,
-                                                    Controller.Detection.IRST,
-                                                    Controller.Detection.RWR,
-                                                    Controller.Detection.DLINK
-                                                  )
+      = self:_GetController().isTargetDetected( self:_GetController(), DCSObject,
+        Controller.Detection.VISUAL,
+        Controller.Detection.OPTIC,
+        Controller.Detection.RADAR,
+        Controller.Detection.IRST,
+        Controller.Detection.RWR,
+        Controller.Detection.DLINK
+      )
     return TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity
   end
-   
+
   return nil
 end
 
@@ -5547,16 +6242,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEHoldFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5564,12 +6259,12 @@ end
 -- @param Group#GROUP self
 -- @return Group#GROUP self
 function GROUP:OptionROEHoldFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_HOLD )
     elseif self:IsGround() then
@@ -5577,10 +6272,10 @@ function GROUP:OptionROEHoldFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.WEAPON_HOLD )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5589,16 +6284,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEReturnFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5606,12 +6301,12 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEReturnFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.RETURN_FIRE )
     elseif self:IsGround() then
@@ -5619,10 +6314,10 @@ function GROUP:OptionROEReturnFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.RETURN_FIRE )
     end
-     
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5637,10 +6332,10 @@ function GROUP:OptionROEOpenFirePossible()
     if self:IsAir() or self:IsGround() or self:IsShip() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5648,12 +6343,12 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEOpenFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.OPEN_FIRE )
     elseif self:IsGround() then
@@ -5661,10 +6356,10 @@ function GROUP:OptionROEOpenFire()
     elseif self:IsShip() then
       Controller:setOption( AI.Option.Naval.id.ROE, AI.Option.Naval.val.ROE.OPEN_FIRE )
     end
-  
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5673,16 +6368,16 @@ end
 -- @return #boolean
 function GROUP:OptionROEWeaponFreePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5690,19 +6385,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROEWeaponFree()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_FREE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5711,16 +6406,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTNoReactionPossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5729,19 +6424,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTNoReaction()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.NO_REACTION )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5756,10 +6451,10 @@ function GROUP:OptionROTPassiveDefensePossible()
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5767,19 +6462,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTPassiveDefense()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENCE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5788,16 +6483,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTEvadeFirePossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5806,19 +6501,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTEvadeFire()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.EVADE_FIRE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5827,16 +6522,16 @@ end
 -- @return #boolean
 function GROUP:OptionROTVerticalPossible()
   self:F2( { self.GroupName } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     if self:IsAir() then
       return true
     end
-    
+
     return false
   end
-  
+
   return nil
 end
 
@@ -5845,19 +6540,19 @@ end
 -- @param #GROUP self
 -- @return #GROUP self
 function GROUP:OptionROTVertical()
-	self:F2( { self.GroupName } )
+  self:F2( { self.GroupName } )
 
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     local Controller = self:_GetController()
-    
+
     if self:IsAir() then
       Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.BYPASS_AND_ESCAPE )
     end
-    
+
     return self
   end
-  
+
   return nil
 end
 
@@ -5870,12 +6565,12 @@ end
 -- @return Message#MESSAGE
 function GROUP:Message( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     return MESSAGE:New( Message, self:GetCallsign() .. " (" .. self:GetTypeName() .. ")", Duration, self:GetClassNameAndID() )
   end
-  
+
   return nil
 end
 
@@ -5886,12 +6581,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToAll( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToAll()
   end
-  
+
   return nil
 end
 
@@ -5902,12 +6597,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToRed( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToRed()
   end
-  
+
   return nil
 end
 
@@ -5918,12 +6613,12 @@ end
 -- @param #Duration Duration The duration of the message.
 function GROUP:MessageToBlue( Message, Duration )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToBlue()
   end
-  
+
   return nil
 end
 
@@ -5935,12 +6630,12 @@ end
 -- @param Client#CLIENT Client The client object receiving the message.
 function GROUP:MessageToClient( Message, Duration, Client )
   self:F2( { Message, Duration } )
-  
+
   local DCSGroup = self:GetDCSGroup()
   if DCSGroup then
     self:Message( Message, Duration ):ToClient( Client )
   end
-  
+
   return nil
 end
 --- UNIT Class
@@ -7277,67 +7972,37 @@ function CLIENT:Message( Message, MessageDuration, MessageId, MessageCategory, M
 		end
 	end
 end
---- Manage sets of units and groups. 
+--- Manage the mission database. 
 -- 
--- @{#Database} class
+-- @{#DATABASE} class
 -- ==================
--- Mission designers can use the DATABASE class to build sets of units belonging to certain:
+-- Mission designers can use the DATABASE class to refer to:
 -- 
---  * Coalitions
---  * Categories
---  * Countries
---  * Unit types
---  * Starting with certain prefix strings.
+--  * UNITS
+--  * GROUPS
+--  * players
+--  * alive players
+--  * CLIENTS
+--  * alive CLIENTS
 --  
--- This list will grow over time. Planned developments are to include filters and iterators.
--- Additional filters will be added around @{Zone#ZONEs}, Radiuses, Active players, ...
--- More iterators will be implemented in the near future ...
---
--- Administers the Initial Sets of the Mission Templates as defined within the Mission Editor.
--- 
--- DATABASE construction methods:
--- =================================
--- Create a new DATABASE object with the @{#DATABASE.New} method:
--- 
---    * @{#DATABASE.New}: Creates a new DATABASE object.
---   
--- 
--- DATABASE filter criteria: 
--- =========================
--- You can set filter criteria to define the set of units within the database.
--- Filter criteria are defined by:
--- 
---    * @{#DATABASE.FilterCoalitions}: Builds the DATABASE with the units belonging to the coalition(s).
---    * @{#DATABASE.FilterCategories}: Builds the DATABASE with the units belonging to the category(ies).
---    * @{#DATABASE.FilterTypes}: Builds the DATABASE with the units belonging to the unit type(s).
---    * @{#DATABASE.FilterCountries}: Builds the DATABASE with the units belonging to the country(ies).
---    * @{#DATABASE.FilterUnitPrefixes}: Builds the DATABASE with the units starting with the same prefix string(s).
---   
--- Once the filter criteria have been set for the DATABASE, you can start filtering using:
--- 
---   * @{#DATABASE.FilterStart}: Starts the filtering of the units within the database.
--- 
--- Planned filter criteria within development are (so these are not yet available):
--- 
---    * @{#DATABASE.FilterGroupPrefixes}: Builds the DATABASE with the groups of the units starting with the same prefix string(s).
---    * @{#DATABASE.FilterZones}: Builds the DATABASE with the units within a @{Zone#ZONE}.
+-- On top, for internal MOOSE administration purposes, the DATBASE administers the Unit and Gruop templates as defined within the Mission Editor.
 -- 
+-- Moose will automatically create one instance of the DATABASE class into the **global** object _DATABASE.
+-- Moose refers to _DATABASE within the framework extensively, but you can also refer to the _DATABASE object within your missions if required.
 -- 
 -- DATABASE iterators:
 -- ===================
--- Once the filters have been defined and the DATABASE has been built, you can iterate the database with the available iterator methods.
+-- You can iterate the database with the available iterator methods.
 -- The iterator methods will walk the DATABASE set, and call for each element within the set a function that you provide.
 -- The following iterator methods are currently available within the DATABASE:
 -- 
---   * @{#DATABASE.ForEachAliveUnit}: Calls a function for each alive unit it finds within the DATABASE.
+--   * @{#DATABASE.ForEachUnit}: Calls a function for each @{UNIT} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachGroup}: Calls a function for each @{GROUP} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachPlayer}: Calls a function for each player it finds within the DATABASE.
+--   * @{#DATABASE.ForEachPlayerAlive}: Calls a function for each alive player it finds within the DATABASE.
+--   * @{#DATABASE.ForEachClient}: Calls a function for each @{CLIENT} it finds within the DATABASE.
+--   * @{#DATABASE.ForEachClientAlive}: Calls a function for each alive @{CLIENT} it finds within the DATABASE.
 --   
--- Planned iterators methods in development are (so these are not yet available):
--- 
---   * @{#DATABASE.ForEachUnit}: Calls a function for each unit contained within the DATABASE.
---   * @{#DATABASE.ForEachGroup}: Calls a function for each group contained within the DATABASE.
---   * @{#DATABASE.ForEachUnitInZone}: Calls a function for each unit within a certain zone contained within the DATABASE.
--- 
--- ====
 -- @module Database
 -- @author FlightControl
 
@@ -7349,6 +8014,7 @@ Include.File( "Unit" )
 Include.File( "Event" )
 Include.File( "Client" )
 
+
 --- DATABASE class
 -- @type DATABASE
 -- @extends Base#BASE
@@ -7364,34 +8030,11 @@ DATABASE = {
   DCSGroups = {},
   UNITS = {},
   GROUPS = {},
-  NavPoints = {},
-  Statics = {},
-  Players = {},
-  PlayersAlive = {},
+  PLAYERS = {},
+  PLAYERSALIVE = {},
   CLIENTS = {},
-  ClientsAlive = {},
-  Filter = {
-    Coalitions = nil,
-    Categories = nil,
-    Types = nil,
-    Countries = nil,
-    UnitPrefixes = nil,
-    GroupPrefixes = nil,
-  },
-  FilterMeta = {
-    Coalitions = {
-      red = coalition.side.RED,
-      blue = coalition.side.BLUE,
-      neutral = coalition.side.NEUTRAL,
-    },
-    Categories = {
-      plane = Unit.Category.AIRPLANE,
-      helicopter = Unit.Category.HELICOPTER,
-      ground = Unit.Category.GROUND_UNIT,
-      ship = Unit.Category.SHIP,
-      structure = Unit.Category.STRUCTURE,
-    },
-  },
+  CLIENTSALIVE = {},
+  NavPoints = {},
 }
 
 local _DATABASECoalition =
@@ -7426,12 +8069,13 @@ function DATABASE:New()
   _EVENTDISPATCHER:OnCrash( self._EventOnDeadOrCrash, self )
   
   
-  -- Add database with registered clients and already alive players
-  
   -- Follow alive players and clients
   _EVENTDISPATCHER:OnPlayerEnterUnit( self._EventOnPlayerEnterUnit, self )
   _EVENTDISPATCHER:OnPlayerLeaveUnit( self._EventOnPlayerLeaveUnit, self )
   
+  self:_RegisterTemplates()
+  self:_RegisterDatabase()
+  self:_RegisterPlayers()
   
   return self
 end
@@ -7446,6 +8090,7 @@ function DATABASE:FindUnit( UnitName )
   return UnitFound
 end
 
+
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddUnit( DCSUnit, DCSUnitName )
@@ -7454,6 +8099,7 @@ function DATABASE:AddUnit( DCSUnit, DCSUnitName )
   self.UNITS[DCSUnitName] = UNIT:Register( DCSUnitName )
 end
 
+
 --- Deletes a Unit from the DATABASE based on the Unit Name.
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
@@ -7461,6 +8107,7 @@ function DATABASE:DeleteUnit( DCSUnitName )
   self.DCSUnits[DCSUnitName] = nil 
 end
 
+
 --- Finds a CLIENT based on the ClientName.
 -- @param #DATABASE self
 -- @param #string ClientName
@@ -7471,6 +8118,7 @@ function DATABASE:FindClient( ClientName )
   return ClientFound
 end
 
+
 --- Adds a CLIENT based on the ClientName in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddClient( ClientName )
@@ -7479,6 +8127,7 @@ function DATABASE:AddClient( ClientName )
   self:E( self.CLIENTS[ClientName]:GetClassNameAndID() )
 end
 
+
 --- Finds a GROUP based on the GroupName.
 -- @param #DATABASE self
 -- @param #string GroupName
@@ -7489,6 +8138,7 @@ function DATABASE:FindGroup( GroupName )
   return GroupFound
 end
 
+
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddGroup( DCSGroup, GroupName )
@@ -7497,6 +8147,30 @@ function DATABASE:AddGroup( DCSGroup, GroupName )
   self.GROUPS[GroupName] = GROUP:Register( GroupName )
 end
 
+--- Adds a player based on the Player Name in the DATABASE.
+-- @param #DATABASE self
+function DATABASE:AddPlayer( UnitName, PlayerName )
+
+  if PlayerName then
+    self:E( { "Add player for unit:", UnitName, PlayerName } )
+    self.PLAYERS[PlayerName] = PlayerName
+    self.PLAYERSALIVE[PlayerName] = PlayerName
+    self.CLIENTSALIVE[PlayerName] = self:FindClient( UnitName )
+  end
+end
+
+--- Deletes a player from the DATABASE based on the Player Name.
+-- @param #DATABASE self
+function DATABASE:DeletePlayer( PlayerName )
+
+  if PlayerName then
+    self:E( { "Clean player:", PlayerName } )
+    self.PLAYERSALIVE[PlayerName] = nil
+    self.CLIENTSALIVE[PlayerName] = nil
+  end
+end
+
+
 --- Instantiate new Groups within the DCSRTE.
 -- This method expects EXACTLY the same structure as a structure within the ME, and needs 2 additional fields defined:
 -- SpawnCountryID, SpawnCategoryID
@@ -7505,9 +8179,9 @@ end
 -- @param #table SpawnTemplate
 -- @return #DATABASE self
 function DATABASE:Spawn( SpawnTemplate )
-  self:F( SpawnTemplate.name )
+  self:F2( SpawnTemplate.name )
 
-  self:T( { SpawnTemplate.SpawnCountryID, SpawnTemplate.SpawnCategoryID } )
+  self:T2( { SpawnTemplate.SpawnCountryID, SpawnTemplate.SpawnCategoryID } )
 
   -- Copy the spawn variables of the template in temporary storage, nullify, and restore the spawn variables.
   local SpawnCoalitionID = SpawnTemplate.SpawnCoalitionID
@@ -7519,7 +8193,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.SpawnCountryID = nil
   SpawnTemplate.SpawnCategoryID = nil
 
-  self:_RegisterGroup( SpawnTemplate )
+  self:_RegisterTemplate( SpawnTemplate )
   coalition.addGroup( SpawnCountryID, SpawnCategoryID, SpawnTemplate )
 
   -- Restore
@@ -7532,18 +8206,16 @@ function DATABASE:Spawn( SpawnTemplate )
   return SpawnGroup
 end
 
-
 --- Set a status to a Group within the Database, this to check crossing events for example.
 function DATABASE:SetStatusGroup( GroupName, Status )
-  self:F( Status )
+  self:F2( Status )
 
   self.Templates.Groups[GroupName].Status = Status
 end
 
-
 --- Get a status to a Group within the Database, this to check crossing events for example.
 function DATABASE:GetStatusGroup( GroupName )
-  self:F( Status )
+  self:F2( Status )
 
   if self.Templates.Groups[GroupName] then
     return self.Templates.Groups[GroupName].Status
@@ -7552,11 +8224,12 @@ function DATABASE:GetStatusGroup( GroupName )
   end
 end
 
+
 --- Private method that registers new Group Templates within the DATABASE Object.
 -- @param #DATABASE self
 -- @param #table GroupTemplate
 -- @return #DATABASE self
-function DATABASE:_RegisterGroup( GroupTemplate )
+function DATABASE:_RegisterTemplate( GroupTemplate )
 
   local GroupTemplateName = env.getValueDictByKey(GroupTemplate.name)
 
@@ -7576,7 +8249,7 @@ function DATABASE:_RegisterGroup( GroupTemplate )
   self.Templates.Groups[GroupTemplateName].UnitCount = #GroupTemplate.units
   self.Templates.Groups[GroupTemplateName].Units = GroupTemplate.units
 
-  self:T( { "Group", self.Templates.Groups[GroupTemplateName].GroupName, self.Templates.Groups[GroupTemplateName].UnitCount } )
+  self:T2( { "Group", self.Templates.Groups[GroupTemplateName].GroupName, self.Templates.Groups[GroupTemplateName].UnitCount } )
 
   for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do
 
@@ -7596,6 +8269,7 @@ function DATABASE:_RegisterGroup( GroupTemplate )
   end
 end
 
+
 --- Private method that registers all alive players in the mission.
 -- @param #DATABASE self
 -- @return #DATABASE self
@@ -7607,9 +8281,10 @@ function DATABASE:_RegisterPlayers()
       self:T3( { "UnitData:", UnitData } )
       if UnitData and UnitData:isExist() then
         local UnitName = UnitData:getName()
-        if not self.PlayersAlive[UnitName] then
-          self:E( { "Add player for unit:", UnitName, UnitData:getPlayerName() } )
-          self.PlayersAlive[UnitName] = UnitData:getPlayerName()
+        local PlayerName = UnitData:getPlayerName()
+        if not self.PLAYERS[PlayerName] then
+          self:E( { "Add player for unit:", UnitName, PlayerName } )
+          self:AddPlayer( UnitName, PlayerName )
         end
       end
     end
@@ -7618,6 +8293,7 @@ function DATABASE:_RegisterPlayers()
   return self
 end
 
+
 --- Private method that registers all datapoints within in the mission.
 -- @param #DATABASE self
 -- @return #DATABASE self
@@ -7660,22 +8336,21 @@ end
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnBirth( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
-      self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
-      self:_EventOnPlayerEnterUnit( Event )
-    end
+    self:AddUnit( Event.IniDCSUnit, Event.IniDCSUnitName )
+    self:AddGroup( Event.IniDCSGroup, Event.IniDCSGroupName )
+    self:_EventOnPlayerEnterUnit( Event )
   end
 end
 
+
 --- Handles the OnDead or OnCrash event for alive units set.
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnDeadOrCrash( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
     if self.DCSUnits[Event.IniDCSUnitName] then
@@ -7685,48 +8360,44 @@ function DATABASE:_EventOnDeadOrCrash( Event )
   end
 end
 
+
 --- Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnPlayerEnterUnit( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if not self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Add player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = Event.IniDCSUnit:getPlayerName()
-        self.ClientsAlive[Event.IniDCSUnitName] = self.CLIENTS[ Event.IniDCSUnitName ]
-      end
+    local PlayerName = Event.IniDCSUnit:getPlayerName()
+    if not self.PLAYERSALIVE[PlayerName] then
+      self:AddPlayer( Event.IniDCSUnitName, PlayerName )
     end
   end
 end
 
+
 --- Handles the OnPlayerLeaveUnit event to clean the active players table.
 -- @param #DATABASE self
 -- @param Event#EVENTDATA Event
 function DATABASE:_EventOnPlayerLeaveUnit( Event )
-  self:F( { Event } )
+  self:F2( { Event } )
 
   if Event.IniDCSUnit then
-    if self:_IsIncludeDCSUnit( Event.IniDCSUnit ) then
-      if self.PlayersAlive[Event.IniDCSUnitName] then
-        self:E( { "Cleaning player for unit:", Event.IniDCSUnitName, Event.IniDCSUnit:getPlayerName() } )
-        self.PlayersAlive[Event.IniDCSUnitName] = nil
-        self.ClientsAlive[Event.IniDCSUnitName] = nil
-      end
+    local PlayerName = Event.IniDCSUnit:getPlayerName()
+    if self.PLAYERSALIVE[PlayerName] then
+      self:DeletePlayer( PlayerName )
     end
   end
 end
 
 --- Iterators
 
---- Interate the DATABASE and call an interator function for the given set, providing the Object for each element within the set and optional parameters.
+--- Iterate the DATABASE and call an iterator function for the given set, providing the Object for each element within the set and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the database.
 -- @return #DATABASE self
 function DATABASE:ForEach( IteratorFunction, arg, Set )
-  self:F( arg )
+  self:F2( arg )
   
   local function CoRoutine()
     local Count = 0
@@ -7746,7 +8417,7 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
   local function Schedule()
   
     local status, res = coroutine.resume( co )
-    self:T( { status, res } )
+    self:T2( { status, res } )
     
     if status == false then
       error( res )
@@ -7764,46 +8435,96 @@ function DATABASE:ForEach( IteratorFunction, arg, Set )
 end
 
 
---- Interate the DATABASE and call an interator function for each **alive** unit, providing the Unit and optional parameters.
+--- 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 UNIT parameter.
+-- @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:F( arg )
+  self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.DCSUnits )
 
   return self
 end
 
---- Interate the DATABASE and call an interator function for each **alive** player, providing the Unit of the player and optional parameters.
+
+--- 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 player in the database. The function needs to accept a UNIT parameter.
+-- @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.
+-- @return #DATABASE self
+function DATABASE:ForEachUnit( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.UNITS )
+
+  return self
+end
+
+--- Iterate the DATABASE and call an iterator function for each **alive** GROUP, providing the GROUP and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive GROUP in the database. The function needs to accept a GROUP parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachGroup( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.GROUPS )
+
+  return self
+end
+
+
+--- Iterate the DATABASE and call an iterator function for each player, providing the player name and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an player in the database. The function needs to accept the player name.
 -- @return #DATABASE self
 function DATABASE:ForEachPlayer( IteratorFunction, ... )
-  self:F( arg )
+  self:F2( arg )
   
-  self:ForEach( IteratorFunction, arg, self.PlayersAlive )
+  self:ForEach( IteratorFunction, arg, self.PLAYERS )
   
   return self
 end
 
 
---- Interate the DATABASE and call an interator function for each client, providing the Client to the function and optional parameters.
+--- Iterate the DATABASE and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive player in the database. The function needs to accept a UNIT parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachPlayerAlive( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.PLAYERSALIVE )
+  
+  return self
+end
+
+--- Iterate the DATABASE and call an iterator function for each CLIENT, providing the CLIENT to the function and optional parameters.
 -- @param #DATABASE self
 -- @param #function IteratorFunction The function that will be called when there is an alive player in the database. The function needs to accept a CLIENT parameter.
 -- @return #DATABASE self
 function DATABASE:ForEachClient( IteratorFunction, ... )
-  self:F( arg )
+  self:F2( arg )
   
   self:ForEach( IteratorFunction, arg, self.CLIENTS )
 
   return self
 end
 
+--- Iterate the DATABASE and call an iterator function for each **ALIVE** CLIENT, providing the CLIENT to the function and optional parameters.
+-- @param #DATABASE self
+-- @param #function IteratorFunction The function that will be called when there is an alive CLIENT in the database. The function needs to accept a CLIENT parameter.
+-- @return #DATABASE self
+function DATABASE:ForEachClientAlive( IteratorFunction, ... )
+  self:F2( arg )
+  
+  self:ForEach( IteratorFunction, arg, self.CLIENTSALIVE )
 
-function DATABASE:ScanEnvironment()
-  self:F()
+  return self
+end
+
+
+function DATABASE:_RegisterTemplates()
+  self:F2()
 
   self.Navpoints = {}
   self.UNITS = {}
@@ -7853,7 +8574,7 @@ function DATABASE:ScanEnvironment()
                   for group_num, GroupTemplate in pairs(obj_type_data.group) do
 
                     if GroupTemplate and GroupTemplate.units and type(GroupTemplate.units) == 'table' then  --making sure again- this is a valid group
-                      self:_RegisterGroup( GroupTemplate )
+                      self:_RegisterTemplate( GroupTemplate )
                     end --if GroupTemplate and GroupTemplate.units then
                   end --for group_num, GroupTemplate in pairs(obj_type_data.group) do
                 end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
@@ -7865,121 +8586,10 @@ function DATABASE:ScanEnvironment()
     end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
   end --for coa_name, coa_data in pairs(mission.coalition) do
 
-  self:_RegisterDatabase()
-  self:_RegisterPlayers()
-
   return self
 end
 
 
----
--- @param #DATABASE self
--- @param DCSUnit#Unit DCSUnit
--- @return #DATABASE self
-function DATABASE:_IsIncludeDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitInclude = true
-
-  if self.Filter.Coalitions then
-    local DCSUnitCoalition = false
-    for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
-      self:T( { "Coalition:", DCSUnit:getCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
-      if self.FilterMeta.Coalitions[CoalitionName] and self.FilterMeta.Coalitions[CoalitionName] == DCSUnit:getCoalition() then
-        DCSUnitCoalition = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCoalition
-  end
-  
-  if self.Filter.Categories then
-    local DCSUnitCategory = false
-    for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
-      self:T( { "Category:", DCSUnit:getDesc().category, self.FilterMeta.Categories[CategoryName], CategoryName } )
-      if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == DCSUnit:getDesc().category then
-        DCSUnitCategory = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCategory
-  end
-  
-  if self.Filter.Types then
-    local DCSUnitType = false
-    for TypeID, TypeName in pairs( self.Filter.Types ) do
-      self:T( { "Type:", DCSUnit:getTypeName(), TypeName } )
-      if TypeName == DCSUnit:getTypeName() then
-        DCSUnitType = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitType
-  end
-  
-  if self.Filter.Countries then
-    local DCSUnitCountry = false
-    for CountryID, CountryName in pairs( self.Filter.Countries ) do
-      self:T( { "Country:", DCSUnit:getCountry(), CountryName } )
-      if country.id[CountryName] == DCSUnit:getCountry() then
-        DCSUnitCountry = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitCountry
-  end
-
-  if self.Filter.UnitPrefixes then
-    local DCSUnitPrefix = false
-    for UnitPrefixId, UnitPrefix in pairs( self.Filter.UnitPrefixes ) do
-      self:T( { "Unit Prefix:", string.find( DCSUnit:getName(), UnitPrefix, 1 ), UnitPrefix } )
-      if string.find( DCSUnit:getName(), UnitPrefix, 1 ) then
-        DCSUnitPrefix = true
-      end
-    end
-    DCSUnitInclude = DCSUnitInclude and DCSUnitPrefix
-  end
-
-  self:T( DCSUnitInclude )
-  return DCSUnitInclude
-end
-
----
--- @param #DATABASE self
--- @param DCSUnit#Unit DCSUnit
--- @return #DATABASE self
-function DATABASE:_IsAliveDCSUnit( DCSUnit )
-  self:F( DCSUnit )
-  local DCSUnitAlive = false
-  if DCSUnit and DCSUnit:isExist() and DCSUnit:isActive() then
-    if self.DCSUnits[DCSUnit:getName()] then
-      DCSUnitAlive = true
-    end
-  end
-  self:T( DCSUnitAlive )
-  return DCSUnitAlive
-end
-
----
--- @param #DATABASE self
--- @param DCSGroup#Group DCSGroup
--- @return #DATABASE self
-function DATABASE:_IsAliveDCSGroup( DCSGroup )
-  self:F( DCSGroup )
-  local DCSGroupAlive = false
-  if DCSGroup and DCSGroup:isExist() then
-    if self.DCSGroups[DCSGroup:getName()] then
-      DCSGroupAlive = true
-    end
-  end
-  self:T( DCSGroupAlive )
-  return DCSGroupAlive
-end
-
-
---- Traces the current database contents in the log ... (for debug reasons).
--- @param #DATABASE self
--- @return #DATABASE self
-function DATABASE:TraceDatabase()
-  self:F()
-  
-  self:T( { "DCSUnits:", self.DCSUnits } )
-end
 
 
 --- The main include file for the MOOSE system.
@@ -7995,7 +8605,7 @@ Include.File( "Event" )
 _EVENTDISPATCHER = EVENT:New() -- #EVENT
 
 --- Declare the main database object, which is used internally by the MOOSE classes.
-_DATABASE = DATABASE:New():ScanEnvironment() -- Database#DATABASE
+_DATABASE = DATABASE:New() -- Database#DATABASE
 
 --- Scoring system for MOOSE.
 -- This scoring class calculates the hits and kills that players make within a simulation session.
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 928c05242..c30a01530 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_DATABASE/Moose_Test_DATABASE.lua b/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.lua
index 88f76d82a..d299d3501 100644
--- a/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.lua	
+++ b/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.lua	
@@ -1,39 +1,52 @@
-Include.File( 'Database' )
+
+Include.File( 'UnitSet' )
+Include.File( 'GroupSet' )
 Include.File( 'Spawn' )
 
-DBBluePlanes = DATABASE:New()
+DBBluePlanes = UNITSET:New()
   :FilterCoalitions( "blue" )
   :FilterCategories( "plane" )
   :FilterStart()
 
-DBRedVehicles = DATABASE:New()
+DBRedVehicles = UNITSET:New()
   :FilterCoalitions( "red" )
   :FilterCategories( "ground" )
   :FilterStart()
 
-DBShips = DATABASE:New()
+DBShips = UNITSET:New()
   :FilterCategories( "ship" )
   :FilterStart()
   
-DBBelgium = DATABASE:New()
+DBBelgium = UNITSET:New()
   :FilterCategories( "helicopter" )
   :FilterCountries( "BELGIUM" )
   :FilterStart()
   
-DBNorthKorea = DATABASE:New()
+DBNorthKorea = UNITSET:New()
   :FilterCountries( "NORTH_KOREA" )
   :FilterStart()
   
-DBKA50Vinson = DATABASE:New()
+DBKA50Vinson = UNITSET:New()
   :FilterTypes( { "Ka-50", "VINSON" } )
   :FilterStart()
+  
+DBBluePlanesGroup = GROUPSET:New()
+  :FilterCoalitions( "blue" )
+  :FilterCategories( "plane" )
+  :FilterStart()
+  
+DBNorthKoreaGroup = GROUPSET:New()
+  :FilterCountries( "NORTH_KOREA" )
+  :FilterStart()
 
-DBBluePlanes:TraceDatabase()
-DBRedVehicles:TraceDatabase()
-DBShips:TraceDatabase()
-DBBelgium:TraceDatabase()
-DBNorthKorea:TraceDatabase()
-DBKA50Vinson:TraceDatabase()
+DBBluePlanes:Flush()
+DBRedVehicles:Flush()
+DBShips:Flush()
+DBBelgium:Flush()
+DBNorthKorea:Flush()
+DBKA50Vinson:Flush()
+DBBluePlanesGroup:Flush()
+DBNorthKoreaGroup:Flush()
 
 
 SpawnUS_Plane = SPAWN:New( 'Database Spawn Test USA Plane')
@@ -54,21 +67,42 @@ GroupRU_Ship = SpawnRU_Ship:Spawn()
 SpawnUS_AttackVehicle = SPAWN:New( 'Database Spawn Test USA Attack Vehicle' )
 SpawnRU_AttackVehicle = SPAWN:New( 'Database Spawn Test RUSSIA Attack Vehicle' )
 
-for i = 1, 10 do
+for i = 1, 2 do
   GroupRU_AttackVehicle = SpawnRU_AttackVehicle:SpawnInZone( ZONE:New("Spawn Zone RU"), true)
   GroupUS_AttackVehicle = SpawnUS_AttackVehicle:SpawnInZone( ZONE:New("Spawn Zone US"), true)
 end
 
 
 --DBBlue:TraceDatabase()
-routines.scheduleFunction( DBBluePlanes.TraceDatabase, { DBBluePlanes }, 1 )
-routines.scheduleFunction( DBRedVehicles.TraceDatabase, { DBRedVehicles }, 1 )
-routines.scheduleFunction( DBShips.TraceDatabase, { DBShips }, 1 )
-routines.scheduleFunction( DBBelgium.TraceDatabase, { DBBelgium }, 1 )
-routines.scheduleFunction( DBNorthKorea.TraceDatabase, { DBNorthKorea }, 1 )
-routines.scheduleFunction( DBKA50Vinson.TraceDatabase, { DBKA50Vinson }, 1 )
+SCHEDULER:New( DBBluePlanes, DBBluePlanes.Flush, {  }, 1 )
+SCHEDULER:New( DBRedVehicles, DBRedVehicles.Flush, {  }, 1 )
+SCHEDULER:New( DBShips, DBShips.Flush, {  }, 1 )
+SCHEDULER:New( DBBelgium, DBBelgium.Flush, {  }, 1 )
+SCHEDULER:New( DBNorthKorea, DBNorthKorea.Flush, {  }, 1 )
+SCHEDULER:New( DBKA50Vinson, DBKA50Vinson.Flush, {  }, 1 )
+
+SCHEDULER:New( DBBluePlanesGroup, DBBluePlanesGroup.Flush, { }, 1 )
+SCHEDULER:New( DBNorthKoreaGroup, DBNorthKoreaGroup.Flush, { }, 1 )
 
 DBRedVehicles
-  :ForEachAliveUnit( function( DCSUnit ) 
-    DBRedVehicles:T( DCSUnit:getName() )
+  :ForEachUnit( function( MooseUnit ) 
+    DBRedVehicles:T( MooseUnit:GetName() )
   end )
+
+local function FlushPlayers()
+
+  _DATABASE:E( "FlushPlayers" )
+  _DATABASE
+    :ForEachPlayerAlive( function( Player )
+      _DATABASE:E( Player )
+      MESSAGE:New( Player, "Test", 5, "Player Test" ):ToAll()
+      return true
+    end )
+  return true
+end
+
+_DATABASE:E( "Schedule" )
+local PlayerShow = SCHEDULER:New( nil, FlushPlayers, {}, 1, 10 )
+  
+  
+  
diff --git a/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz b/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz
index 0bdbd3f05..b5df147ee 100644
Binary files a/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz and b/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.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 670f8d468..084815a4d 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.miz b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz
index 912b3d1cf..169744bae 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 69faae2df..a6a4cb6c7 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 dbe71769b..6d633fe1e 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_SPAWN/MOOSE_Test_SPAWN.miz b/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz
index 3a6bcd9e6..61037a118 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 63198ee5a..afbcef4e9 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 c909c341b..555e36436 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 d2fa72778..b49e9ecc1 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 Training/Documentation/Airbase.html b/Moose Training/Documentation/Airbase.html
new file mode 100644
index 000000000..2226818be
--- /dev/null
+++ b/Moose Training/Documentation/Airbase.html	
@@ -0,0 +1,662 @@
+<!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>Airbase</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="GroupSet.html">GroupSet</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="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="StaticObject.html">StaticObject</a></li>
+					<li><a href="TASK.html">TASK</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="UnitSet.html">UnitSet</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>Airbase</code></h1>
+   
+<p>AIRBASE Class</p>
+
+<h1><a href="AIRBASE.html">AIRBASE</a> class</h1>
+<p>The <a href="AIRBASE.html">AIRBASE</a> class is a wrapper class to handle the DCS Airbase objects:</p>
+
+<ul>
+    <li>Support all DCS Airbase APIs.</li>
+</ul>
+
+   
+<ul>
+    <li>Enhance with Airbase specific APIs not in the DCS Airbase API set.</li>
+</ul>
+
+
+<h1>AIRBASE reference methods</h1>
+<p>For each DCS Airbase object alive within a running mission, a AIRBASE wrapper object (instance) will be created within the _<a href="DATABASE.html">DATABASE</a> object.
+This is done at the beginning of the mission (when the mission starts).</p>
+
+<p>The AIRBASE class <strong>does not contain a :New()</strong> method, rather it provides <strong>:Find()</strong> methods to retrieve the object reference
+using the DCS Airbase or the DCS AirbaseName.</p>
+
+<p>Another thing to know is that AIRBASE objects do not "contain" the DCS Airbase object. 
+The AIRBASE methods will reference the DCS Airbase object by name when it is needed during API execution.
+If the DCS Airbase object does not exist or is nil, the AIRBASE methods will return nil and log an exception in the DCS.log file.</p>
+
+<p>The AIRBASE class provides the following functions to retrieve quickly the relevant AIRBASE instance:</p>
+
+<ul>
+    <li><a href="##(AIRBASE).Find">AIRBASE.Find</a>(): Find a AIRBASE instance from the _DATABASE object using a DCS Airbase object.</li>
+    <li><a href="##(AIRBASE).FindByName">AIRBASE.FindByName</a>(): Find a AIRBASE instance from the _DATABASE object using a DCS Airbase name.</li>
+</ul>
+
+<p>IMPORTANT: ONE SHOULD NEVER SANATIZE these AIRBASE OBJECT REFERENCES! (make the AIRBASE object references nil).</p>
+
+<h1>DCS AIRBASE APIs</h1>
+<p>The DCS Airbase APIs are used extensively within MOOSE. The AIRBASE class has for each DCS Airbase API a corresponding method.
+To be able to distinguish easily in your code the difference between a AIRBASE API call and a DCS Airbase API call,
+the first letter of the method is also capitalized. So, by example, the DCS Airbase method <a href="DCSAirbase.html##(Airbase).getName">DCSAirbase#Airbase.getName</a>()
+is implemented in the AIRBASE class as <a href="##(AIRBASE).GetName">AIRBASE.GetName</a>().</p>
+
+<h2>More functions will be added</h2>
+<p>During the MOOSE development, more functions will be added. </p>
+
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AIRBASE">AIRBASE</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(AIRBASE)">Type <code>AIRBASE</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).CategoryName">AIRBASE.CategoryName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).ClassName">AIRBASE.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).Find">AIRBASE:Find(DCSAirbase)</a></td>
+		<td class="summary">
+<p>Finds a AIRBASE from the _DATABASE using a DCSAirbase object.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).FindByName">AIRBASE:FindByName(AirbaseName)</a></td>
+		<td class="summary">
+<p>Find a AIRBASE in the _DATABASE using the name of an existing DCS Airbase.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetCallSign">AIRBASE:GetCallSign()</a></td>
+		<td class="summary">
+<p>Returns the Airbase's callsign - the localized string.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetCategoryName">AIRBASE:GetCategoryName()</a></td>
+		<td class="summary">
+<p>Returns the DCS Airbase category name as defined within the DCS Airbase Descriptor.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetCoalition">AIRBASE:GetCoalition()</a></td>
+		<td class="summary">
+<p>Returns coalition of the Airbase.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetCountry">AIRBASE:GetCountry()</a></td>
+		<td class="summary">
+<p>Returns country of the Airbase.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetDCSAirbase">AIRBASE:GetDCSAirbase()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetDesc">AIRBASE:GetDesc()</a></td>
+		<td class="summary">
+<p>Returns unit descriptor.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetID">AIRBASE:GetID()</a></td>
+		<td class="summary">
+<p>Returns the unit's unique identifier.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetName">AIRBASE:GetName()</a></td>
+		<td class="summary">
+<p>Returns DCS Airbase object name.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetPointVec2">AIRBASE:GetPointVec2()</a></td>
+		<td class="summary">
+<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> vector indicating the point in 2D of the DCS Airbase within the mission.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).GetTypeName">AIRBASE:GetTypeName()</a></td>
+		<td class="summary">
+<p>Returns the type name of the DCS Airbase.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).IsAlive">AIRBASE:IsAlive()</a></td>
+		<td class="summary">
+<p>Returns if the airbase is alive.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AIRBASE).Register">AIRBASE:Register(DCSAirbase, Database, AirbaseName)</a></td>
+		<td class="summary">
+<p>Create a new AIRBASE from DCSAirbase.</p>
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AIRBASE)">#AIRBASE</a></em>
+<a id="AIRBASE" >
+<strong>AIRBASE</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(Airbase)" >Type <code>Airbase</code></a></h2>
+	
+			<h2><a id="#(AIRBASE)" >Type <code>AIRBASE</code></a></h2>
+				
+<p>The AIRBASE class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(AIRBASE).CategoryName" >
+<strong>AIRBASE.CategoryName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(AIRBASE).ClassName" >
+<strong>AIRBASE.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).Find" >
+<strong>AIRBASE:Find(DCSAirbase)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Finds a AIRBASE from the _DATABASE using a DCSAirbase object.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="DCSAirbase.html##(Airbase)">DCSAirbase#Airbase</a> DCSAirbase </em></code>: 
+An existing DCS Airbase object reference.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).FindByName" >
+<strong>AIRBASE:FindByName(AirbaseName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Find a AIRBASE in the _DATABASE using the name of an existing DCS Airbase.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string AirbaseName </em></code>: 
+The Airbase Name.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetCallSign" >
+<strong>AIRBASE:GetCallSign()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the Airbase's callsign - the localized string.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em>#string:</em>
+The Callsign of the Airbase.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetCategoryName" >
+<strong>AIRBASE:GetCategoryName()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the DCS Airbase category name as defined within the DCS Airbase Descriptor.</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#string:</em>
+The DCS Airbase Category Name</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetCoalition" >
+<strong>AIRBASE:GetCoalition()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns coalition of the Airbase.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em><a href="DCSCoalitionObject.html##(coalition.side)">DCSCoalitionObject#coalition.side</a>:</em>
+The side of the coalition.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetCountry" >
+<strong>AIRBASE:GetCountry()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns country of the Airbase.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em><a href="DCScountry.html##(country.id)">DCScountry#country.id</a>:</em>
+The country identifier.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetDCSAirbase" >
+<strong>AIRBASE:GetDCSAirbase()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetDesc" >
+<strong>AIRBASE:GetDesc()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns unit descriptor.</p>
+
+	
+<p>Descriptor type depends on unit category.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em><a href="DCSAirbase.html##(Airbase.Desc)">DCSAirbase#Airbase.Desc</a>:</em>
+The Airbase descriptor.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetID" >
+<strong>AIRBASE:GetID()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the unit's unique identifier.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em><a href="DCSAirbase.html##(Airbase.ID)">DCSAirbase#Airbase.ID</a>:</em>
+Airbase ID</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetName" >
+<strong>AIRBASE:GetName()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns DCS Airbase object name.</p>
+
+	
+<p>The function provides access to non-activated units too.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em>#string:</em>
+The name of the DCS Airbase.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetPointVec2" >
+<strong>AIRBASE:GetPointVec2()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> vector indicating the point in 2D of the DCS Airbase within the mission.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+The 2D point vector of the DCS Airbase.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).GetTypeName" >
+<strong>AIRBASE:GetTypeName()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the type name of the DCS Airbase.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em>#string:</em>
+The type name of the DCS Airbase.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).IsAlive" >
+<strong>AIRBASE:IsAlive()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns if the airbase is alive.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em>#boolean:</em>
+true if Airbase is alive.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Airbase is not existing or alive.  </p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AIRBASE).Register" >
+<strong>AIRBASE:Register(DCSAirbase, Database, AirbaseName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a new AIRBASE from DCSAirbase.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="DCSAirbase.html##(Airbase)">DCSAirbase#Airbase</a> DCSAirbase </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Database.html##(DATABASE)">Database#DATABASE</a> Database </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> AirbaseName </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em></p>
+
+
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Base.html b/Moose Training/Documentation/Base.html
index f7177aa41..b6d89a410 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="Airbase.html">Airbase</a></li>
 					<li>Base</li>
 					<li><a href="CARGO.html">CARGO</a></li>
 					<li><a href="CleanUp.html">CleanUp</a></li>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -253,7 +256,7 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(BASE).New">BASE:New()</a></td>
 		<td class="summary">
-
+<p>The base constructor.</p>
 </td>
 		</tr>
 		<tr>
@@ -769,7 +772,29 @@ is the Child class from which the Parent class needs to be retrieved.</p>
 </dt>
 <dd>
 	
+<p>The base constructor.</p>
 
+	
+<p>This is the top top class of all classed defined within the MOOSE.
+Any new class needs to be derived from this class for proper inheritance.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em>
+The new instance of the BASE class.</p>
+
+			<h3>Usage:</h3>
+		<pre class="example"><code>function TASK:New()
+
+    local self = BASE:Inherit( self, BASE:New() )
+
+    -- assign Task default values during construction
+    self.TaskBriefing = "Task: No Task."
+    self.Time = timer.getTime()
+    self.ExecuteStage = _TransportExecuteStage.NONE
+
+    return self
+end</code></pre>
 
 </dd>
 </dl>
diff --git a/Moose Training/Documentation/CARGO.html b/Moose Training/Documentation/CARGO.html
index fdacc75e3..887fddee7 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="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li>CARGO</li>
 					<li><a href="CleanUp.html">CleanUp</a></li>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/CleanUp.html b/Moose Training/Documentation/CleanUp.html
index 1b0702bb3..09d6b19f7 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="Airbase.html">Airbase</a></li>
 					<li><a href="Base.html">Base</a></li>
 					<li><a href="CARGO.html">CARGO</a></li>
 					<li>CleanUp</li>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Client.html b/Moose Training/Documentation/Client.html
index 67e324e6f..25c6e929e 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -309,13 +312,19 @@ If the DCS Unit object does not exist or is nil, the CLIENT methods will return
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CLIENT).ShowBriefing">CLIENT:ShowBriefing()</a></td>
 		<td class="summary">
-<p>Show the briefing of the MISSION to the CLIENT.</p>
+<p>Show the briefing of a CLIENT.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CLIENT).ShowCargo">CLIENT:ShowCargo()</a></td>
 		<td class="summary">
 <p>Shows the <a href="Cargo.html##(CARGO)">Cargo#CARGO</a> contained within the CLIENT to the player as a message.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(CLIENT).ShowMissionBriefing">CLIENT:ShowMissionBriefing(MissionBriefing)</a></td>
+		<td class="summary">
+<p>Show the mission briefing of a MISSION to the CLIENT.</p>
 </td>
 		</tr>
 		<tr>
@@ -992,7 +1001,7 @@ Name of the Group as defined within the Mission Editor. The Group must have a Un
 </dt>
 <dd>
 	
-<p>Show the briefing of the MISSION to the CLIENT.</p>
+<p>Show the briefing of a CLIENT.</p>
 
 		<h3>Return value</h3>
 				
@@ -1020,6 +1029,32 @@ self</p>
 		<dl class="function">
 <dt>
 
+<a id="#(CLIENT).ShowMissionBriefing" >
+<strong>CLIENT:ShowMissionBriefing(MissionBriefing)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Show the mission briefing of a MISSION to the CLIENT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string MissionBriefing </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(CLIENT)">#CLIENT</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(CLIENT).SwitchMessages" >
 <strong>CLIENT.SwitchMessages(PrmTable)</strong>
 </a>
diff --git a/Moose Training/Documentation/DCSAirbase.html b/Moose Training/Documentation/DCSAirbase.html
index 907c576e5..2d2c35185 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSCoalitionObject.html b/Moose Training/Documentation/DCSCoalitionObject.html
index ee0e7b8dc..1394b09b8 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSCommand.html b/Moose Training/Documentation/DCSCommand.html
index 4c9762082..ffb46f8cb 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSController.html b/Moose Training/Documentation/DCSController.html
index c4e7c7428..89cb04d28 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSGroup.html b/Moose Training/Documentation/DCSGroup.html
index a7a84c8d1..c46f4755e 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSObject.html b/Moose Training/Documentation/DCSObject.html
index 44157433f..08f490b23 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSTask.html b/Moose Training/Documentation/DCSTask.html
index 93585f188..3950afc35 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSTypes.html b/Moose Training/Documentation/DCSTypes.html
index 2cf9f22b0..8f4ec29be 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSUnit.html b/Moose Training/Documentation/DCSUnit.html
index e09265c44..c55ecc3e4 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCSWorld.html b/Moose Training/Documentation/DCSWorld.html
index e91ba3f3f..8e993da85 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DCStimer.html b/Moose Training/Documentation/DCStimer.html
index b4af45ac2..00f626d06 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DEPLOYTASK.html b/Moose Training/Documentation/DEPLOYTASK.html
index b57bf41c4..1fa64e415 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DESTROYBASETASK.html b/Moose Training/Documentation/DESTROYBASETASK.html
index 263a03453..8de686c17 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DESTROYGROUPSTASK.html b/Moose Training/Documentation/DESTROYGROUPSTASK.html
index 2235e0590..0c9455cf6 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DESTROYRADARSTASK.html b/Moose Training/Documentation/DESTROYRADARSTASK.html
index f246dfc10..c88de6600 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/DESTROYUNITTYPESTASK.html b/Moose Training/Documentation/DESTROYUNITTYPESTASK.html
index 62898b2ee..17f188b27 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Database.html b/Moose Training/Documentation/Database.html
index baef7069e..d73e87dd4 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -68,80 +71,42 @@
 	<div id="content">
    <h1>Module <code>Database</code></h1>
    
-<p>Manage sets of units and groups.</p>
+<p>Manage the mission database.</p>
 
    
 
-<h1><a href="##(Database)">#Database</a> class</h1>
-<p>Mission designers can use the DATABASE class to build sets of units belonging to certain:</p>
+<h1><a href="##(DATABASE)">#DATABASE</a> class</h1>
+<p>Mission designers can use the DATABASE class to refer to:</p>
 
 <ul>
-    <li>Coalitions</li>
-    <li>Categories</li>
-    <li>Countries</li>
-    <li>Unit types</li>
-    <li>Starting with certain prefix strings.</li>
+    <li>UNITS</li>
+    <li>GROUPS</li>
+    <li>players</li>
+    <li>alive players</li>
+    <li>CLIENTS</li>
+    <li>alive CLIENTS</li>
 </ul>
 
-<p>This list will grow over time. Planned developments are to include filters and iterators.
-Additional filters will be added around <a href="Zone.html##(ZONEs)">Zone#ZONEs</a>, Radiuses, Active players, ...
-More iterators will be implemented in the near future ...</p>
-
-<p>Administers the Initial Sets of the Mission Templates as defined within the Mission Editor.</p>
-
-<h1>DATABASE construction methods:</h1>
-<p>Create a new DATABASE object with the <a href="##(DATABASE).New">DATABASE.New</a> method:</p>
-
-<ul>
-    <li><a href="##(DATABASE).New">DATABASE.New</a>: Creates a new DATABASE object.</li>
-</ul>
-
-
-<h1>DATABASE filter criteria: </h1>
-<p>You can set filter criteria to define the set of units within the database.
-Filter criteria are defined by:</p>
-
-<ul>
-    <li><a href="##(DATABASE).FilterCoalitions">DATABASE.FilterCoalitions</a>: Builds the DATABASE with the units belonging to the coalition(s).</li>
-    <li><a href="##(DATABASE).FilterCategories">DATABASE.FilterCategories</a>: Builds the DATABASE with the units belonging to the category(ies).</li>
-    <li><a href="##(DATABASE).FilterTypes">DATABASE.FilterTypes</a>: Builds the DATABASE with the units belonging to the unit type(s).</li>
-    <li><a href="##(DATABASE).FilterCountries">DATABASE.FilterCountries</a>: Builds the DATABASE with the units belonging to the country(ies).</li>
-    <li><a href="##(DATABASE).FilterUnitPrefixes">DATABASE.FilterUnitPrefixes</a>: Builds the DATABASE with the units starting with the same prefix string(s).</li>
-</ul>
-
-<p>Once the filter criteria have been set for the DATABASE, you can start filtering using:</p>
-
-<ul>
-    <li><a href="##(DATABASE).FilterStart">DATABASE.FilterStart</a>: Starts the filtering of the units within the database.</li>
-</ul>
-
-<p>Planned filter criteria within development are (so these are not yet available):</p>
-
-<ul>
-    <li><a href="##(DATABASE).FilterGroupPrefixes">DATABASE.FilterGroupPrefixes</a>: Builds the DATABASE with the groups of the units starting with the same prefix string(s).</li>
-    <li><a href="##(DATABASE).FilterZones">DATABASE.FilterZones</a>: Builds the DATABASE with the units within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
-</ul>
+<p>On top, for internal MOOSE administration purposes, the DATBASE administers the Unit and Gruop templates as defined within the Mission Editor.</p>
 
+<p>Moose will automatically create one instance of the DATABASE class into the <strong>global</strong> object _DATABASE.
+Moose refers to _DATABASE within the framework extensively, but you can also refer to the _DATABASE object within your missions if required.</p>
 
 <h1>DATABASE iterators:</h1>
-<p>Once the filters have been defined and the DATABASE has been built, you can iterate the database with the available iterator methods.
+<p>You can iterate the database with the available iterator methods.
 The iterator methods will walk the DATABASE set, and call for each element within the set a function that you provide.
 The following iterator methods are currently available within the DATABASE:</p>
 
 <ul>
-    <li><a href="##(DATABASE).ForEachAliveUnit">DATABASE.ForEachAliveUnit</a>: Calls a function for each alive unit it finds within the DATABASE.</li>
+    <li><a href="##(DATABASE).ForEachUnit">DATABASE.ForEachUnit</a>: Calls a function for each <a href="UNIT.html">UNIT</a> it finds within the DATABASE.</li>
+    <li><a href="##(DATABASE).ForEachGroup">DATABASE.ForEachGroup</a>: Calls a function for each <a href="GROUP.html">GROUP</a> it finds within the DATABASE.</li>
+    <li><a href="##(DATABASE).ForEachPlayer">DATABASE.ForEachPlayer</a>: Calls a function for each player it finds within the DATABASE.</li>
+    <li><a href="##(DATABASE).ForEachPlayerAlive">DATABASE.ForEachPlayerAlive</a>: Calls a function for each alive player it finds within the DATABASE.</li>
+    <li><a href="##(DATABASE).ForEachClient">DATABASE.ForEachClient</a>: Calls a function for each <a href="CLIENT.html">CLIENT</a> it finds within the DATABASE.</li>
+    <li><a href="##(DATABASE).ForEachClientAlive">DATABASE.ForEachClientAlive</a>: Calls a function for each alive <a href="CLIENT.html">CLIENT</a> it finds within the DATABASE.
+    </li>
 </ul>
 
-<p>Planned iterators methods in development are (so these are not yet available):</p>
-
-<ul>
-    <li><a href="##(DATABASE).ForEachUnit">DATABASE.ForEachUnit</a>: Calls a function for each unit contained within the DATABASE.</li>
-    <li><a href="##(DATABASE).ForEachGroup">DATABASE.ForEachGroup</a>: Calls a function for each group contained within the DATABASE.</li>
-    <li><a href="##(DATABASE).ForEachUnitInZone">DATABASE.ForEachUnitInZone</a>: Calls a function for each unit within a certain zone contained within the DATABASE.</li>
-</ul>
-
-<hr/>
-
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
@@ -163,6 +128,12 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).AddGroup">DATABASE:AddGroup(DCSGroup, GroupName)</a></td>
 		<td class="summary">
 <p>Adds a GROUP based on the GroupName in the DATABASE.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).AddPlayer">DATABASE:AddPlayer(UnitName, PlayerName)</a></td>
+		<td class="summary">
+<p>Adds a player based on the Player Name in the DATABASE.</p>
 </td>
 		</tr>
 		<tr>
@@ -178,13 +149,13 @@ The following iterator methods are currently available within the DATABASE:</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ClassName">DATABASE.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).CLIENTSALIVE">DATABASE.CLIENTSALIVE</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ClientsAlive">DATABASE.ClientsAlive</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ClassName">DATABASE.ClassName</a></td>
 		<td class="summary">
 
 </td>
@@ -199,24 +170,18 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).DCSUnits">DATABASE.DCSUnits</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).DeletePlayer">DATABASE:DeletePlayer(PlayerName)</a></td>
+		<td class="summary">
+<p>Deletes a player from the DATABASE based on the Player Name.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).DeleteUnit">DATABASE:DeleteUnit(DCSUnitName)</a></td>
 		<td class="summary">
 <p>Deletes a Unit from the DATABASE based on the Unit Name.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).Filter">DATABASE.Filter</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).FilterMeta">DATABASE.FilterMeta</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -240,25 +205,49 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEach">DATABASE:ForEach(IteratorFunction, arg, Set)</a></td>
 		<td class="summary">
-<p>Interate the DATABASE and call an interator function for the given set, providing the Object for each element within the set and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for the given set, providing the Object for each element within the set and optional parameters.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachClient">DATABASE:ForEachClient(IteratorFunction, ...)</a></td>
 		<td class="summary">
-<p>Interate the DATABASE and call an interator function for each client, providing the Client to the function and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for each CLIENT, providing the CLIENT to the function and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachClientAlive">DATABASE:ForEachClientAlive(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the DATABASE and call an iterator function for each <strong>ALIVE</strong> CLIENT, providing the CLIENT to the function and optional parameters.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachDCSUnit">DATABASE:ForEachDCSUnit(IteratorFunction, ...)</a></td>
 		<td class="summary">
-<p>Interate the DATABASE and call an interator function for each <strong>alive</strong> unit, providing the Unit and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> unit, providing the DCSUnit and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachGroup">DATABASE:ForEachGroup(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> GROUP, providing the GROUP and optional parameters.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachPlayer">DATABASE:ForEachPlayer(IteratorFunction, ...)</a></td>
 		<td class="summary">
-<p>Interate the DATABASE and call an interator function for each <strong>alive</strong> player, providing the Unit of the player and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for each player, providing the player name and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachPlayerAlive">DATABASE:ForEachPlayerAlive(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> player, providing the Unit of the player and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ForEachUnit">DATABASE:ForEachUnit(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> UNIT, providing the UNIT and optional parameters.</p>
 </td>
 		</tr>
 		<tr>
@@ -286,19 +275,13 @@ The following iterator methods are currently available within the DATABASE:</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).Players">DATABASE.Players</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).PLAYERS">DATABASE.PLAYERS</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).PlayersAlive">DATABASE.PlayersAlive</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).ScanEnvironment">DATABASE:ScanEnvironment()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE).PLAYERSALIVE">DATABASE.PLAYERSALIVE</a></td>
 		<td class="summary">
 
 </td>
@@ -313,24 +296,12 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).Spawn">DATABASE:Spawn(SpawnTemplate)</a></td>
 		<td class="summary">
 <p>Instantiate new Groups within the DCSRTE.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).Statics">DATABASE.Statics</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DATABASE).Templates">DATABASE.Templates</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE).TraceDatabase">DATABASE:TraceDatabase()</a></td>
-		<td class="summary">
-<p>Traces the current database contents in the log ...</p>
 </td>
 		</tr>
 		<tr>
@@ -361,24 +332,6 @@ 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)._IsAliveDCSGroup">DATABASE:_IsAliveDCSGroup(DCSGroup)</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._IsAliveDCSUnit">DATABASE:_IsAliveDCSUnit(DCSUnit)</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._IsIncludeDCSUnit">DATABASE:_IsIncludeDCSUnit(DCSUnit)</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -388,15 +341,21 @@ The following iterator methods are currently available within the DATABASE:</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterGroup">DATABASE:_RegisterGroup(GroupTemplate)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterPlayers">DATABASE:_RegisterPlayers()</a></td>
+		<td class="summary">
+<p>Private method that registers all alive players in the mission.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterTemplate">DATABASE:_RegisterTemplate(GroupTemplate)</a></td>
 		<td class="summary">
 <p>Private method that registers new Group Templates within the DATABASE Object.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterPlayers">DATABASE:_RegisterPlayers()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(DATABASE)._RegisterTemplates">DATABASE:_RegisterTemplates()</a></td>
 		<td class="summary">
-<p>Private method that registers all alive players in the mission.</p>
+
 </td>
 		</tr>
 	</table>
@@ -473,6 +432,32 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<dl class="function">
 <dt>
 
+<a id="#(DATABASE).AddPlayer" >
+<strong>DATABASE:AddPlayer(UnitName, PlayerName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Adds a player based on the Player Name in the DATABASE.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> UnitName </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> PlayerName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(DATABASE).AddUnit" >
 <strong>DATABASE:AddUnit(DCSUnit, DCSUnitName)</strong>
 </a>
@@ -513,9 +498,9 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<dl class="function">
 <dt>
 
-		<em>#string</em>
-<a id="#(DATABASE).ClassName" >
-<strong>DATABASE.ClassName</strong>
+		<em></em>
+<a id="#(DATABASE).CLIENTSALIVE" >
+<strong>DATABASE.CLIENTSALIVE</strong>
 </a>
 </dt>
 <dd>
@@ -527,9 +512,9 @@ The following iterator methods are currently available within the DATABASE:</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
-<a id="#(DATABASE).ClientsAlive" >
-<strong>DATABASE.ClientsAlive</strong>
+		<em>#string</em>
+<a id="#(DATABASE).ClassName" >
+<strong>DATABASE.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -564,6 +549,27 @@ The following iterator methods are currently available within the DATABASE:</p>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).DeletePlayer" >
+<strong>DATABASE:DeletePlayer(PlayerName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Deletes a player from the DATABASE based on the Player Name.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> PlayerName </em></code>: </p>
+
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
@@ -585,34 +591,6 @@ The following iterator methods are currently available within the DATABASE:</p>
 
 				</li>
 		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(DATABASE).Filter" >
-<strong>DATABASE.Filter</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(DATABASE).FilterMeta" >
-<strong>DATABASE.FilterMeta</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -702,7 +680,7 @@ The found Unit.</p>
 </dt>
 <dd>
 	
-<p>Interate the DATABASE and call an interator function for the given set, providing the Object for each element within the set and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for the given set, providing the Object for each element within the set and optional parameters.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -739,7 +717,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Interate the DATABASE and call an interator function for each client, providing the Client to the function and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for each CLIENT, providing the CLIENT to the function and optional parameters.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -765,20 +743,84 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(DATABASE).ForEachDCSUnit" >
-<strong>DATABASE:ForEachDCSUnit(IteratorFunction, ...)</strong>
+<a id="#(DATABASE).ForEachClientAlive" >
+<strong>DATABASE:ForEachClientAlive(IteratorFunction, ...)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Interate the DATABASE and call an interator function for each <strong>alive</strong> unit, providing the Unit and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for each <strong>ALIVE</strong> CLIENT, providing the CLIENT to the function 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 unit in the database. The function needs to accept a UNIT parameter.</p>
+The function that will be called when there is an alive CLIENT in the database. 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="##(DATABASE)">#DATABASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).ForEachDCSUnit" >
+<strong>DATABASE:ForEachDCSUnit(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> unit, providing the DCSUnit 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 unit in the database. The function needs to accept a DCSUnit parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).ForEachGroup" >
+<strong>DATABASE:ForEachGroup(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> GROUP, providing the GROUP 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 GROUP in the database. The function needs to accept a GROUP parameter.</p>
 
 				</li>
 				<li>
@@ -803,7 +845,39 @@ self</p>
 </dt>
 <dd>
 	
-<p>Interate the DATABASE and call an interator function for each <strong>alive</strong> player, providing the Unit of the player and optional parameters.</p>
+<p>Iterate the DATABASE and call an iterator function for each player, providing the player name 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 player in the database. The function needs to accept the player name.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).ForEachPlayerAlive" >
+<strong>DATABASE:ForEachPlayerAlive(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> player, providing the Unit of the player and optional parameters.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -824,6 +898,38 @@ The function that will be called when there is an alive player in the database.
 <p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE).ForEachUnit" >
+<strong>DATABASE:ForEachUnit(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Iterate the DATABASE and call an iterator function for each <strong>alive</strong> UNIT, providing the UNIT 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 UNIT in the database. 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="##(DATABASE)">#DATABASE</a>:</em>
+self</p>
+
 </dd>
 </dl>
 		<dl class="function">
@@ -901,8 +1007,8 @@ DBObject = DATABASE:New()</code></pre>
 <dt>
 
 		<em></em>
-<a id="#(DATABASE).Players" >
-<strong>DATABASE.Players</strong>
+<a id="#(DATABASE).PLAYERS" >
+<strong>DATABASE.PLAYERS</strong>
 </a>
 </dt>
 <dd>
@@ -915,21 +1021,8 @@ DBObject = DATABASE:New()</code></pre>
 <dt>
 
 		<em></em>
-<a id="#(DATABASE).PlayersAlive" >
-<strong>DATABASE.PlayersAlive</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(DATABASE).ScanEnvironment" >
-<strong>DATABASE:ScanEnvironment()</strong>
+<a id="#(DATABASE).PLAYERSALIVE" >
+<strong>DATABASE.PLAYERSALIVE</strong>
 </a>
 </dt>
 <dd>
@@ -993,20 +1086,6 @@ This method is used by the SPAWN class.</p>
 <p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
 self</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(DATABASE).Statics" >
-<strong>DATABASE.Statics</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1021,27 +1100,6 @@ self</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(DATABASE).TraceDatabase" >
-<strong>DATABASE:TraceDatabase()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Traces the current database contents in the log ...</p>
-
-	
-<p>(for debug reasons).</p>
-
-		<h3>Return value</h3>
-				
-<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
-self</p>
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1145,84 +1203,6 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(DATABASE)._IsAliveDCSGroup" >
-<strong>DATABASE:_IsAliveDCSGroup(DCSGroup)</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a> DCSGroup </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(DATABASE)._IsAliveDCSUnit" >
-<strong>DATABASE:_IsAliveDCSUnit(DCSUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(DATABASE)._IsIncludeDCSUnit" >
-<strong>DATABASE:_IsIncludeDCSUnit(DCSUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
 <a id="#(DATABASE)._RegisterDatabase" >
 <strong>DATABASE:_RegisterDatabase()</strong>
 </a>
@@ -1241,32 +1221,6 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(DATABASE)._RegisterGroup" >
-<strong>DATABASE:_RegisterGroup(GroupTemplate)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Private method that registers new Group Templates within the DATABASE Object.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#table GroupTemplate </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
 <a id="#(DATABASE)._RegisterPlayers" >
 <strong>DATABASE:_RegisterPlayers()</strong>
 </a>
@@ -1280,6 +1234,45 @@ self</p>
 <p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE)._RegisterTemplate" >
+<strong>DATABASE:_RegisterTemplate(GroupTemplate)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Private method that registers new Group Templates within the DATABASE Object.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#table GroupTemplate </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(DATABASE)">#DATABASE</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(DATABASE)._RegisterTemplates" >
+<strong>DATABASE:_RegisterTemplates()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/Escort.html b/Moose Training/Documentation/Escort.html
index 6da80cd1e..1b3f58c93 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -1859,6 +1862,9 @@ self</p>
 	
 
 
+	
+<p>self.ReportTargetsScheduler = routines.scheduleFunction( self._ReportTargetsScheduler, { self }, timer.getTime() + 1, Seconds )</p>
+
 </dd>
 </dl>
 		<dl class="function">
diff --git a/Moose Training/Documentation/Event.html b/Moose Training/Documentation/Event.html
index 153c8cb07..8d0022235 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="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>
@@ -42,11 +43,12 @@
 					<li>Event</li>
 					<li><a href="GOHOMETASK.html">GOHOMETASK</a></li>
 					<li><a href="Group.html">Group</a></li>
-					<li><a href="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/GOHOMETASK.html b/Moose Training/Documentation/GOHOMETASK.html
index 3a3adccd4..8290602af 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="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>
@@ -42,11 +43,12 @@
 					<li><a href="Event.html">Event</a></li>
 					<li>GOHOMETASK</li>
 					<li><a href="Group.html">Group</a></li>
-					<li><a href="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Group.html b/Moose Training/Documentation/Group.html
index cfbc60f20..a18b037f6 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="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>
@@ -42,11 +43,12 @@
 					<li><a href="Event.html">Event</a></li>
 					<li><a href="GOHOMETASK.html">GOHOMETASK</a></li>
 					<li>Group</li>
-					<li><a href="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -90,7 +93,7 @@ This is done at the beginning of the mission (when the mission starts), and dyna
 <p>The GROUP class does not contain a :New() method, rather it provides :Find() methods to retrieve the object reference
 using the DCS Group or the DCS GroupName.</p>
 
-<p>Another thing to know is that GROUP objects do not "contain" the DCS Group object. 
+<p>Another thing to know is that GROUP objects do not "contain" the DCS Group object.
 The GROUP methods will reference the DCS Group object by name when it is needed during API execution.
 If the DCS Group object does not exist or is nil, the GROUP methods will return nil and log an exception in the DCS.log file.</p>
 
@@ -176,6 +179,54 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).Destroy">GROUP:Destroy()</a></td>
 		<td class="summary">
 <p>Destroys the DCS Group and all of its DCS Units.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskAWACS">GROUP:EnRouteTaskAWACS()</a></td>
+		<td class="summary">
+<p>(AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts).</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskEWR">GROUP:EnRouteTaskEWR()</a></td>
+		<td class="summary">
+<p>(GROUND) Ground unit (EW-radar) will act as an EWR for friendly units (will provide them with information about contacts).</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskEngageGroup">GROUP:EnRouteTaskEngageGroup(AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit)</a></td>
+		<td class="summary">
+<p>(AIR) Engaging a group.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskEngageTargets">GROUP:EnRouteTaskEngageTargets(Distance, <, Priority, TargetTypes)</a></td>
+		<td class="summary">
+<p>(AIR) Engaging targets of defined types.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskEngageUnit">GROUP:EnRouteTaskEngageUnit(AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack)</a></td>
+		<td class="summary">
+<p>(AIR) Attack the Unit.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskFAC">GROUP:EnRouteTaskFAC(Radius, Priority)</a></td>
+		<td class="summary">
+<p>(AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskFAC_EngageGroup">GROUP:EnRouteTaskFAC_EngageGroup(AttackGroup, Priority, WeaponType, Designation, Datalink)</a></td>
+		<td class="summary">
+<p>(AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).EnRouteTaskTanker">GROUP:EnRouteTaskTanker()</a></td>
+		<td class="summary">
+<p>(AIR) Aircraft will act as a tanker for friendly units.</p>
 </td>
 		</tr>
 		<tr>
@@ -199,7 +250,7 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).GetCategory">GROUP:GetCategory()</a></td>
 		<td class="summary">
-<p>Returns category of the DCS Group. </p>
+<p>Returns category of the DCS Group.</p>
 </td>
 		</tr>
 		<tr>
@@ -212,6 +263,12 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).GetCoalition">GROUP:GetCoalition()</a></td>
 		<td class="summary">
 <p>Returns the coalition of the DCS Group.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).GetCountry">GROUP:GetCountry()</a></td>
+		<td class="summary">
+<p>Returns the country of the DCS Group.</p>
 </td>
 		</tr>
 		<tr>
@@ -541,15 +598,33 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskAttackGroup">GROUP:TaskAttackGroup(AttackGroup)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskAttackGroup">GROUP:TaskAttackGroup(AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit)</a></td>
 		<td class="summary">
-<p>Attack a Group.</p>
+<p>(AIR) Attack a Group.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskAttackUnit">GROUP:TaskAttackUnit(The, AttackUnit)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskAttackMapObject">GROUP:TaskAttackMapObject(PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack)</a></td>
 		<td class="summary">
-<p>Attack the Unit.</p>
+<p>(AIR) Attacking the map object (building, structure, e.t.c).</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskAttackUnit">GROUP:TaskAttackUnit(AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack)</a></td>
+		<td class="summary">
+<p>(AIR) Attack the Unit.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskBombing">GROUP:TaskBombing(PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack)</a></td>
+		<td class="summary">
+<p>(AIR) Delivering weapon at the point on the ground. </p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskBombingRunway">GROUP:TaskBombingRunway(Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack)</a></td>
+		<td class="summary">
+<p>(AIR) Delivering weapon on the runway.</p>
 </td>
 		</tr>
 		<tr>
@@ -580,36 +655,60 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskEmbarkingAtVec2">GROUP:TaskEmbarkingAtVec2(Point, Duration, EmbarkingGroup)</a></td>
 		<td class="summary">
 <p>Move the group to a Vec2 Point, wait for a defined duration and embark a group.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskEscort">GROUP:TaskEscort(EscortGroup, PointVec3, LastWaypointIndex, EngagementDistanceMax, <, FollowGroup, EngagementDistance, TargetTypes)</a></td>
+		<td class="summary">
+<p>(AIR) Escort another airborne group.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskFAC_AttackGroup">GROUP:TaskFAC_AttackGroup(AttackGroup, WeaponType, Designation, Datalink)</a></td>
+		<td class="summary">
+<p>(AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskFireAtPoint">GROUP:TaskFireAtPoint(The, Radius, PointVec2)</a></td>
 		<td class="summary">
-<p>Fires at a VEC2 point.</p>
+<p>(GROUND) Fire at a VEC2 point until ammunition is finished.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskFollow">GROUP:TaskFollow(FollowGroup, PointVec3, LastWaypointIndex)</a></td>
+		<td class="summary">
+<p>(AIR) Following another airborne group.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskFunction">GROUP:TaskFunction(WayPoint, WayPointIndex, FunctionString, FunctionArguments)</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskHold">GROUP:TaskHold()</a></td>
+		<td class="summary">
+<p>(GROUND) Hold ground group from moving.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskHoldPosition">GROUP:TaskHoldPosition(Duration)</a></td>
 		<td class="summary">
-<p>Hold position at the current position of the first unit of the group.</p>
+<p>(AIR) Hold position at the current position of the first unit of the group.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskLandAtVec2">GROUP:TaskLandAtVec2(Point, Duration)</a></td>
 		<td class="summary">
-<p>Land the group at a Vec2Point.</p>
+<p>(AIR HELICOPTER) Landing at the ground.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskLandAtZone">GROUP:TaskLandAtZone(Zone, Duration, RandomPoint)</a></td>
 		<td class="summary">
-<p>Land the group at a @{Zone#ZONE).</p>
+<p>(AIR) Land the group at a @{Zone#ZONE).</p>
 </td>
 		</tr>
 		<tr>
@@ -621,13 +720,19 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskOrbitCircle">GROUP:TaskOrbitCircle(Altitude, Speed)</a></td>
 		<td class="summary">
-<p>Orbit at the current position of the first unit of the group at a specified alititude</p>
+<p>(AIR) Orbit at the current position of the first unit of the group at a specified alititude</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskOrbitCircleAtVec2">GROUP:TaskOrbitCircleAtVec2(Point, Altitude, Speed)</a></td>
 		<td class="summary">
-<p>Orbit at a specified position at a specified alititude during a specified duration with a specified speed.</p>
+<p>(AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskRefueling">GROUP:TaskRefueling()</a></td>
+		<td class="summary">
+<p>(AIR) Refueling from the nearest tanker.</p>
 </td>
 		</tr>
 		<tr>
@@ -657,7 +762,7 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).TaskWrappedAction">GROUP:TaskWrappedAction(DCSCommand, Index)</a></td>
 		<td class="summary">
-<p>Return a WrappedAction Task taking a Command </p>
+<p>Return a WrappedAction Task taking a Command</p>
 </td>
 		</tr>
 		<tr>
@@ -902,7 +1007,7 @@ Randomization of the route, when true.</p>
 				<li>
 				
 <p><code><em>#number Radius </em></code>: 
-When randomization is on, the randomization is within the radius. </p>
+When randomization is on, the randomization is within the radius.</p>
 
 				</li>
 		</ul>
@@ -942,6 +1047,346 @@ So all event listeners will catch the destroy event of this DCS Group.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(GROUP).EnRouteTaskAWACS" >
+<strong>GROUP:EnRouteTaskAWACS()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts).</p>
+
+	
+<p>No parameters.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskEWR" >
+<strong>GROUP:EnRouteTaskEWR()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(GROUND) Ground unit (EW-radar) will act as an EWR for friendly units (will provide them with information about contacts).</p>
+
+	
+<p>No parameters.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskEngageGroup" >
+<strong>GROUP:EnRouteTaskEngageGroup(AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Engaging a group.</p>
+
+	
+<p>The task does not assign the target group to the unit/group to attack now; it just allows the unit/group to engage the target group as well as other assigned targets.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> AttackGroup </em></code>: 
+The Group to be attacked.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Priority </em></code>: 
+All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Altitude </em></code>: 
+(optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean AttackQtyLimit </em></code>: 
+(optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskEngageTargets" >
+<strong>GROUP:EnRouteTaskEngageTargets(Distance, <, Priority, TargetTypes)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Engaging targets of defined types.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Distance </em></code>: 
+Maximal distance from the target to a route leg. If the target is on a greater distance it will be ignored. </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="##(list)">#list</a> &lt; </em></code>: 
+DCSTypes#AttributeName> TargetTypes Array of target categories allowed to engage. </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Priority </em></code>: 
+All enroute tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. </p>
+
+				</li>
+				<li>
+				
+<p><code><em> TargetTypes </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskEngageUnit" >
+<strong>GROUP:EnRouteTaskEngageUnit(AttackUnit, Priority, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Attack the Unit.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> AttackUnit </em></code>: 
+The UNIT.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Priority </em></code>: 
+All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean AttackQtyLimit </em></code>: 
+(optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean GroupAttack </em></code>: 
+(optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskFAC" >
+<strong>GROUP:EnRouteTaskFAC(Radius, Priority)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose a targets (enemy ground group) around as well as other assigned targets.</p>
+
+	
+<p>The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+If the task is assigned to the group lead unit will be a FAC. </p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+ The maximal distance from the FAC to a target.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Priority </em></code>: 
+All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskFAC_EngageGroup" >
+<strong>GROUP:EnRouteTaskFAC_EngageGroup(AttackGroup, Priority, WeaponType, Designation, Datalink)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR + GROUND) The task makes the group/unit a FAC and lets the FAC to choose the target (enemy ground group) as well as other assigned targets.</p>
+
+	
+<p>The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+If the task is assigned to the group lead unit will be a FAC. </p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> AttackGroup </em></code>: 
+Target GROUP.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Priority </em></code>: 
+All en-route tasks have the priority parameter. This is a number (less value - higher priority) that determines actions related to what task will be performed first. </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.Designation)">DCSTypes#AI.Task.Designation</a> Designation </em></code>: 
+(optional) Designation type.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean Datalink </em></code>: 
+(optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).EnRouteTaskTanker" >
+<strong>GROUP:EnRouteTaskTanker()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Aircraft will act as a tanker for friendly units.</p>
+
+	
+<p>No parameters.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(GROUP).Find" >
 <strong>GROUP:Find(DCSGroup)</strong>
 </a>
@@ -1020,7 +1465,7 @@ The CallSign of the first DCS Unit of the DCS Group.</p>
 </dt>
 <dd>
 	
-<p>Returns category of the DCS Group. </p>
+<p>Returns category of the DCS Group.</p>
 
 		<h3>Return value</h3>
 				
@@ -1068,6 +1513,34 @@ The coalition side of the DCS Group.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(GROUP).GetCountry" >
+<strong>GROUP:GetCountry()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the country of the DCS Group.</p>
+
+		<h3>Return values</h3>
+			<ol>
+				<li>
+				
+<p><em><a href="DCScountry.html##(country.id)">DCScountry#country.id</a>:</em>
+The country identifier.</p>
+
+				</li>
+				<li>
+				
+<p><em>#nil:</em>
+The DCS Group is not existing or alive.</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(GROUP).GetDCSGroup" >
 <strong>GROUP:GetDCSGroup()</strong>
 </a>
@@ -1176,7 +1649,7 @@ The identifier of the DCS Group.</p>
 </ul>
 
 	
-<p>If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged. </p>
+<p>If some of the DCS Units of the DCS Group are destroyed, the initial size of the DCS Group is unchanged.</p>
 
 		<h3>Return value</h3>
 				
@@ -1314,7 +1787,7 @@ Current Vec3 point of the first DCS Unit of the DCS Group.</p>
 <p>Returns current size of the DCS Group.</p>
 
 	
-<p>If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed. </p>
+<p>If some of the DCS Units of the DCS Group are destroyed the size of the DCS Group is changed.</p>
 
 		<h3>Return value</h3>
 				
@@ -2138,7 +2611,7 @@ A table of Route Points.</p>
 		<h3>Return value</h3>
 				
 <p><em><a href="##(GROUP)">#GROUP</a>:</em>
-self </p>
+self</p>
 
 </dd>
 </dl>
@@ -2203,20 +2676,113 @@ self</p>
 <dt>
 
 <a id="#(GROUP).TaskAttackGroup" >
-<strong>GROUP:TaskAttackGroup(AttackGroup)</strong>
+<strong>GROUP:TaskAttackGroup(AttackGroup, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Attack a Group.</p>
+<p>(AIR) Attack a Group.</p>
 
-		<h3>Parameter</h3>
+		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
 <p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> AttackGroup </em></code>: 
 The Group to be attacked.</p>
 
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Altitude </em></code>: 
+(optional) Desired attack start altitude. Group/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/group will choose closest altitude to the desired attack start altitude. If the desired altitude is defined group/aircraft will not attack from safe altitude.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean AttackQtyLimit </em></code>: 
+(optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).TaskAttackMapObject" >
+<strong>GROUP:TaskAttackMapObject(PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Attacking the map object (building, structure, e.t.c).</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> PointVec2 </em></code>: 
+2D-coordinates of the point the map object is closest to. The distance between the point and the map object must not be greater than 2000 meters. Object id is not used here because Mission Editor doesn't support map object identificators.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean GroupAttack </em></code>: 
+(optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.</p>
+
 				</li>
 		</ul>
 		<h3>Return value</h3>
@@ -2230,24 +2796,169 @@ The DCS task structure.</p>
 <dt>
 
 <a id="#(GROUP).TaskAttackUnit" >
-<strong>GROUP:TaskAttackUnit(The, AttackUnit)</strong>
+<strong>GROUP:TaskAttackUnit(AttackUnit, WeaponType, WeaponExpend, AttackQty, Direction, AttackQtyLimit, GroupAttack)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Attack the Unit.</p>
+<p>(AIR) Attack the Unit.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> The </em></code>: 
-unit.</p>
+<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> AttackUnit </em></code>: 
+The unit.</p>
 
 				</li>
 				<li>
 				
-<p><code><em> AttackUnit </em></code>: </p>
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean AttackQtyLimit </em></code>: 
+(optional) The flag determines how to interpret attackQty parameter. If the flag is true then attackQty is a limit on maximal attack quantity for "AttackGroup" and "AttackUnit" tasks. If the flag is false then attackQty is a desired attack quantity for "Bombing" and "BombingRunway" tasks.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean GroupAttack </em></code>: 
+(optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).TaskBombing" >
+<strong>GROUP:TaskBombing(PointVec2, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Delivering weapon at the point on the ground. </p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> PointVec2 </em></code>: 
+2D-coordinates of the point to deliver weapon at.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) Desired quantity of passes. The parameter is not the same in AttackGroup and AttackUnit tasks. </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean GroupAttack </em></code>: 
+(optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).TaskBombingRunway" >
+<strong>GROUP:TaskBombingRunway(Airbase, WeaponType, WeaponExpend, AttackQty, Direction, GroupAttack)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Delivering weapon on the runway.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> Airbase </em></code>: 
+Airbase to attack.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+(optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+(optional) Determines how much weapon will be released at each attack. If parameter is not defined the unit / group will choose expend on its own discretion.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number AttackQty </em></code>: 
+(optional) This parameter limits maximal quantity of attack. The aicraft/group will not make more attack than allowed even if the target group not destroyed and the aicraft/group still have ammo. If not defined the aircraft/group will attack target until it will be destroyed or until the aircraft/group will run out of ammo.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+(optional) Desired ingress direction from the target to the attacking aircraft. Group/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain group/aircraft will choose another direction.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean GroupAttack </em></code>: 
+(optional) Flag indicates that the target must be engaged by all aircrafts of the group. Has effect only if the task is assigned to a group, not to a single aircraft.</p>
 
 				</li>
 		</ul>
@@ -2330,9 +3041,8 @@ CSTask#Task> DCSTasks</p>
 				</li>
 				<li>
 				
-<p><code><em>#number lastWayPoint </em></code>: </p>
-
-<p>return DCSTask#Task</p>
+<p><code><em>#number lastWayPoint </em></code>: 
+return DCSTask#Task</p>
 
 				</li>
 		</ul>
@@ -2444,13 +3154,132 @@ The DCS task structure</p>
 		<dl class="function">
 <dt>
 
+<a id="#(GROUP).TaskEscort" >
+<strong>GROUP:TaskEscort(EscortGroup, PointVec3, LastWaypointIndex, EngagementDistanceMax, <, FollowGroup, EngagementDistance, TargetTypes)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Escort another airborne group.</p>
+
+	
+<p>The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+The unit / group will also protect that group from threats of specified types.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EscortGroup </em></code>: 
+The group to be escorted.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> PointVec3 </em></code>: 
+Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number LastWaypointIndex </em></code>: 
+Detach waypoint of another group. Once reached the unit / group Follow task is finished.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number EngagementDistanceMax </em></code>: 
+Maximal distance from escorted group to threat. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax. </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="##(list)">#list</a> &lt; </em></code>: 
+CSTypes#AttributeName> TargetTypes Array of AttributeName that is contains threat categories allowed to engage. </p>
+
+				</li>
+				<li>
+				
+<p><code><em> FollowGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> EngagementDistance </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> TargetTypes </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUP).TaskFAC_AttackGroup" >
+<strong>GROUP:TaskFAC_AttackGroup(AttackGroup, WeaponType, Designation, Datalink)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction.</p>
+
+	
+<p>The killer is player-controlled allied CAS-aircraft that is in contact with the FAC.
+If the task is assigned to the group lead unit will be a FAC. </p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> AttackGroup </em></code>: 
+Target GROUP.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number WeaponType </em></code>: 
+Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(AI.Task.Designation)">DCSTypes#AI.Task.Designation</a> Designation </em></code>: 
+(optional) Designation type.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#boolean Datalink </em></code>: 
+(optional) Allows to use datalink to send the target information to attack aircraft. Enabled by default. </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(GROUP).TaskFireAtPoint" >
 <strong>GROUP:TaskFireAtPoint(The, Radius, PointVec2)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Fires at a VEC2 point.</p>
+<p>(GROUND) Fire at a VEC2 point until ammunition is finished.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -2482,6 +3311,49 @@ The DCS task structure.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(GROUP).TaskFollow" >
+<strong>GROUP:TaskFollow(FollowGroup, PointVec3, LastWaypointIndex)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Following another airborne group.</p>
+
+	
+<p>The unit / group will follow lead unit of another group, wingmens of both groups will continue following their leaders. 
+If another group is on land the unit / group will orbit around. </p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> FollowGroup </em></code>: 
+The group to be followed.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> PointVec3 </em></code>: 
+Position of the unit / lead unit of the group relative lead unit of another group in frame reference oriented by course of lead unit of another group. If another group is on land the unit / group will orbit around.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number LastWaypointIndex </em></code>: 
+Detach waypoint of another group. Once reached the unit / group Follow task is finished.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(GROUP).TaskFunction" >
 <strong>GROUP:TaskFunction(WayPoint, WayPointIndex, FunctionString, FunctionArguments)</strong>
 </a>
@@ -2518,13 +3390,31 @@ The DCS task structure.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(GROUP).TaskHold" >
+<strong>GROUP:TaskHold()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(GROUND) Hold ground group from moving.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(GROUP).TaskHoldPosition" >
 <strong>GROUP:TaskHoldPosition(Duration)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Hold position at the current position of the first unit of the group.</p>
+<p>(AIR) Hold position at the current position of the first unit of the group.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -2551,7 +3441,10 @@ self</p>
 </dt>
 <dd>
 	
-<p>Land the group at a Vec2Point.</p>
+<p>(AIR HELICOPTER) Landing at the ground.</p>
+
+	
+<p>For helicopters only.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -2584,7 +3477,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Land the group at a @{Zone#ZONE).</p>
+<p>(AIR) Land the group at a @{Zone#ZONE).</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -2649,7 +3542,7 @@ A table containing the mission task.</p>
 </dt>
 <dd>
 	
-<p>Orbit at the current position of the first unit of the group at a specified alititude</p>
+<p>(AIR) Orbit at the current position of the first unit of the group at a specified alititude</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -2682,7 +3575,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Orbit at a specified position at a specified alititude during a specified duration with a specified speed.</p>
+<p>(AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -2715,6 +3608,27 @@ self</p>
 		<dl class="function">
 <dt>
 
+<a id="#(GROUP).TaskRefueling" >
+<strong>GROUP:TaskRefueling()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>(AIR) Refueling from the nearest tanker.</p>
+
+	
+<p>No parameters.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+The DCS task structure.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(GROUP).TaskRoute" >
 <strong>GROUP:TaskRoute(Points)</strong>
 </a>
@@ -2859,7 +3773,7 @@ The formation string.</p>
 </dt>
 <dd>
 	
-<p>Return a WrappedAction Task taking a Command </p>
+<p>Return a WrappedAction Task taking a Command</p>
 
 		<h3>Parameters</h3>
 		<ul>
diff --git a/Moose Training/Documentation/GroupSet.html b/Moose Training/Documentation/GroupSet.html
new file mode 100644
index 000000000..ec91f7267
--- /dev/null
+++ b/Moose Training/Documentation/GroupSet.html	
@@ -0,0 +1,618 @@
+<!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><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>GroupSet</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="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="StaticObject.html">StaticObject</a></li>
+					<li><a href="TASK.html">TASK</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="UnitSet.html">UnitSet</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>GroupSet</code></h1>
+   
+<p>Create and manage a set of groups.</p>
+
+   
+
+<h1><a href="##(GROUPSET)">#GROUPSET</a> class</h1>
+<p>Mission designers can use the GROUPSET class to build sets of groups belonging to certain:</p>
+
+<ul>
+    <li>Coalitions</li>
+    <li>Categories</li>
+    <li>Countries</li>
+    <li>Starting with certain prefix strings.</li>
+</ul>
+
+<h1>GROUPSET construction methods:</h1>
+<p>Create a new GROUPSET object with the <a href="##(GROUPSET).New">GROUPSET.New</a> method:</p>
+
+<ul>
+    <li><a href="##(GROUPSET).New">GROUPSET.New</a>: Creates a new GROUPSET object.</li>
+</ul>
+
+
+<h1>GROUPSET filter criteria: </h1>
+<p>You can set filter criteria to define the set of groups within the GROUPSET.
+Filter criteria are defined by:</p>
+
+<ul>
+    <li><a href="##(GROUPSET).FilterCoalitions">GROUPSET.FilterCoalitions</a>: Builds the GROUPSET with the groups belonging to the coalition(s).</li>
+    <li><a href="##(GROUPSET).FilterCategories">GROUPSET.FilterCategories</a>: Builds the GROUPSET with the groups belonging to the category(ies).</li>
+    <li><a href="##(GROUPSET).FilterCountries">GROUPSET.FilterCountries</a>: Builds the GROUPSET with the gruops belonging to the country(ies).</li>
+    <li><a href="##(GROUPSET).FilterPrefixes">GROUPSET.FilterPrefixes</a>: Builds the GROUPSET with the groups starting with the same prefix string(s).</li>
+</ul>
+
+<p>Once the filter criteria have been set for the GROUPSET, you can start filtering using:</p>
+
+<ul>
+    <li><a href="##(GROUPSET).FilterStart">GROUPSET.FilterStart</a>: Starts the filtering of the groups within the GROUPSET.</li>
+</ul>
+
+<p>Planned filter criteria within development are (so these are not yet available):</p>
+
+<ul>
+    <li><a href="##(GROUPSET).FilterZones">GROUPSET.FilterZones</a>: Builds the GROUPSET with the groups within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
+</ul>
+
+
+<h1>GROUPSET iterators:</h1>
+<p>Once the filters have been defined and the GROUPSET has been built, you can iterate the GROUPSET with the available iterator methods.
+The iterator methods will walk the GROUPSET set, and call for each element within the set a function that you provide.
+The following iterator methods are currently available within the GROUPSET:</p>
+
+<ul>
+    <li><a href="##(GROUPSET).ForEachGroup">GROUPSET.ForEachGroup</a>: Calls a function for each alive group it finds within the GROUPSET.</li>
+</ul>
+
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#GROUPSET">GROUPSET</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(GROUPSET)">Type <code>GROUPSET</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).AddInDatabase">GROUPSET: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="##(GROUPSET).ClassName">GROUPSET.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).Filter">GROUPSET.Filter</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FilterCategories">GROUPSET:FilterCategories(Categories)</a></td>
+		<td class="summary">
+<p>Builds a set of groups out of categories.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FilterCoalitions">GROUPSET:FilterCoalitions(Coalitions)</a></td>
+		<td class="summary">
+<p>Builds a set of groups of coalitions.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FilterCountries">GROUPSET:FilterCountries(Countries)</a></td>
+		<td class="summary">
+<p>Builds a set of groups of defined countries.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FilterMeta">GROUPSET.FilterMeta</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FilterPrefixes">GROUPSET:FilterPrefixes(Prefixes)</a></td>
+		<td class="summary">
+<p>Builds a set of groups of defined GROUP prefixes.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FilterStart">GROUPSET:FilterStart()</a></td>
+		<td class="summary">
+<p>Starts the filtering.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FindGroup">GROUPSET:FindGroup(GroupName)</a></td>
+		<td class="summary">
+<p>Finds a Group based on the Group Name.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).FindInDatabase">GROUPSET: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="##(GROUPSET).ForEachGroup">GROUPSET:ForEachGroup(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Interate the GROUPSET and call an interator function for each <strong>alive</strong> GROUP, providing the GROUP and optional parameters.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).IsIncludeObject">GROUPSET:IsIncludeObject(MooseGroup)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(GROUPSET).New">GROUPSET:New()</a></td>
+		<td class="summary">
+<p>Creates a new GROUPSET object, building a set of groups belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(GROUPSET)">#GROUPSET</a></em>
+<a id="GROUPSET" >
+<strong>GROUPSET</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(GroupSet)" >Type <code>GroupSet</code></a></h2>
+	
+			<h2><a id="#(GROUPSET)" >Type <code>GROUPSET</code></a></h2>
+				
+<p>GROUPSET class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).AddInDatabase" >
+<strong>GROUPSET: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 _DATABASE birth event gets called later than the SET 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 GROUP</p>
+
+				</li>
+				<li>
+				
+<p><em>#table:</em>
+The GROUP</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(GROUPSET).ClassName" >
+<strong>GROUPSET.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(GROUPSET).Filter" >
+<strong>GROUPSET.Filter</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FilterCategories" >
+<strong>GROUPSET:FilterCategories(Categories)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of groups 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="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FilterCoalitions" >
+<strong>GROUPSET:FilterCoalitions(Coalitions)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of groups 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="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FilterCountries" >
+<strong>GROUPSET:FilterCountries(Countries)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of groups 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="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(GROUPSET).FilterMeta" >
+<strong>GROUPSET.FilterMeta</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FilterPrefixes" >
+<strong>GROUPSET:FilterPrefixes(Prefixes)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of groups of defined GROUP prefixes.</p>
+
+	
+<p>All the groups 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 group name starts with.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FilterStart" >
+<strong>GROUPSET:FilterStart()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Starts the filtering.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FindGroup" >
+<strong>GROUPSET:FindGroup(GroupName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Finds a Group based on the Group Name.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string GroupName </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+The found Group.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).FindInDatabase" >
+<strong>GROUPSET: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 _DATABASE event gets called later than the SET 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 GROUP</p>
+
+				</li>
+				<li>
+				
+<p><em>#table:</em>
+The GROUP</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).ForEachGroup" >
+<strong>GROUPSET:ForEachGroup(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Interate the GROUPSET and call an interator function for each <strong>alive</strong> GROUP, providing the GROUP 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 GROUP in the GROUPSET. The function needs to accept a GROUP parameter.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).IsIncludeObject" >
+<strong>GROUPSET:IsIncludeObject(MooseGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> MooseGroup </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(GROUPSET)">#GROUPSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(GROUPSET).New" >
+<strong>GROUPSET:New()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new GROUPSET object, building a set of groups belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(GROUPSET)">#GROUPSET</a>:</em></p>
+
+
+			<h3>Usage:</h3>
+		<pre class="example"><code>-- Define a new GROUPSET Object. This DBObject will contain a reference to all alive GROUPS.
+DBObject = GROUPSET:New()</code></pre>
+
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/MISSION.html b/Moose Training/Documentation/MISSION.html
index 0e909bbc5..080e4f1ec 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="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>
@@ -42,11 +43,12 @@
 					<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>MISSION</li>
+					<li><a href="GroupSet.html">GroupSet</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>Mission</li>
 					<li><a href="NOTASK.html">NOTASK</a></li>
 					<li><a href="PICKUPTASK.html">PICKUPTASK</a></li>
 					<li><a href="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -66,7 +69,7 @@
 		</ul>
 	</div>
 	<div id="content">
-   <h1>Module <code>MISSION</code></h1>
+   <h1>Module <code>Mission</code></h1>
    
 <p>A MISSION is the main owner of a Mission orchestration within MOOSE .</p>
 
@@ -86,12 +89,6 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<td class="name" nowrap="nowrap"><a href="#MISSIONSCHEDULER">MISSIONSCHEDULER</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#TaskComplete">TaskComplete</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -101,8 +98,8 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 </td>
 		</tr>
 	</table>
-	<h2><a id="#(MISSION)" >Type <code>MISSION</code></a></h2>
-		<table class="function_list">
+			<h2><a id="#(MISSION)">Type <code>MISSION</code></a></h2>
+				<table class="function_list">
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(MISSION).AddClient">MISSION.AddClient(CLIENT, self, Client)</a></td>
 		<td class="summary">
@@ -197,6 +194,12 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<td class="name" nowrap="nowrap"><a href="##(MISSION).Meta">MISSION:Meta()</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).MissionBriefing">MISSION.MissionBriefing</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -466,24 +469,6 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em>#boolean</em>
-<a id="TaskComplete" >
-<strong>TaskComplete</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-	
-<p> For each Client, check for each Task the state and evolve the mission.
- This flag will indicate if the Task of the Client is Complete.</p>
-
 </dd>
 </dl>
 		<dl class="function">
@@ -511,8 +496,13 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 
 </dd>
 </dl>
-	<h2><a id="#(MISSION)" >Type <code>MISSION</code></a></h2>
-		<h3>Field(s)</h3>
+	<h2><a id="#(Mission)" >Type <code>Mission</code></a></h2>
+	
+			<h2><a id="#(MISSION)" >Type <code>MISSION</code></a></h2>
+				
+<p>The MISSION class</p>
+
+	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
@@ -550,10 +540,10 @@ Client is the <a href="CLIENT.html">CLIENT</a> object. The object must have been
 
 			<h3>Usage:</h3>
 		<pre class="example"><code>Add a number of Client objects to the Mission.
-	Mission:AddClient( CLIENT:New( 'US UH-1H*HOT-Deploy Troops 1', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )
-	Mission:AddClient( CLIENT:New( 'US UH-1H*RAMP-Deploy Troops 3', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )
-	Mission:AddClient( CLIENT:New( 'US UH-1H*HOT-Deploy Troops 2', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )
-	Mission:AddClient( CLIENT:New( 'US UH-1H*RAMP-Deploy Troops 4', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )</code></pre>
+	Mission:AddClient( CLIENT:FindByName( 'US UH-1H*HOT-Deploy Troops 1', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )
+	Mission:AddClient( CLIENT:FindByName( 'US UH-1H*RAMP-Deploy Troops 3', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )
+	Mission:AddClient( CLIENT:FindByName( 'US UH-1H*HOT-Deploy Troops 2', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )
+	Mission:AddClient( CLIENT:FindByName( 'US UH-1H*RAMP-Deploy Troops 4', 'Transport 3 groups of air defense engineers from our barracks "Gold" and "Titan" to each patriot battery control center to activate our air defenses.' ):Transport() )</code></pre>
 
 </dd>
 </dl>
@@ -885,6 +875,20 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(MISSION).MissionBriefing" >
+<strong>MISSION.MissionBriefing</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1197,7 +1201,7 @@ local Mission = MISSIONSCHEDULER.AddMission( 'Rescue secret agent', 'Tactical',
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em><a href="##(MISSION.Clients)">#MISSION.Clients</a></em>
 <a id="#(MISSION)._Clients" >
 <strong>MISSION._Clients</strong>
 </a>
@@ -1237,6 +1241,8 @@ local Mission = MISSIONSCHEDULER.AddMission( 'Rescue secret agent', 'Tactical',
 </dd>
 </dl>
 
+			<h2><a id="#(MISSION.Clients)" >Type <code>MISSION.Clients</code></a></h2>
+			
 			<h2><a id="#(MISSIONSCHEDULER)" >Type <code>MISSIONSCHEDULER</code></a></h2>
 				
 <p>The MISSIONSCHEDULER is an OBJECT and is the main scheduler of ALL active MISSIONs registered within this scheduler.</p>
@@ -1339,7 +1345,7 @@ MissionFind = MISSIONSCHEDULER:FindMission( 'Russia Transport Troops SA-6' )</co
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em><a href="##(MISSIONSCHEDULER.MISSIONS)">#MISSIONSCHEDULER.MISSIONS</a></em>
 <a id="#(MISSIONSCHEDULER).Missions" >
 <strong>MISSIONSCHEDULER.Missions</strong>
 </a>
@@ -1491,6 +1497,9 @@ MISSIONSCHEDULER:RemoveMission( 'Russia Transport Troops SA-6' )</code></pre>
 	
 
 
+	
+<p>MISSIONSCHEDULER.SchedulerId = routines.scheduleFunction( MISSIONSCHEDULER.Scheduler, { }, 0, 2 )</p>
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1628,6 +1637,8 @@ MISSIONSCHEDULER:RemoveMission( 'Russia Transport Troops SA-6' )</code></pre>
 </dd>
 </dl>
 
+			<h2><a id="#(MISSIONSCHEDULER.MISSIONS)" >Type <code>MISSIONSCHEDULER.MISSIONS</code></a></h2>
+			
 </div>
 
 </div>
diff --git a/Moose Training/Documentation/MOVEMENT.html b/Moose Training/Documentation/MOVEMENT.html
index 5d35d954c..feee71367 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</a></li>
 					<li>MOVEMENT</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Menu.html b/Moose Training/Documentation/Menu.html
index 286cd3f1f..33582dadc 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
 					<li>Menu</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Message.html b/Moose Training/Documentation/Message.html
index e7fb13b06..e61742e06 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
 					<li><a href="Menu.html">Menu</a></li>
 					<li>Message</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/MissileTrainer.html b/Moose Training/Documentation/MissileTrainer.html
index 8e21f7b5b..46f34d872 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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>MissileTrainer</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/NOTASK.html b/Moose Training/Documentation/NOTASK.html
index 8aeb474b4..3c056316d 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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>NOTASK</li>
 					<li><a href="PICKUPTASK.html">PICKUPTASK</a></li>
 					<li><a href="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/PICKUPTASK.html b/Moose Training/Documentation/PICKUPTASK.html
index 079600693..e73b68b2a 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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>PICKUPTASK</li>
 					<li><a href="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/ROUTETASK.html b/Moose Training/Documentation/ROUTETASK.html
index b53f143b3..05c8b48a8 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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>ROUTETASK</li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/STAGE.html b/Moose Training/Documentation/STAGE.html
index c45a68326..34233aaa0 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -274,6 +277,16 @@
 		<td class="name" nowrap="nowrap"><a href="##(STAGE).WaitTime">STAGE.WaitTime</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(STAGEBRIEF)">Type <code>STAGEBRIEF</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(STAGEBRIEF).StageBriefingTime">STAGEBRIEF.StageBriefingTime</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 	</table>
@@ -809,6 +822,23 @@
 
 			<h2><a id="#(STAGEARRIVE)" >Type <code>STAGEARRIVE</code></a></h2>
 			
+			<h2><a id="#(STAGEBRIEF)" >Type <code>STAGEBRIEF</code></a></h2>
+				<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(STAGEBRIEF).StageBriefingTime" >
+<strong>STAGEBRIEF.StageBriefingTime</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+
 			<h2><a id="#(STAGELANDING)" >Type <code>STAGELANDING</code></a></h2>
 			
 			<h2><a id="#(STAGEROUTE)" >Type <code>STAGEROUTE</code></a></h2>
diff --git a/Moose Training/Documentation/Scheduler.html b/Moose Training/Documentation/Scheduler.html
index 0b09abf54..8272a801a 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -91,8 +94,6 @@
 </ul>
 
 
-
-
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
@@ -120,12 +121,6 @@
 		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Repeat">SCHEDULER.Repeat</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Scheduler">SCHEDULER:Scheduler()</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -138,6 +133,12 @@
 		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Stop">SCHEDULER:Stop()</a></td>
 		<td class="summary">
 <p>Stops the scheduler.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER)._Scheduler">SCHEDULER:_Scheduler()</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 	</table>
@@ -253,19 +254,6 @@ self</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SCHEDULER).Scheduler" >
-<strong>SCHEDULER:Scheduler()</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -302,6 +290,19 @@ self</p>
 <p><em><a href="##(SCHEDULER)">#SCHEDULER</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULER)._Scheduler" >
+<strong>SCHEDULER:_Scheduler()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/Scoring.html b/Moose Training/Documentation/Scoring.html
index bcecc4626..5779476cc 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Sead.html b/Moose Training/Documentation/Sead.html
index e8bf12d86..96abe0840 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Set.html b/Moose Training/Documentation/Set.html
index e43329a31..6a1c4fc64 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -154,111 +157,21 @@ The following iterator methods are currently available within the SET:</p>
 			<h2><a id="#(SET)">Type <code>SET</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).AddUnit">SET:AddUnit(UnitToAdd)</a></td>
-		<td class="summary">
-<p>Finds a Unit based on the Unit Name.</p>
-</td>
-		</tr>
-		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET).ClassName">SET.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).Clients">SET.Clients</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET).Database">SET.Database</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).ClientsAlive">SET.ClientsAlive</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET).Flush">SET:Flush()</a></td>
 		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).DCSGroups">SET.DCSGroups</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).DCSGroupsAlive">SET.DCSGroupsAlive</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).DCSUnits">SET.DCSUnits</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).DCSUnitsAlive">SET.DCSUnitsAlive</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).Filter">SET.Filter</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterCategories">SET:FilterCategories(Categories)</a></td>
-		<td class="summary">
-<p>Builds a set of units out of categories.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterCoalitions">SET:FilterCoalitions(Coalitions)</a></td>
-		<td class="summary">
-<p>Builds a set of units of coalitons.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterCountries">SET:FilterCountries(Countries)</a></td>
-		<td class="summary">
-<p>Builds a set of units of defined countries.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterGroupPrefixes">SET:FilterGroupPrefixes(Prefixes)</a></td>
-		<td class="summary">
-<p>Builds a set of units of defined group prefixes.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterMeta">SET.FilterMeta</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterStart">SET:FilterStart()</a></td>
-		<td class="summary">
-<p>Starts the filtering.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterTypes">SET:FilterTypes(Types)</a></td>
-		<td class="summary">
-<p>Builds a set of units of defined unit types.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FilterUnitPrefixes">SET:FilterUnitPrefixes(Prefixes)</a></td>
-		<td class="summary">
-<p>Builds a set of units of defined unit prefixes.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).FindUnit">SET:FindUnit(UnitName)</a></td>
-		<td class="summary">
-<p>Finds a Unit based on the Unit Name.</p>
+<p>Flushes the current SET contents in the log ...</p>
 </td>
 		</tr>
 		<tr>
@@ -268,99 +181,33 @@ The following iterator methods are currently available within the SET:</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).ForEachClient">SET:ForEachClient(IteratorFunction, ...)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET).IsIncludeObject">SET:IsIncludeObject(Object)</a></td>
 		<td class="summary">
-<p>Interate the SET and call an interator function for each client, providing the Client to the function and optional parameters.</p>
+<p>Decides whether to include the Object</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).ForEachDCSUnitAlive">SET:ForEachDCSUnitAlive(IteratorFunction, ...)</a></td>
-		<td class="summary">
-<p>Interate the SET 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).ForEachPlayer">SET:ForEachPlayer(IteratorFunction, ...)</a></td>
-		<td class="summary">
-<p>Interate the SET and call an interator function for each <strong>alive</strong> player, providing the Unit of the player and optional parameters.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).Groups">SET.Groups</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).GroupsAlive">SET.GroupsAlive</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).NavPoints">SET.NavPoints</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).New">SET:New()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET).New">SET:New(Database)</a></td>
 		<td class="summary">
 <p>Creates a new SET 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).Players">SET.Players</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET).Set">SET.Set</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).PlayersAlive">SET.PlayersAlive</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET)._Add">SET:_Add(ObjectName, Object)</a></td>
 		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).ScanEnvironment">SET:ScanEnvironment()</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).Statics">SET.Statics</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).Templates">SET.Templates</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).TraceDatabase">SET:TraceDatabase()</a></td>
-		<td class="summary">
-<p>Traces the current SET contents in the log ...</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).Units">SET.Units</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET).UnitsAlive">SET.UnitsAlive</a></td>
-		<td class="summary">
-
+<p>Adds a Object based on the Object Name.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET)._EventOnBirth">SET:_EventOnBirth(Event)</a></td>
 		<td class="summary">
-<p>Handles the OnBirth event for the alive units set.</p>
+<p>Handles the OnBirth event for the Set.</p>
 </td>
 		</tr>
 		<tr>
@@ -370,45 +217,15 @@ The following iterator methods are currently available within the SET:</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET)._EventOnPlayerEnterUnit">SET:_EventOnPlayerEnterUnit(Event)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET)._FilterStart">SET:_FilterStart()</a></td>
 		<td class="summary">
-<p>Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).</p>
+<p>Starts the filtering for the defined collection.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET)._EventOnPlayerLeaveUnit">SET:_EventOnPlayerLeaveUnit(Event)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SET)._Find">SET:_Find(ObjectName)</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="##(SET)._IsAliveDCSGroup">SET:_IsAliveDCSGroup(DCSGroup)</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET)._IsAliveDCSUnit">SET:_IsAliveDCSUnit(DCSUnit)</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET)._IsIncludeDCSUnit">SET:_IsIncludeDCSUnit(DCSUnit)</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET)._RegisterDatabase">SET:_RegisterDatabase()</a></td>
-		<td class="summary">
-<p>Private method that registers all datapoints within in the mission.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SET)._RegisterPlayers">SET:_RegisterPlayers()</a></td>
-		<td class="summary">
-<p>Private method that registers all alive players in the mission.</p>
+<p>Finds an Object based on the Object Name.</p>
 </td>
 		</tr>
 	</table>
@@ -438,32 +255,6 @@ The following iterator methods are currently available within the SET:</p>
 		<dl class="function">
 <dt>
 
-<a id="#(SET).AddUnit" >
-<strong>SET:AddUnit(UnitToAdd)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Finds a Unit based on the Unit Name.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> UnitToAdd </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
-The added Unit.</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
 		<em>#string</em>
 <a id="#(SET).ClassName" >
 <strong>SET.ClassName</strong>
@@ -479,8 +270,8 @@ The added Unit.</p>
 <dt>
 
 		<em></em>
-<a id="#(SET).Clients" >
-<strong>SET.Clients</strong>
+<a id="#(SET).Database" >
+<strong>SET.Database</strong>
 </a>
 </dt>
 <dd>
@@ -492,322 +283,21 @@ The added Unit.</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
-<a id="#(SET).ClientsAlive" >
-<strong>SET.ClientsAlive</strong>
+<a id="#(SET).Flush" >
+<strong>SET:Flush()</strong>
 </a>
 </dt>
 <dd>
 	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).DCSGroups" >
-<strong>SET.DCSGroups</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).DCSGroupsAlive" >
-<strong>SET.DCSGroupsAlive</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).DCSUnits" >
-<strong>SET.DCSUnits</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).DCSUnitsAlive" >
-<strong>SET.DCSUnitsAlive</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).Filter" >
-<strong>SET.Filter</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterCategories" >
-<strong>SET:FilterCategories(Categories)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Builds a set of units out of categories.</p>
+<p>Flushes the current SET contents in the log ...</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)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterCoalitions" >
-<strong>SET:FilterCoalitions(Coalitions)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Builds a set of units of coalitons.</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)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterCountries" >
-<strong>SET:FilterCountries(Countries)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Builds a set of units 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)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterGroupPrefixes" >
-<strong>SET:FilterGroupPrefixes(Prefixes)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Builds a set of units of defined group prefixes.</p>
-
-	
-<p>All the units starting with the given group 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 group name where the unit belongs to starts with.</p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).FilterMeta" >
-<strong>SET.FilterMeta</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterStart" >
-<strong>SET:FilterStart()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Starts the filtering.</p>
+<p>(for debug reasons).</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterTypes" >
-<strong>SET:FilterTypes(Types)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Builds a set of units of defined unit 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)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FilterUnitPrefixes" >
-<strong>SET:FilterUnitPrefixes(Prefixes)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Builds a set of units of defined unit prefixes.</p>
-
-	
-<p>All the units 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 unit name starts with.</p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).FindUnit" >
-<strong>SET:FindUnit(UnitName)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Finds a Unit based on the Unit Name.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string UnitName </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
-The found Unit.</p>
+<p><em>#string:</em>
+A string with the names of the objects.</p>
 
 </dd>
 </dl>
@@ -851,25 +341,19 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(SET).ForEachClient" >
-<strong>SET:ForEachClient(IteratorFunction, ...)</strong>
+<a id="#(SET).IsIncludeObject" >
+<strong>SET:IsIncludeObject(Object)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Interate the SET and call an interator function for each client, providing the Client to the function and optional parameters.</p>
+<p>Decides whether to include the Object</p>
 
-		<h3>Parameters</h3>
+		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em>#function IteratorFunction </em></code>: 
-The function that will be called when there is an alive player in the SET. The function needs to accept a CLIENT parameter.</p>
-
-				</li>
-				<li>
-				
-<p><code><em> ... </em></code>: </p>
+<p><code><em>#table Object </em></code>: </p>
 
 				</li>
 		</ul>
@@ -878,125 +362,27 @@ The function that will be called when there is an alive player in the SET. The f
 <p><em><a href="##(SET)">#SET</a>:</em>
 self</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).ForEachDCSUnitAlive" >
-<strong>SET:ForEachDCSUnitAlive(IteratorFunction, ...)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Interate the SET and call an interator function for each <strong>alive</strong> unit, providing the Unit 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 unit in the SET. 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)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).ForEachPlayer" >
-<strong>SET:ForEachPlayer(IteratorFunction, ...)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Interate the SET and call an interator function for each <strong>alive</strong> player, providing the Unit of the player 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 player in the SET. 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)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).Groups" >
-<strong>SET.Groups</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).GroupsAlive" >
-<strong>SET.GroupsAlive</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).NavPoints" >
-<strong>SET.NavPoints</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 <a id="#(SET).New" >
-<strong>SET:New()</strong>
+<strong>SET:New(Database)</strong>
 </a>
 </dt>
 <dd>
 	
 <p>Creates a new SET object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
 
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Database </em></code>: </p>
+
+				</li>
+		</ul>
 		<h3>Return value</h3>
 				
 <p><em><a href="##(SET)">#SET</a>:</em></p>
@@ -1012,8 +398,8 @@ DBObject = SET:New()</code></pre>
 <dt>
 
 		<em></em>
-<a id="#(SET).Players" >
-<strong>SET.Players</strong>
+<a id="#(SET).Set" >
+<strong>SET.Set</strong>
 </a>
 </dt>
 <dd>
@@ -1025,104 +411,31 @@ DBObject = SET:New()</code></pre>
 		<dl class="function">
 <dt>
 
-		<em></em>
-<a id="#(SET).PlayersAlive" >
-<strong>SET.PlayersAlive</strong>
+<a id="#(SET)._Add" >
+<strong>SET:_Add(ObjectName, Object)</strong>
 </a>
 </dt>
 <dd>
 	
+<p>Adds a Object based on the Object Name.</p>
 
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string ObjectName </em></code>: </p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).ScanEnvironment" >
-<strong>SET:ScanEnvironment()</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).Statics" >
-<strong>SET.Statics</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).Templates" >
-<strong>SET.Templates</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET).TraceDatabase" >
-<strong>SET:TraceDatabase()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Traces the current SET contents in the log ...</p>
-
-	
-<p>(for debug reasons).</p>
+				</li>
+				<li>
+				
+<p><code><em>#table Object </em></code>: </p>
 
+				</li>
+		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).Units" >
-<strong>SET.Units</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SET).UnitsAlive" >
-<strong>SET.UnitsAlive</strong>
-</a>
-</dt>
-<dd>
-	
-
+<p><em>#table:</em>
+The added Object.</p>
 
 </dd>
 </dl>
@@ -1135,7 +448,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Handles the OnBirth event for the alive units set.</p>
+<p>Handles the OnBirth event for the Set.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -1171,133 +484,13 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(SET)._EventOnPlayerEnterUnit" >
-<strong>SET:_EventOnPlayerEnterUnit(Event)</strong>
+<a id="#(SET)._FilterStart" >
+<strong>SET:_FilterStart()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET)._EventOnPlayerLeaveUnit" >
-<strong>SET:_EventOnPlayerLeaveUnit(Event)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Handles the OnPlayerLeaveUnit event to clean the active players table.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET)._IsAliveDCSGroup" >
-<strong>SET:_IsAliveDCSGroup(DCSGroup)</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a> DCSGroup </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET)._IsAliveDCSUnit" >
-<strong>SET:_IsAliveDCSUnit(DCSUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET)._IsIncludeDCSUnit" >
-<strong>SET:_IsIncludeDCSUnit(DCSUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SET)._RegisterDatabase" >
-<strong>SET:_RegisterDatabase()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Private method that registers all datapoints within in the mission.</p>
+<p>Starts the filtering for the defined collection.</p>
 
 		<h3>Return value</h3>
 				
@@ -1309,18 +502,26 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(SET)._RegisterPlayers" >
-<strong>SET:_RegisterPlayers()</strong>
+<a id="#(SET)._Find" >
+<strong>SET:_Find(ObjectName)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Private method that registers all alive players in the mission.</p>
+<p>Finds an Object based on the Object Name.</p>
 
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string ObjectName </em></code>: </p>
+
+				</li>
+		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(SET)">#SET</a>:</em>
-self</p>
+<p><em>#table:</em>
+The Object found.</p>
 
 </dd>
 </dl>
diff --git a/Moose Training/Documentation/Spawn.html b/Moose Training/Documentation/Spawn.html
index 9d0eb5271..7420637c5 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/StaticObject.html b/Moose Training/Documentation/StaticObject.html
index a49ce3be6..4c683810a 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<li>StaticObject</li>
 					<li><a href="TASK.html">TASK</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/TASK.html b/Moose Training/Documentation/TASK.html
index 301d33c96..95a1bb086 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li>TASK</li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/Unit.html b/Moose Training/Documentation/Unit.html
index b1d81bcd6..3d7fab51f 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="TASK.html">TASK</a></li>
 					<li>Unit</li>
+					<li><a href="UnitSet.html">UnitSet</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>
diff --git a/Moose Training/Documentation/UnitSet.html b/Moose Training/Documentation/UnitSet.html
new file mode 100644
index 000000000..6b2a18d04
--- /dev/null
+++ b/Moose Training/Documentation/UnitSet.html	
@@ -0,0 +1,683 @@
+<!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><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="GroupSet.html">GroupSet</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="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="StaticObject.html">StaticObject</a></li>
+					<li><a href="TASK.html">TASK</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li>UnitSet</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>UnitSet</code></h1>
+   
+<p>Create and manage a set of units.</p>
+
+   
+
+<h1><a href="##(UNITSET)">#UNITSET</a> class</h1>
+<p>Mission designers can use the UNITSET class to build sets of units belonging to certain:</p>
+
+<ul>
+    <li>Coalitions</li>
+    <li>Categories</li>
+    <li>Countries</li>
+    <li>Unit types</li>
+    <li>Starting with certain prefix strings.</li>
+</ul>
+
+<h1>UNITSET construction methods:</h1>
+<p>Create a new UNITSET object with the <a href="##(UNITSET).New">UNITSET.New</a> method:</p>
+
+<ul>
+    <li><a href="##(UNITSET).New">UNITSET.New</a>: Creates a new UNITSET object.</li>
+</ul>
+
+
+<h1>UNITSET filter criteria: </h1>
+<p>You can set filter criteria to define the set of units within the UNITSET.
+Filter criteria are defined by:</p>
+
+<ul>
+    <li><a href="##(UNITSET).FilterCoalitions">UNITSET.FilterCoalitions</a>: Builds the UNITSET with the units belonging to the coalition(s).</li>
+    <li><a href="##(UNITSET).FilterCategories">UNITSET.FilterCategories</a>: Builds the UNITSET with the units belonging to the category(ies).</li>
+    <li><a href="##(UNITSET).FilterTypes">UNITSET.FilterTypes</a>: Builds the UNITSET with the units belonging to the unit type(s).</li>
+    <li><a href="##(UNITSET).FilterCountries">UNITSET.FilterCountries</a>: Builds the UNITSET with the units belonging to the country(ies).</li>
+    <li><a href="##(UNITSET).FilterPrefixes">UNITSET.FilterPrefixes</a>: Builds the UNITSET with the units starting with the same prefix string(s).</li>
+</ul>
+
+<p>Once the filter criteria have been set for the UNITSET, you can start filtering using:</p>
+
+<ul>
+    <li><a href="##(UNITSET).FilterStart">UNITSET.FilterStart</a>: Starts the filtering of the units within the UNITSET.</li>
+</ul>
+
+<p>Planned filter criteria within development are (so these are not yet available):</p>
+
+<ul>
+    <li><a href="##(UNITSET).FilterZones">UNITSET.FilterZones</a>: Builds the UNITSET with the units within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
+</ul>
+
+
+<h1>UNITSET iterators:</h1>
+<p>Once the filters have been defined and the UNITSET has been built, you can iterate the UNITSET with the available iterator methods.
+The iterator methods will walk the UNITSET set, and call for each element within the set a function that you provide.
+The following iterator methods are currently available within the UNITSET:</p>
+
+<ul>
+    <li><a href="##(UNITSET).ForEachUnit">UNITSET.ForEachUnit</a>: Calls a function for each alive unit it finds within the UNITSET.</li>
+</ul>
+
+<p>Planned iterators methods in development are (so these are not yet available):</p>
+
+<ul>
+    <li><a href="##(UNITSET).ForEachUnitInGroup">UNITSET.ForEachUnitInGroup</a>: Calls a function for each group contained within the UNITSET.</li>
+    <li><a href="##(UNITSET).ForEachUnitInZone">UNITSET.ForEachUnitInZone</a>: Calls a function for each unit within a certain zone contained within the UNITSET.</li>
+</ul>
+
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#UNITSET">UNITSET</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(UNITSET)">Type <code>UNITSET</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).AddInDatabase">UNITSET: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="##(UNITSET).ClassName">UNITSET.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).Filter">UNITSET.Filter</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterCategories">UNITSET:FilterCategories(Categories)</a></td>
+		<td class="summary">
+<p>Builds a set of units out of categories.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterCoalitions">UNITSET:FilterCoalitions(Coalitions)</a></td>
+		<td class="summary">
+<p>Builds a set of units of coalitions.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterCountries">UNITSET:FilterCountries(Countries)</a></td>
+		<td class="summary">
+<p>Builds a set of units of defined countries.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterMeta">UNITSET.FilterMeta</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterPrefixes">UNITSET:FilterPrefixes(Prefixes)</a></td>
+		<td class="summary">
+<p>Builds a set of units of defined unit prefixes.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterStart">UNITSET:FilterStart()</a></td>
+		<td class="summary">
+<p>Starts the filtering.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FilterTypes">UNITSET:FilterTypes(Types)</a></td>
+		<td class="summary">
+<p>Builds a set of units of defined unit types.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).FindInDatabase">UNITSET: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="##(UNITSET).FindUnit">UNITSET:FindUnit(UnitName)</a></td>
+		<td class="summary">
+<p>Finds a Unit based on the Unit Name.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).ForEachUnit">UNITSET:ForEachUnit(IteratorFunction, ...)</a></td>
+		<td class="summary">
+<p>Interate the UNITSET 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="##(UNITSET).IsIncludeObject">UNITSET:IsIncludeObject(MUnit)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(UNITSET).New">UNITSET:New()</a></td>
+		<td class="summary">
+<p>Creates a new UNITSET 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="##(UNITSET).Units">UNITSET.Units</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(UNITSET)">#UNITSET</a></em>
+<a id="UNITSET" >
+<strong>UNITSET</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(UnitSet)" >Type <code>UnitSet</code></a></h2>
+	
+			<h2><a id="#(UNITSET)" >Type <code>UNITSET</code></a></h2>
+				
+<p>UNITSET class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).AddInDatabase" >
+<strong>UNITSET: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 _DATABASE birth event gets called later than the SET 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 UNIT</p>
+
+				</li>
+				<li>
+				
+<p><em>#table:</em>
+The UNIT</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(UNITSET).ClassName" >
+<strong>UNITSET.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(UNITSET).Filter" >
+<strong>UNITSET.Filter</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FilterCategories" >
+<strong>UNITSET:FilterCategories(Categories)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of units 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="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FilterCoalitions" >
+<strong>UNITSET:FilterCoalitions(Coalitions)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of units 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="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FilterCountries" >
+<strong>UNITSET:FilterCountries(Countries)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of units 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="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(UNITSET).FilterMeta" >
+<strong>UNITSET.FilterMeta</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FilterPrefixes" >
+<strong>UNITSET:FilterPrefixes(Prefixes)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of units of defined unit prefixes.</p>
+
+	
+<p>All the units 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 unit name starts with.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FilterStart" >
+<strong>UNITSET:FilterStart()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Starts the filtering.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FilterTypes" >
+<strong>UNITSET:FilterTypes(Types)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Builds a set of units of defined unit 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="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FindInDatabase" >
+<strong>UNITSET: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 _DATABASE event gets called later than the SET 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 UNIT</p>
+
+				</li>
+				<li>
+				
+<p><em>#table:</em>
+The UNIT</p>
+
+				</li>
+			</ol>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).FindUnit" >
+<strong>UNITSET:FindUnit(UnitName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Finds a Unit based on the Unit Name.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string UnitName </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+The found Unit.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).ForEachUnit" >
+<strong>UNITSET:ForEachUnit(IteratorFunction, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Interate the UNITSET and call an interator function for each <strong>alive</strong> UNIT, providing the UNIT 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 UNIT in the UNITSET. 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="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).IsIncludeObject" >
+<strong>UNITSET:IsIncludeObject(MUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> MUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(UNITSET)">#UNITSET</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(UNITSET).New" >
+<strong>UNITSET:New()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new UNITSET object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(UNITSET)">#UNITSET</a>:</em></p>
+
+
+			<h3>Usage:</h3>
+		<pre class="example"><code>-- Define a new UNITSET Object. This DBObject will contain a reference to all alive Units.
+DBObject = UNITSET:New()</code></pre>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(UNITSET).Units" >
+<strong>UNITSET.Units</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Zone.html b/Moose Training/Documentation/Zone.html
index 447c617e5..315f8ebe5 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</a></li>
 					<li>Zone</li>
 					<li><a href="env.html">env</a></li>
 					<li><a href="land.html">land</a></li>
diff --git a/Moose Training/Documentation/env.html b/Moose Training/Documentation/env.html
index 5a02f5de9..7afe0823f 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</a></li>
 					<li><a href="Zone.html">Zone</a></li>
 					<li>env</li>
 					<li><a href="land.html">land</a></li>
diff --git a/Moose Training/Documentation/index.html b/Moose Training/Documentation/index.html
index e260bcbe9..734897a86 100644
--- a/Moose Training/Documentation/index.html	
+++ b/Moose Training/Documentation/index.html	
@@ -17,6 +17,7 @@
 				index
 			</li></ul>
 		<ul>
+					<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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -68,6 +71,19 @@
 	<div id="content">
 <h2>Module</h2>
 	<table class="module_list">
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="Airbase.html">Airbase</a></td>
+			<td class="summary">
+<p>AIRBASE Class</p>
+
+<h1><a href="AIRBASE.html">AIRBASE</a> class</h1>
+<p>The <a href="AIRBASE.html">AIRBASE</a> class is a wrapper class to handle the DCS Airbase objects:</p>
+
+<ul>
+    <li>Support all DCS Airbase APIs.</li>
+</ul>
+</td>
+			</tr>
 			<tr>
 			<td class="name" nowrap="nowrap"><a href="Base.html">Base</a></td>
 			<td class="summary">
@@ -191,7 +207,7 @@
 			<tr>
 			<td class="name" nowrap="nowrap"><a href="Database.html">Database</a></td>
 			<td class="summary">
-<p>Manage sets of units and groups.</p>
+<p>Manage the mission database.</p>
 </td>
 			</tr>
 			<tr>
@@ -219,9 +235,9 @@
 </td>
 			</tr>
 			<tr>
-			<td class="name" nowrap="nowrap"><a href="MISSION.html">MISSION</a></td>
+			<td class="name" nowrap="nowrap"><a href="GroupSet.html">GroupSet</a></td>
 			<td class="summary">
-<p>A MISSION is the main owner of a Mission orchestration within MOOSE .</p>
+<p>Create and manage a set of groups.</p>
 </td>
 			</tr>
 			<tr>
@@ -246,6 +262,12 @@
 			<td class="name" nowrap="nowrap"><a href="MissileTrainer.html">MissileTrainer</a></td>
 			<td class="summary">
 <p>Provides missile training functions.</p>
+</td>
+			</tr>
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="Mission.html">Mission</a></td>
+			<td class="summary">
+<p>A MISSION is the main owner of a Mission orchestration within MOOSE .</p>
 </td>
 			</tr>
 			<tr>
@@ -325,6 +347,12 @@
 <ul>
     <li>Support all DCS Unit APIs.</li>
 </ul>
+</td>
+			</tr>
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="UnitSet.html">UnitSet</a></td>
+			<td class="summary">
+<p>Create and manage a set of units.</p>
 </td>
 			</tr>
 			<tr>
diff --git a/Moose Training/Documentation/land.html b/Moose Training/Documentation/land.html
index 82d512824..0a1a6c817 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</a></li>
 					<li><a href="Zone.html">Zone</a></li>
 					<li><a href="env.html">env</a></li>
 					<li>land</li>
diff --git a/Moose Training/Documentation/routines.html b/Moose Training/Documentation/routines.html
index 198b37402..e9e546ca5 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="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>
@@ -42,11 +43,12 @@
 					<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="MISSION.html">MISSION</a></li>
+					<li><a href="GroupSet.html">GroupSet</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="ROUTETASK.html">ROUTETASK</a></li>
@@ -59,6 +61,7 @@
 					<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="UnitSet.html">UnitSet</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>
@@ -1200,8 +1203,6 @@
 </dl>
 	<h2><a id="#(routines)" >Type <code>routines</code></a></h2>
 	
-			<h2><a id="#(Time)" >Type <code>Time</code></a></h2>
-			
 </div>
 
 </div>