diff --git a/Moose Development/Moose/AI/AI_Balancer.lua b/Moose Development/Moose/AI/AI_Balancer.lua
index f443fea20..75a1c5a2c 100644
--- a/Moose Development/Moose/AI/AI_Balancer.lua	
+++ b/Moose Development/Moose/AI/AI_Balancer.lua	
@@ -1,35 +1,35 @@
---- This module contains the AIBALANCER class.
+--- This module contains the AI_BALANCER class.
 -- 
 -- ===
 -- 
--- 1) @{AI.AI_Balancer#AIBALANCER} class, extends @{Core.Fsm#FSM_SET}
+-- 1) @{AI.AI_Balancer#AI_BALANCER} class, extends @{Core.Fsm#FSM_SET}
 -- ===================================================================================
--- The @{AI.AI_Balancer#AIBALANCER} class monitors and manages as many AI GROUPS as there are
+-- The @{AI.AI_Balancer#AI_BALANCER} class monitors and manages as many AI GROUPS as there are
 -- CLIENTS in a SET_CLIENT collection not occupied by players.
--- The AIBALANCER class manages internally a collection of AI management objects, which govern the behaviour 
+-- The AI_BALANCER class manages internally a collection of AI management objects, which govern the behaviour 
 -- of the underlying AI GROUPS.
 -- 
 -- The parent class @{Core.Fsm#FSM_SET} manages the functionality to control the Finite State Machine (FSM) 
 -- and calls for each event the state transition methods providing the internal @{Core.Fsm#FSM_SET.Set} object containing the
 -- SET_GROUP and additional event parameters provided during the event.
 -- 
--- 1.1) AIBALANCER construction method
+-- 1.1) AI_BALANCER construction method
 -- ---------------------------------------
--- Create a new AIBALANCER object with the @{#AIBALANCER.New} method:
+-- Create a new AI_BALANCER object with the @{#AI_BALANCER.New} method:
 -- 
---    * @{#AIBALANCER.New}: Creates a new AIBALANCER object.
+--    * @{#AI_BALANCER.New}: Creates a new AI_BALANCER object.
 --    
 -- 1.2) 
 -- ----
 --    * Add
 --    * Remove
 -- 
--- 1.2) AIBALANCER returns AI to Airbases
+-- 1.2) AI_BALANCER returns AI to Airbases
 -- ------------------------------------------
 -- You can configure to have the AI to return to:
 -- 
---    * @{#AIBALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
---    * @{#AIBALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
 -- --
 -- ===
 -- 
@@ -56,12 +56,12 @@
 -- ### Contributions: 
 -- 
 --   * **Dutch_Baron (James)**: Who you can search on the Eagle Dynamics Forums.  
---   Working together with James has resulted in the creation of the AIBALANCER class.  
+--   Working together with James has resulted in the creation of the AI_BALANCER class.  
 --   James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-)
 -- 
 --   * **SNAFU**:
 --   Had a couple of mails with the guys to validate, if the same concept in the GCI/CAP script could be reworked within MOOSE.
---   None of the script code has been used however within the new AIBALANCER moose class.
+--   None of the script code has been used however within the new AI_BALANCER moose class.
 -- 
 -- ### Authors: 
 -- 
@@ -71,24 +71,24 @@
 
 
 
---- AIBALANCER class
--- @type AIBALANCER
+--- AI_BALANCER class
+-- @type AI_BALANCER
 -- @field Core.Set#SET_CLIENT SetClient
 -- @extends Core.Fsm#FSM_SET
-AIBALANCER = {
-  ClassName = "AIBALANCER",
+AI_BALANCER = {
+  ClassName = "AI_BALANCER",
   PatrolZones = {},
   AIGroups = {},
 }
 
---- Creates a new AIBALANCER object
--- @param #AIBALANCER self
+--- Creates a new AI_BALANCER object
+-- @param #AI_BALANCER self
 -- @param Core.Set#SET_CLIENT SetClient A SET\_CLIENT object that will contain the CLIENT objects to be monitored if they are alive or not (joined by a player).
 -- @param Functional.Spawn#SPAWN SpawnAI The default Spawn object to spawn new AI Groups when needed.
--- @return #AIBALANCER
+-- @return #AI_BALANCER
 -- @usage
--- -- Define a new AIBALANCER Object.
-function AIBALANCER:New( SetClient, SpawnAI )
+-- -- Define a new AI_BALANCER Object.
+function AI_BALANCER:New( SetClient, SpawnAI )
   
   -- Inherits from BASE
   local self = BASE:Inherit( self, FSM_SET:New( SET_GROUP:New() ) ) -- Core.Fsm#FSM_SET
@@ -116,10 +116,10 @@ function AIBALANCER:New( SetClient, SpawnAI )
 end
 
 --- Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
 -- @param Core.Set#SET_AIRBASE ReturnAirbaseSet The SET of @{Core.Set#SET_AIRBASE}s to evaluate where to return to.
-function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
+function AI_BALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
 
   self.ToNearestAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
@@ -127,19 +127,19 @@ function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseS
 end
 
 --- Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
-function AIBALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
+function AI_BALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
 
   self.ToHomeAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param #string ClientName
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
+function AI_BALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
 
   -- OK, Spawn a new group from the default SpawnAI object provided.
   local AIGroup = self.SpawnAI:Spawn()
@@ -153,18 +153,18 @@ function AIBALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
   self:Spawned( AIGroup ) 
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterDestroying( SetGroup, Event, From, To, AIGroup )
+function AI_BALANCER:onenterDestroying( SetGroup, Event, From, To, AIGroup )
 
   AIGroup:Destroy()
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
+function AI_BALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
 
     local AIGroupTemplate = AIGroup:GetTemplate()
     if self.ToHomeAirbase == true then
@@ -187,8 +187,8 @@ function AIBALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
 end
 
 
---- @param #AIBALANCER self
-function AIBALANCER:onenterMonitoring( SetGroup )
+--- @param #AI_BALANCER self
+function AI_BALANCER:onenterMonitoring( SetGroup )
 
   self.SetClient:ForEachClient(
     --- @param Wrapper.Client#CLIENT Client
diff --git a/Moose Development/Moose/AI/AI_Cargo.lua b/Moose Development/Moose/AI/AI_Cargo.lua
index f76a753c4..5c3da2180 100644
--- a/Moose Development/Moose/AI/AI_Cargo.lua	
+++ b/Moose Development/Moose/AI/AI_Cargo.lua	
@@ -4,31 +4,31 @@
 -- 
 -- Cargo can be of various forms, always are composed out of ONE object ( one unit or one static or one slingload crate ):
 --
---   * CARGO_UNIT, represented by a @{Unit} in a @{Group}: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.
+--   * AI_CARGO_UNIT, represented by a @{Unit} in a @{Group}: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.
 --   * CARGO_STATIC, represented by a @{Static}: Cargo can be represented by a Static. Destruction of the Static will mean that the cargo is lost.
---   * CARGO_PACKAGE, contained in a @{Unit} of a @{Group}: Cargo can be contained within a Unit of a Group. The cargo can be **delivered** by the @{Unit}. If the Unit is destroyed, the cargo will be destroyed also.
---   * CARGO_PACKAGE, Contained in a @{Static}: Cargo can be contained within a Static. The cargo can be **collected** from the @Static. If the @{Static} is destroyed, the cargo will be destroyed.
+--   * AI_CARGO_PACKAGE, contained in a @{Unit} of a @{Group}: Cargo can be contained within a Unit of a Group. The cargo can be **delivered** by the @{Unit}. If the Unit is destroyed, the cargo will be destroyed also.
+--   * AI_CARGO_PACKAGE, Contained in a @{Static}: Cargo can be contained within a Static. The cargo can be **collected** from the @Static. If the @{Static} is destroyed, the cargo will be destroyed.
 --   * CARGO_SLINGLOAD, represented by a @{Cargo} that is transportable: Cargo can be represented by a Cargo object that is transportable. Destruction of the Cargo will mean that the cargo is lost.
 --   
---   * CARGO_GROUPED, represented by a Group of CARGO_UNITs.
+--   * AI_CARGO_GROUPED, represented by a Group of CARGO_UNITs.
 -- 
--- 1) @{AI.AI_Cargo#CARGO_BASE} class, extends @{Core.Fsm#FSM_PROCESS}
+-- 1) @{AI.AI_Cargo#AI_CARGO} class, extends @{Core.Fsm#FSM_PROCESS}
 -- ==========================================================================
--- The @{#CARGO_BASE} class defines the core functions that defines a cargo object within MOOSE.
+-- The @{#AI_CARGO} class defines the core functions that defines a cargo object within MOOSE.
 -- A cargo is a logical object defined that is available for transport, and has a life status within a simulation.
 --
--- The CARGO_BASE is a state machine: it manages the different events and states of the cargo.
--- All derived classes from CARGO_BASE follow the same state machine, expose the same cargo event functions, and provide the same cargo states.
+-- The AI_CARGO is a state machine: it manages the different events and states of the cargo.
+-- All derived classes from AI_CARGO follow the same state machine, expose the same cargo event functions, and provide the same cargo states.
 -- 
--- ## 1.2.1) CARGO_BASE Events:
+-- ## 1.2.1) AI_CARGO Events:
 -- 
---   * @{#CARGO_BASE.Board}( ToCarrier ):  Boards the cargo to a carrier.
---   * @{#CARGO_BASE.Load}( ToCarrier ): Loads the cargo into a carrier, regardless of its position.
---   * @{#CARGO_BASE.UnBoard}( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.
---   * @{#CARGO_BASE.UnLoad}( ToPointVec2 ): UnLoads the cargo from a carrier.
---   * @{#CARGO_BASE.Dead}( Controllable ): The cargo is dead. The cargo process will be ended.
+--   * @{#AI_CARGO.Board}( ToCarrier ):  Boards the cargo to a carrier.
+--   * @{#AI_CARGO.Load}( ToCarrier ): Loads the cargo into a carrier, regardless of its position.
+--   * @{#AI_CARGO.UnBoard}( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.
+--   * @{#AI_CARGO.UnLoad}( ToPointVec2 ): UnLoads the cargo from a carrier.
+--   * @{#AI_CARGO.Dead}( Controllable ): The cargo is dead. The cargo process will be ended.
 -- 
--- ## 1.2.2) CARGO_BASE States:
+-- ## 1.2.2) AI_CARGO States:
 -- 
 --   * **UnLoaded**: The cargo is unloaded from a carrier.
 --   * **Boarding**: The cargo is currently boarding (= running) into a carrier.
@@ -37,7 +37,7 @@
 --   * **Dead**: The cargo is dead ...
 --   * **End**: The process has come to an end.
 --   
--- ## 1.2.3) CARGO_BASE state transition methods:
+-- ## 1.2.3) AI_CARGO state transition methods:
 -- 
 -- State transition functions can be set **by the mission designer** customizing or improving the behaviour of the state.
 -- There are 2 moments when state transition methods will be called by the state machine:
@@ -52,15 +52,15 @@
 --     The state transition method needs to start with the name **OnAfter + the name of the state**. 
 --     These state transition methods need to provide a return value, which is specified at the function description.
 -- 
--- 2) #CARGO_UNIT class
+-- 2) #AI_CARGO_UNIT class
 -- ====================
--- The CARGO_UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
--- Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO_UNIT objects to and from carriers.
+-- The AI_CARGO_UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
+-- Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI_CARGO_UNIT objects to and from carriers.
 -- 
--- 5) #CARGO_GROUPED class
+-- 5) #AI_CARGO_GROUPED class
 -- =======================
--- The CARGO_GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
--- Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO_UNIT objects to and from carriers.
+-- The AI_CARGO_GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
+-- Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI_CARGO_UNIT objects to and from carriers.
 -- 
 -- This module is still under construction, but is described above works already, and will keep working ...
 -- 
@@ -72,14 +72,14 @@
 
 --- Boards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo to the Carrier.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] Board
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] Board
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
 --- Boards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo to the Carrier.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] __Board
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __Board
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
@@ -88,14 +88,14 @@
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] UnBoard
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] UnBoard
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] __UnBoard
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __UnBoard
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
@@ -104,14 +104,14 @@
 
 --- Loads the cargo to a Carrier. The event will load the cargo into the Carrier regardless of its position. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] Load
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] Load
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
 --- Loads the cargo to a Carrier. The event will load the cargo into the Carrier regardless of its position. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] __Load
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __Load
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
@@ -120,14 +120,14 @@
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] UnLoad
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] UnLoad
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] __UnLoad
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __UnLoad
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
@@ -135,46 +135,46 @@
 
 -- UnLoaded
 
---- @function [parent=#CARGO_BASE] OnBeforeUnLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeUnLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterUnLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterUnLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- Loaded
 
---- @function [parent=#CARGO_BASE] OnBeforeLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- Boarding
 
---- @function [parent=#CARGO_BASE] OnBeforeBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- UnBoarding
 
---- @function [parent=#CARGO_BASE] OnBeforeUnBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeUnBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterUnBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterUnBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 
@@ -182,9 +182,9 @@
 
 CARGOS = {}
 
-do -- CARGO_BASE
+do -- AI_CARGO
 
-  --- @type CARGO_BASE
+  --- @type AI_CARGO
   -- @extends Core.Fsm#FSM_PROCESS
   -- @field #string Type A string defining the type of the cargo. eg. Engineers, Equipment, Screwdrivers.
   -- @field #string Name A string defining the name of the cargo. The name is the unique identifier of the cargo.
@@ -197,8 +197,8 @@ do -- CARGO_BASE
   -- @field #boolean Moveable This flag defines if the cargo is moveable.
   -- @field #boolean Representable This flag defines if the cargo can be represented by a DCS Unit.
   -- @field #boolean Containable This flag defines if the cargo can be contained within a DCS Unit.
-  CARGO_BASE = {
-    ClassName = "CARGO_BASE",
+  AI_CARGO = {
+    ClassName = "AI_CARGO",
     Type = nil,
     Name = nil,
     Weight = nil,
@@ -210,19 +210,19 @@ do -- CARGO_BASE
     Containable = false,
   }
 
---- @type CARGO_BASE.CargoObjects
+--- @type AI_CARGO.CargoObjects
 -- @map < #string, Wrapper.Positionable#POSITIONABLE > The alive POSITIONABLE objects representing the the cargo.
 
 
---- CARGO_BASE Constructor. This class is an abstract class and should not be instantiated.
--- @param #CARGO_BASE self
+--- AI_CARGO Constructor. This class is an abstract class and should not be instantiated.
+-- @param #AI_CARGO self
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_BASE
-function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius )
+-- @return #AI_CARGO
+function AI_CARGO:New( Type, Name, Weight, ReportRadius, NearRadius )
 
   local self = BASE:Inherit( self, FSM:New() ) -- Core.Fsm#FSM_CONTROLLABLE
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
@@ -259,20 +259,20 @@ function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius )
 end
 
 
---- Template method to spawn a new representation of the CARGO_BASE in the simulator.
--- @param #CARGO_BASE self
--- @return #CARGO_BASE
-function CARGO_BASE:Spawn( PointVec2 )
+--- Template method to spawn a new representation of the AI_CARGO in the simulator.
+-- @param #AI_CARGO self
+-- @return #AI_CARGO
+function AI_CARGO:Spawn( PointVec2 )
   self:F()
 
 end
 
 
 --- Check if CargoCarrier is near the Cargo to be Loaded.
--- @param #CARGO_BASE self
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 PointVec2
 -- @return #boolean
-function CARGO_BASE:IsNear( PointVec2 )
+function AI_CARGO:IsNear( PointVec2 )
   self:F( { PointVec2 } )
 
   local Distance = PointVec2:DistanceFromPointVec2( self.CargoObject:GetPointVec2() )
@@ -287,36 +287,36 @@ end
 
 end
 
-do -- CARGO_REPRESENTABLE
+do -- AI_CARGO_REPRESENTABLE
 
-  --- @type CARGO_REPRESENTABLE
-  -- @extends #CARGO_BASE
-  CARGO_REPRESENTABLE = {
-    ClassName = "CARGO_REPRESENTABLE"
+  --- @type AI_CARGO_REPRESENTABLE
+  -- @extends #AI_CARGO
+  AI_CARGO_REPRESENTABLE = {
+    ClassName = "AI_CARGO_REPRESENTABLE"
   }
 
---- CARGO_REPRESENTABLE Constructor.
--- @param #CARGO_REPRESENTABLE self
+--- AI_CARGO_REPRESENTABLE Constructor.
+-- @param #AI_CARGO_REPRESENTABLE self
 -- @param Wrapper.Controllable#Controllable CargoObject
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_REPRESENTABLE
-function CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_BASE
+-- @return #AI_CARGO_REPRESENTABLE
+function AI_CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   return self
 end
 
 --- Route a cargo unit to a PointVec2.
--- @param #CARGO_REPRESENTABLE self
+-- @param #AI_CARGO_REPRESENTABLE self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #number Speed
--- @return #CARGO_REPRESENTABLE
-function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
+-- @return #AI_CARGO_REPRESENTABLE
+function AI_CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
   self:F2( ToPointVec2 )
 
   local Points = {}
@@ -331,27 +331,27 @@ function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
   return self  
 end
 
-end -- CARGO_BASE
+end -- AI_CARGO
 
-do -- CARGO_UNIT
+do -- AI_CARGO_UNIT
 
-  --- @type CARGO_UNIT
-  -- @extends #CARGO_REPRESENTABLE
-  CARGO_UNIT = {
-    ClassName = "CARGO_UNIT"
+  --- @type AI_CARGO_UNIT
+  -- @extends #AI_CARGO_REPRESENTABLE
+  AI_CARGO_UNIT = {
+    ClassName = "AI_CARGO_UNIT"
   }
 
---- CARGO_UNIT Constructor.
--- @param #CARGO_UNIT self
+--- AI_CARGO_UNIT Constructor.
+-- @param #AI_CARGO_UNIT self
 -- @param Wrapper.Unit#UNIT CargoUnit
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_UNIT
-function CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_UNIT
+-- @return #AI_CARGO_UNIT
+function AI_CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_REPRESENTABLE:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO_UNIT
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   self:T( CargoUnit )
@@ -363,12 +363,12 @@ function CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius
 end
 
 --- Enter UnBoarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
   self:F()
 
   local Angle = 180
@@ -408,12 +408,12 @@ function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- Leave UnBoarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -432,12 +432,12 @@ function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- UnBoard Event.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   self.CargoInAir = self.CargoObject:InAir()
@@ -457,12 +457,12 @@ end
 
 
 --- Enter UnLoaded State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2
-function CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2  )
+function AI_CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2  )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -495,12 +495,12 @@ end
 
 
 --- Enter Boarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   local Speed = 10
@@ -527,12 +527,12 @@ function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Leave Boarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
 
   if self:IsNear( CargoCarrier:GetPointVec2() ) then
@@ -545,12 +545,12 @@ function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Loaded State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier )
   self:F()
 
   self.CargoCarrier = CargoCarrier
@@ -564,11 +564,11 @@ end
 
 
 --- Board Event.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier )
   self:F()
 
   self.CargoInAir = self.CargoObject:InAir()
@@ -585,25 +585,25 @@ end
 
 end
 
-do -- CARGO_PACKAGE
+do -- AI_CARGO_PACKAGE
 
-  --- @type CARGO_PACKAGE
-  -- @extends #CARGO_REPRESENTABLE
-  CARGO_PACKAGE = {
-    ClassName = "CARGO_PACKAGE"
+  --- @type AI_CARGO_PACKAGE
+  -- @extends #AI_CARGO_REPRESENTABLE
+  AI_CARGO_PACKAGE = {
+    ClassName = "AI_CARGO_PACKAGE"
   }
 
---- CARGO_PACKAGE Constructor.
--- @param #CARGO_PACKAGE self
+--- AI_CARGO_PACKAGE Constructor.
+-- @param #AI_CARGO_PACKAGE self
 -- @param Wrapper.Unit#UNIT CargoCarrier The UNIT carrying the package.
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_PACKAGE
-function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_PACKAGE
+-- @return #AI_CARGO_PACKAGE
+function AI_CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO_PACKAGE
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   self:T( CargoCarrier )
@@ -613,7 +613,7 @@ function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, Near
 end
 
 --- Board Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -621,7 +621,7 @@ end
 -- @param #number Speed
 -- @param #number BoardDistance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
   self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
@@ -651,10 +651,10 @@ function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, Boa
 end
 
 --- Check if CargoCarrier is near the Cargo to be Loaded.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @return #boolean
-function CARGO_PACKAGE:IsNear( CargoCarrier )
+function AI_CARGO_PACKAGE:IsNear( CargoCarrier )
   self:F()
 
   local CargoCarrierPoint = CargoCarrier:GetPointVec2()
@@ -670,12 +670,12 @@ function CARGO_PACKAGE:IsNear( CargoCarrier )
 end
 
 --- Boarded Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
   self:F()
 
   if self:IsNear( CargoCarrier ) then
@@ -686,7 +686,7 @@ function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, B
 end
 
 --- UnBoard Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -695,7 +695,7 @@ end
 -- @param #number UnBoardDistance
 -- @param #number Radius
 -- @param #number Angle
-function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
+function AI_CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
   self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
@@ -728,12 +728,12 @@ function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnL
 end
 
 --- UnBoarded Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
+function AI_CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
   self:F()
 
   if self:IsNear( CargoCarrier ) then
@@ -744,7 +744,7 @@ function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
 end
 
 --- Load Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -752,7 +752,7 @@ end
 -- @param #number Speed
 -- @param #number LoadDistance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle )
   self:F()
 
   self.CargoCarrier = CargoCarrier
@@ -772,13 +772,13 @@ function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDi
 end
 
 --- UnLoad Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param #number Distance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle )
+function AI_CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle )
   self:F()
   
   local StartPointVec2 = self.CargoCarrier:GetPointVec2()
@@ -800,27 +800,27 @@ end
 
 end
 
-do -- CARGO_GROUP
+do -- AI_CARGO_GROUP
 
-  --- @type CARGO_GROUP
-  -- @extends AI.AI_Cargo#CARGO_BASE
+  --- @type AI_CARGO_GROUP
+  -- @extends AI.AI_Cargo#AI_CARGO
   -- @field Set#SET_BASE CargoSet A set of cargo objects.
   -- @field #string Name A string defining the name of the cargo group. The name is the unique identifier of the cargo.
-  CARGO_GROUP = {
-    ClassName = "CARGO_GROUP",
+  AI_CARGO_GROUP = {
+    ClassName = "AI_CARGO_GROUP",
   }
 
---- CARGO_GROUP constructor.
--- @param #CARGO_GROUP self
+--- AI_CARGO_GROUP constructor.
+-- @param #AI_CARGO_GROUP self
 -- @param Core.Set#Set_BASE CargoSet
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_GROUP
-function CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, 0, ReportRadius, NearRadius ) ) -- #CARGO_GROUP
+-- @return #AI_CARGO_GROUP
+function AI_CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO:New( Type, Name, 0, ReportRadius, NearRadius ) ) -- #AI_CARGO_GROUP
   self:F( { Type, Name, ReportRadius, NearRadius } )
 
   self.CargoSet = CargoSet
@@ -829,44 +829,44 @@ function CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
   return self
 end
 
-end -- CARGO_GROUP
+end -- AI_CARGO_GROUP
 
-do -- CARGO_GROUPED
+do -- AI_CARGO_GROUPED
 
-  --- @type CARGO_GROUPED
-  -- @extends AI.AI_Cargo#CARGO_GROUP
-  CARGO_GROUPED = {
-    ClassName = "CARGO_GROUPED",
+  --- @type AI_CARGO_GROUPED
+  -- @extends AI.AI_Cargo#AI_CARGO_GROUP
+  AI_CARGO_GROUPED = {
+    ClassName = "AI_CARGO_GROUPED",
   }
 
---- CARGO_GROUPED constructor.
--- @param #CARGO_GROUPED self
+--- AI_CARGO_GROUPED constructor.
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Set#Set_BASE CargoSet
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_GROUPED
-function CARGO_GROUPED:New( CargoSet, Type, Name, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius ) ) -- #CARGO_GROUPED
+-- @return #AI_CARGO_GROUPED
+function AI_CARGO_GROUPED:New( CargoSet, Type, Name, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius ) ) -- #AI_CARGO_GROUPED
   self:F( { Type, Name, ReportRadius, NearRadius } )
 
   return self
 end
 
 --- Enter Boarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   if From == "UnLoaded" then
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:__Board( 1, CargoCarrier )
@@ -879,16 +879,16 @@ function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Enter Loaded State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   if From == "UnLoaded" then
-    -- For each Cargo object within the CARGO_GROUPED, load each cargo to the CargoCarrier.
+    -- For each Cargo object within the AI_CARGO_GROUPED, load each cargo to the CargoCarrier.
     for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
       Cargo:Load( CargoCarrier )
     end
@@ -896,17 +896,17 @@ function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
 end
 
 --- Leave Boarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
 
   local Boarded = true
 
-  -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+  -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
   for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
     self:T( Cargo.current )
     if not Cargo:is( "Loaded" ) then
@@ -923,19 +923,19 @@ function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Enter UnBoarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
   self:F()
 
   local Timer = 1
 
   if From == "Loaded" then
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:__UnBoard( Timer, ToPointVec2 )
@@ -949,12 +949,12 @@ function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- Leave UnBoarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -964,7 +964,7 @@ function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   if From == "UnBoarding" then
     local UnBoarded = true
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
       self:T( Cargo.current )
       if not Cargo:is( "UnLoaded" ) then
@@ -984,12 +984,12 @@ function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- UnBoard Event.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   self:__UnLoad( 1, ToPointVec2 )
@@ -998,17 +998,17 @@ end
 
 
 --- Enter UnLoaded State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   if From == "Loaded" then
     
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:UnLoad( ToPointVec2 )
@@ -1019,7 +1019,7 @@ function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
 
 end
 
-end -- CARGO_GROUPED
+end -- AI_CARGO_GROUPED
 
 
 
diff --git a/Moose Development/Moose/AI/AI_Patrol.lua b/Moose Development/Moose/AI/AI_Patrol.lua
index 3a76374b2..6781fe964 100644
--- a/Moose Development/Moose/AI/AI_Patrol.lua	
+++ b/Moose Development/Moose/AI/AI_Patrol.lua	
@@ -2,9 +2,9 @@
 -- 
 -- ===
 -- 
--- 1) @{#PATROLZONE} class, extends @{Core.Fsm#FSM_CONTROLLABLE}
+-- 1) @{#AI_PATROLZONE} class, extends @{Core.Fsm#FSM_CONTROLLABLE}
 -- ================================================================
--- The @{#PATROLZONE} class implements the core functions to patrol a @{Zone} by an AIR @{Controllable} @{Group}.
+-- The @{#AI_PATROLZONE} class implements the core functions to patrol a @{Zone} by an AIR @{Controllable} @{Group}.
 -- The patrol algorithm works that for each airplane patrolling, upon arrival at the patrol zone,
 -- a random point is selected as the route point within the 3D space, within the given boundary limits.
 -- The airplane will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits.
@@ -12,24 +12,24 @@
 -- This cycle will continue until a fuel treshold has been reached by the airplane.
 -- When the fuel treshold has been reached, the airplane will fly towards the nearest friendly airbase and will land.
 -- 
--- 1.1) PATROLZONE constructor:
+-- 1.1) AI_PATROLZONE constructor:
 -- ----------------------------
 --   
---   * @{#PATROLZONE.New}(): Creates a new PATROLZONE object.
+--   * @{#AI_PATROLZONE.New}(): Creates a new AI_PATROLZONE object.
 -- 
--- 1.2) PATROLZONE state machine:
+-- 1.2) AI_PATROLZONE state machine:
 -- ----------------------------------
--- The PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.
+-- The AI_PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.
 -- 
--- ### 1.2.1) PATROLZONE Events:
+-- ### 1.2.1) AI_PATROLZONE Events:
 -- 
---   * @{#PATROLZONE.Route}( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
---   * @{#PATROLZONE.Patrol}( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.
---   * @{#PATROLZONE.RTB}( AIControllable ): The AIControllable will report return to base.
---   * @{#PATROLZONE.End}( AIControllable ): The end of the PATROLZONE process.
---   * @{#PATROLZONE.Dead}( AIControllable ): The AIControllable is dead. The PATROLZONE process will be ended.
+--   * @{#AI_PATROLZONE.Route}( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
+--   * @{#AI_PATROLZONE.Patrol}( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.
+--   * @{#AI_PATROLZONE.RTB}( AIControllable ): The AIControllable will report return to base.
+--   * @{#AI_PATROLZONE.End}( AIControllable ): The end of the AI_PATROLZONE process.
+--   * @{#AI_PATROLZONE.Dead}( AIControllable ): The AIControllable is dead. The AI_PATROLZONE process will be ended.
 -- 
--- ### 1.2.2) PATROLZONE States:
+-- ### 1.2.2) AI_PATROLZONE States:
 -- 
 --   * **Route**: A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
 --   * **Patrol**: The AIControllable is patrolling. This state is set every 30 seconds, so every 30 seconds, a state transition method can be used.
@@ -37,7 +37,7 @@
 --   * **Dead**: The AIControllable is dead ...
 --   * **End**: The process has come to an end.
 --   
--- ### 1.2.3) PATROLZONE state transition methods:
+-- ### 1.2.3) AI_PATROLZONE state transition methods:
 -- 
 -- State transition functions can be set **by the mission designer** customizing or improving the behaviour of the state.
 -- There are 2 moments when state transition methods will be called by the state machine:
@@ -52,7 +52,7 @@
 --     The state transition method needs to start with the name **OnAfter + the name of the state**. 
 --     These state transition methods need to provide a return value, which is specified at the function description.
 --
--- An example how to manage a state transition for an PATROLZONE object **Patrol** for the state **RTB**:
+-- An example how to manage a state transition for an AI_PATROLZONE object **Patrol** for the state **RTB**:
 -- 
 --      local PatrolZoneGroup = GROUP:FindByName( "Patrol Zone" )
 --      local PatrolZone = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
@@ -60,46 +60,46 @@
 --      local PatrolSpawn = SPAWN:New( "Patrol Group" )
 --      local PatrolGroup = PatrolSpawn:Spawn()
 --
---      local Patrol = PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
+--      local Patrol = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
 --      Patrol:SetControllable( PatrolGroup )
 --      Patrol:ManageFuel( 0.2, 60 )
 --
--- **OnBefore**RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but **before** the RTB default action is processed by the PATROLZONE object.
+-- **OnBefore**RTB( AIGroup ) will be called by the AI_PATROLZONE object when the AIGroup reports RTB, but **before** the RTB default action is processed by the AI_PATROLZONE object.
 --
---      --- State transition function for the PATROLZONE **Patrol** object
---      -- @param #PATROLZONE self 
+--      --- State transition function for the AI_PATROLZONE **Patrol** object
+--      -- @param #AI_PATROLZONE self 
 --      -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
 --      -- @return #boolean If false is returned, then the OnAfter state transition method will not be called.
 --      function Patrol:OnBeforeRTB( AIGroup )
 --        AIGroup:MessageToRed( "Returning to base", 20 )
 --      end
 --       
--- **OnAfter**RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but **after** the RTB default action was processed by the PATROLZONE object.
+-- **OnAfter**RTB( AIGroup ) will be called by the AI_PATROLZONE object when the AIGroup reports RTB, but **after** the RTB default action was processed by the AI_PATROLZONE object.
 --
---      --- State transition function for the PATROLZONE **Patrol** object
---      -- @param #PATROLZONE self 
+--      --- State transition function for the AI_PATROLZONE **Patrol** object
+--      -- @param #AI_PATROLZONE self 
 --      -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
 --      -- @return #Wrapper.Controllable#CONTROLLABLE The new AIGroup object that is set to be patrolling the zone.
 --      function Patrol:OnAfterRTB( AIGroup )
 --        return PatrolSpawn:Spawn()
 --      end 
 --    
--- 1.3) Manage the PATROLZONE parameters:
+-- 1.3) Manage the AI_PATROLZONE parameters:
 -- ------------------------------------------
--- The following methods are available to modify the parameters of a PATROLZONE object:
+-- The following methods are available to modify the parameters of a AI_PATROLZONE object:
 -- 
---   * @{#PATROLZONE.SetControllable}(): Set the AIControllable.
---   * @{#PATROLZONE.GetControllable}(): Get the AIControllable.
---   * @{#PATROLZONE.SetSpeed}(): Set the patrol speed of the AI, for the next patrol.
---   * @{#PATROLZONE.SetAltitude}(): Set altitude of the AI, for the next patrol.
+--   * @{#AI_PATROLZONE.SetControllable}(): Set the AIControllable.
+--   * @{#AI_PATROLZONE.GetControllable}(): Get the AIControllable.
+--   * @{#AI_PATROLZONE.SetSpeed}(): Set the patrol speed of the AI, for the next patrol.
+--   * @{#AI_PATROLZONE.SetAltitude}(): Set altitude of the AI, for the next patrol.
 -- 
--- 1.3) Manage the out of fuel in the PATROLZONE:
+-- 1.3) Manage the out of fuel in the AI_PATROLZONE:
 -- ----------------------------------------------
 -- When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 -- Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
--- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+-- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 -- Once the time is finished, the old AIControllable will return to the base.
--- Use the method @{#PATROLZONE.ManageFuel}() to have this proces in place.
+-- Use the method @{#AI_PATROLZONE.ManageFuel}() to have this proces in place.
 -- 
 -- ====
 -- 
@@ -135,20 +135,20 @@
 -- State Transition Functions
 
 --- OnBefore State Transition Function
--- @function [parent=#PATROLZONE] OnBeforeRoute
--- @param #PATROLZONE self
+-- @function [parent=#AI_PATROLZONE] OnBeforeRoute
+-- @param #AI_PATROLZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
 --- OnAfter State Transition Function
--- @function [parent=#PATROLZONE] OnAfterRoute
--- @param #PATROLZONE self
+-- @function [parent=#AI_PATROLZONE] OnAfterRoute
+-- @param #AI_PATROLZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 
 
---- PATROLZONE class
--- @type PATROLZONE
+--- AI_PATROLZONE class
+-- @type AI_PATROLZONE
 -- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Controllable} patrolling.
 -- @field Core.Zone#ZONE_BASE PatrolZone The @{Zone} where the patrol needs to be executed.
 -- @field Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
@@ -156,26 +156,26 @@
 -- @field Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @field Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
 -- @extends Core.Fsm#FSM_CONTROLLABLE
-PATROLZONE = {
-  ClassName = "PATROLZONE",
+AI_PATROLZONE = {
+  ClassName = "AI_PATROLZONE",
 }
 
 
 
---- Creates a new PATROLZONE object
--- @param #PATROLZONE self
+--- Creates a new AI_PATROLZONE object
+-- @param #AI_PATROLZONE self
 -- @param Core.Zone#ZONE_BASE PatrolZone The @{Zone} where the patrol needs to be executed.
 -- @param Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Altitude PatrolCeilingAltitude The highest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @param Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
--- @return #PATROLZONE self
+-- @return #AI_PATROLZONE self
 -- @usage
--- -- Define a new PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
+-- -- Define a new AI_PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
 -- PatrolZone = ZONE:New( 'PatrolZone' )
 -- PatrolSpawn = SPAWN:New( 'Patrol Group' )
--- PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )
-function PATROLZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
+-- PatrolArea = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )
+function AI_PATROLZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
 
   -- Inherits from BASE
   local self = BASE:Inherit( self, FSM_CONTROLLABLE:New() ) -- Core.Fsm#FSM_CONTROLLABLE
@@ -201,11 +201,11 @@ end
 
 
 --- Sets (modifies) the minimum and maximum speed of the patrol.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @param Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
--- @return #PATROLZONE self
-function PATROLZONE:SetSpeed( PatrolMinSpeed, PatrolMaxSpeed )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:SetSpeed( PatrolMinSpeed, PatrolMaxSpeed )
   self:F2( { PatrolMinSpeed, PatrolMaxSpeed } )
   
   self.PatrolMinSpeed = PatrolMinSpeed
@@ -215,11 +215,11 @@ end
 
 
 --- Sets the floor and ceiling altitude of the patrol.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Altitude PatrolCeilingAltitude The highest altitude in meters where to execute the patrol.
--- @return #PATROLZONE self
-function PATROLZONE:SetAltitude( PatrolFloorAltitude, PatrolCeilingAltitude )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:SetAltitude( PatrolFloorAltitude, PatrolCeilingAltitude )
   self:F2( { PatrolFloorAltitude, PatrolCeilingAltitude } )
   
   self.PatrolFloorAltitude = PatrolFloorAltitude
@@ -232,7 +232,7 @@ end
 function _NewPatrolRoute( AIControllable )
 
   AIControllable:T( "NewPatrolRoute" )
-  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#PATROLZONE
+  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#AI_PATROLZONE
   PatrolZone:__Route( 1 )
 end
 
@@ -241,13 +241,13 @@ end
 
 --- When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 -- Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
--- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+-- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 -- Once the time is finished, the old AIControllable will return to the base.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param #number PatrolFuelTresholdPercentage The treshold in percentage (between 0 and 1) when the AIControllable is considered to get out of fuel.
 -- @param #number PatrolOutOfFuelOrbitTime The amount of seconds the out of fuel AIControllable will orbit before returning to the base.
--- @return #PATROLZONE self
-function PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime )
 
   self.PatrolManageFuel = true
   self.PatrolFuelTresholdPercentage = PatrolFuelTresholdPercentage
@@ -257,9 +257,9 @@ function PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrb
 end
 
 --- Defines a new patrol route using the @{Process_PatrolZone} parameters and settings.
--- @param #PATROLZONE self
--- @return #PATROLZONE self
-function PATROLZONE:onenterRoute()
+-- @param #AI_PATROLZONE self
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:onenterRoute()
 
   self:F2()
 
@@ -354,8 +354,8 @@ function PATROLZONE:onenterRoute()
 end
 
 
---- @param #PATROLZONE self
-function PATROLZONE:onenterPatrol()
+--- @param #AI_PATROLZONE self
+function AI_PATROLZONE:onenterPatrol()
   self:F2()
 
   if self.Controllable and self.Controllable:IsAlive() then
diff --git a/Moose Development/Moose/Tasking/Task_AIBalancer.lua b/Moose Development/Moose/Tasking/Task_AIBalancer.lua
index 43056420f..d68c991f8 100644
--- a/Moose Development/Moose/Tasking/Task_AIBalancer.lua	
+++ b/Moose Development/Moose/Tasking/Task_AIBalancer.lua	
@@ -1,29 +1,29 @@
---- This module contains the AIBALANCER class.
+--- This module contains the AI_BALANCER class.
 -- 
 -- ===
 -- 
--- 1) @{AI.AI_Balancer#AIBALANCER} class, extends @{Core.Base#BASE}
+-- 1) @{AI.AI_Balancer#AI_BALANCER} class, extends @{Core.Base#BASE}
 -- =======================================================
--- The @{AI.AI_Balancer#AIBALANCER} class controls the dynamic spawning of AI GROUPS depending on a SET_CLIENT.
+-- The @{AI.AI_Balancer#AI_BALANCER} class controls the dynamic spawning of AI GROUPS depending on a SET_CLIENT.
 -- There will be as many AI GROUPS spawned as there at CLIENTS in SET_CLIENT not spawned.
--- The AI_Balancer uses the @{PatrolCore.Zone#PATROLZONE} class to make AI patrol an zone until the fuel treshold is reached.
+-- The AI_Balancer uses the @{PatrolCore.Zone#AI_PATROLZONE} class to make AI patrol an zone until the fuel treshold is reached.
 -- 
--- 1.1) AIBALANCER construction method:
+-- 1.1) AI_BALANCER construction method:
 -- ------------------------------------
--- Create a new AIBALANCER object with the @{#AIBALANCER.New} method:
+-- Create a new AI_BALANCER object with the @{#AI_BALANCER.New} method:
 -- 
---    * @{#AIBALANCER.New}: Creates a new AIBALANCER object.
+--    * @{#AI_BALANCER.New}: Creates a new AI_BALANCER object.
 -- 
--- 1.2) AIBALANCER returns AI to Airbases:
+-- 1.2) AI_BALANCER returns AI to Airbases:
 -- ---------------------------------------
 -- You can configure to have the AI to return to:
 -- 
---    * @{#AIBALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
---    * @{#AIBALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
 -- 
--- 1.3) AIBALANCER allows AI to patrol specific zones:
+-- 1.3) AI_BALANCER allows AI to patrol specific zones:
 -- ---------------------------------------------------
--- Use @{AI.AI_Balancer#AIBALANCER.SetPatrolZone}() to specify a zone where the AI needs to patrol.
+-- Use @{AI.AI_Balancer#AI_BALANCER.SetPatrolZone}() to specify a zone where the AI needs to patrol.
 --
 -- ===
 -- 
@@ -50,12 +50,12 @@
 -- ### Contributions: 
 -- 
 --   * **Dutch_Baron (James)**: Who you can search on the Eagle Dynamics Forums.  
---   Working together with James has resulted in the creation of the AIBALANCER class.  
+--   Working together with James has resulted in the creation of the AI_BALANCER class.  
 --   James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-)
 -- 
 --   * **SNAFU**:
 --   Had a couple of mails with the guys to validate, if the same concept in the GCI/CAP script could be reworked within MOOSE.
---   None of the script code has been used however within the new AIBALANCER moose class.
+--   None of the script code has been used however within the new AI_BALANCER moose class.
 -- 
 -- ### Authors: 
 -- 
@@ -65,28 +65,28 @@
 
 
 
---- AIBALANCER class
--- @type AIBALANCER
+--- AI_BALANCER class
+-- @type AI_BALANCER
 -- @field Core.Set#SET_CLIENT SetClient
 -- @field Functional.Spawn#SPAWN SpawnAI
 -- @field #boolean ToNearestAirbase
 -- @field Core.Set#SET_AIRBASE ReturnAirbaseSet
 -- @field Dcs.DCSTypes#Distance ReturnTresholdRange
 -- @field #boolean ToHomeAirbase
--- @field PatrolCore.Zone#PATROLZONE PatrolZone
+-- @field PatrolCore.Zone#AI_PATROLZONE PatrolZone
 -- @extends Core.Base#BASE
-AIBALANCER = {
-  ClassName = "AIBALANCER",
+AI_BALANCER = {
+  ClassName = "AI_BALANCER",
   PatrolZones = {},
   AIGroups = {},
 }
 
---- Creates a new AIBALANCER object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.
--- @param #AIBALANCER self
+--- Creates a new AI_BALANCER object, building a set of units belonging to a coalitions, categories, countries, types or with defined prefix names.
+-- @param #AI_BALANCER self
 -- @param SetClient A SET_CLIENT object that will contain the CLIENT objects to be monitored if they are alive or not (joined by a player).
 -- @param SpawnAI A SPAWN object that will spawn the AI units required, balancing the SetClient.
--- @return #AIBALANCER self
-function AIBALANCER:New( SetClient, SpawnAI )
+-- @return #AI_BALANCER self
+function AI_BALANCER:New( SetClient, SpawnAI )
 
   -- Inherits from BASE
   local self = BASE:Inherit( self, BASE:New() )
@@ -122,10 +122,10 @@ function AIBALANCER:New( SetClient, SpawnAI )
 end
 
 --- Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
 -- @param Core.Set#SET_AIRBASE ReturnAirbaseSet The SET of @{Core.Set#SET_AIRBASE}s to evaluate where to return to.
-function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
+function AI_BALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
 
   self.ToNearestAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
@@ -133,21 +133,21 @@ function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseS
 end
 
 --- Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
-function AIBALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
+function AI_BALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
 
   self.ToHomeAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
 end
 
 --- Let the AI patrol a @{Zone} with a given Speed range and Altitude range.
--- @param #AIBALANCER self
--- @param PatrolCore.Zone#PATROLZONE PatrolZone The @{PatrolZone} where the AI needs to patrol.
--- @return PatrolCore.Zone#PATROLZONE self
-function AIBALANCER:SetPatrolZone( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
+-- @param #AI_BALANCER self
+-- @param PatrolCore.Zone#AI_PATROLZONE PatrolZone The @{PatrolZone} where the AI needs to patrol.
+-- @return PatrolCore.Zone#AI_PATROLZONE self
+function AI_BALANCER:SetPatrolZone( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
 
-  self.PatrolZone = PATROLZONE:New(
+  self.PatrolZone = AI_PATROLZONE:New(
     self.SpawnAI,
     PatrolZone,
     PatrolFloorAltitude,
@@ -158,17 +158,17 @@ function AIBALANCER:SetPatrolZone( PatrolZone, PatrolFloorAltitude, PatrolCeilin
 end
 
 --- Get the @{PatrolZone} object assigned by the @{AI_Balancer} object.
--- @param #AIBALANCER self
--- @return PatrolCore.Zone#PATROLZONE PatrolZone The @{PatrolZone} where the AI needs to patrol.
-function AIBALANCER:GetPatrolZone()
+-- @param #AI_BALANCER self
+-- @return PatrolCore.Zone#AI_PATROLZONE PatrolZone The @{PatrolZone} where the AI needs to patrol.
+function AI_BALANCER:GetPatrolZone()
 
   return self.PatrolZone
 end
 
 
 
---- @param #AIBALANCER self
-function AIBALANCER:_ClientAliveMonitorScheduler()
+--- @param #AI_BALANCER self
+function AI_BALANCER:_ClientAliveMonitorScheduler()
 
   self.SetClient:ForEachClient(
     --- @param Wrapper.Client#CLIENT Client
@@ -255,7 +255,7 @@ function AIBALANCER:_ClientAliveMonitorScheduler()
           
           --- Now test if the AIGroup needs to patrol a zone, otherwise let it follow its route...
           if self.PatrolZone then
-            self.PatrolZones[#self.PatrolZones+1] = PATROLZONE:New(
+            self.PatrolZones[#self.PatrolZones+1] = AI_PATROLZONE:New(
               self.PatrolZone.PatrolZone,
               self.PatrolZone.PatrolFloorAltitude,
               self.PatrolZone.PatrolCeilingAltitude,
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 b1d605373..ac46b458e 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: 20161216_1630' ) 
+env.info( 'Moose Generation Timestamp: 20161216_1640' ) 
 local base = _G
 
 Include = {}
@@ -23723,38 +23723,38 @@ function DETECTION_AREAS:CreateDetectionSets()
 end
 
 
---- This module contains the AIBALANCER class.
+--- This module contains the AI_BALANCER class.
 -- 
 -- ===
 -- 
--- 1) @{AI.AI_Balancer#AIBALANCER} class, extends @{Core.Fsm#FSM_SET}
+-- 1) @{AI.AI_Balancer#AI_BALANCER} class, extends @{Core.Fsm#FSM_SET}
 -- ===================================================================================
--- The @{AI.AI_Balancer#AIBALANCER} class monitors and manages as many AI GROUPS as there are
+-- The @{AI.AI_Balancer#AI_BALANCER} class monitors and manages as many AI GROUPS as there are
 -- CLIENTS in a SET_CLIENT collection not occupied by players.
--- The AIBALANCER class manages internally a collection of AI management objects, which govern the behaviour 
+-- The AI_BALANCER class manages internally a collection of AI management objects, which govern the behaviour 
 -- of the underlying AI GROUPS.
 -- 
 -- The parent class @{Core.Fsm#FSM_SET} manages the functionality to control the Finite State Machine (FSM) 
 -- and calls for each event the state transition methods providing the internal @{Core.Fsm#FSM_SET.Set} object containing the
 -- SET_GROUP and additional event parameters provided during the event.
 -- 
--- 1.1) AIBALANCER construction method
+-- 1.1) AI_BALANCER construction method
 -- ---------------------------------------
--- Create a new AIBALANCER object with the @{#AIBALANCER.New} method:
+-- Create a new AI_BALANCER object with the @{#AI_BALANCER.New} method:
 -- 
---    * @{#AIBALANCER.New}: Creates a new AIBALANCER object.
+--    * @{#AI_BALANCER.New}: Creates a new AI_BALANCER object.
 --    
 -- 1.2) 
 -- ----
 --    * Add
 --    * Remove
 -- 
--- 1.2) AIBALANCER returns AI to Airbases
+-- 1.2) AI_BALANCER returns AI to Airbases
 -- ------------------------------------------
 -- You can configure to have the AI to return to:
 -- 
---    * @{#AIBALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
---    * @{#AIBALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
 -- --
 -- ===
 -- 
@@ -23781,12 +23781,12 @@ end
 -- ### Contributions: 
 -- 
 --   * **Dutch_Baron (James)**: Who you can search on the Eagle Dynamics Forums.  
---   Working together with James has resulted in the creation of the AIBALANCER class.  
+--   Working together with James has resulted in the creation of the AI_BALANCER class.  
 --   James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-)
 -- 
 --   * **SNAFU**:
 --   Had a couple of mails with the guys to validate, if the same concept in the GCI/CAP script could be reworked within MOOSE.
---   None of the script code has been used however within the new AIBALANCER moose class.
+--   None of the script code has been used however within the new AI_BALANCER moose class.
 -- 
 -- ### Authors: 
 -- 
@@ -23796,24 +23796,24 @@ end
 
 
 
---- AIBALANCER class
--- @type AIBALANCER
+--- AI_BALANCER class
+-- @type AI_BALANCER
 -- @field Core.Set#SET_CLIENT SetClient
 -- @extends Core.Fsm#FSM_SET
-AIBALANCER = {
-  ClassName = "AIBALANCER",
+AI_BALANCER = {
+  ClassName = "AI_BALANCER",
   PatrolZones = {},
   AIGroups = {},
 }
 
---- Creates a new AIBALANCER object
--- @param #AIBALANCER self
+--- Creates a new AI_BALANCER object
+-- @param #AI_BALANCER self
 -- @param Core.Set#SET_CLIENT SetClient A SET\_CLIENT object that will contain the CLIENT objects to be monitored if they are alive or not (joined by a player).
 -- @param Functional.Spawn#SPAWN SpawnAI The default Spawn object to spawn new AI Groups when needed.
--- @return #AIBALANCER
+-- @return #AI_BALANCER
 -- @usage
--- -- Define a new AIBALANCER Object.
-function AIBALANCER:New( SetClient, SpawnAI )
+-- -- Define a new AI_BALANCER Object.
+function AI_BALANCER:New( SetClient, SpawnAI )
   
   -- Inherits from BASE
   local self = BASE:Inherit( self, FSM_SET:New( SET_GROUP:New() ) ) -- Core.Fsm#FSM_SET
@@ -23841,10 +23841,10 @@ function AIBALANCER:New( SetClient, SpawnAI )
 end
 
 --- Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
 -- @param Core.Set#SET_AIRBASE ReturnAirbaseSet The SET of @{Core.Set#SET_AIRBASE}s to evaluate where to return to.
-function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
+function AI_BALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
 
   self.ToNearestAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
@@ -23852,19 +23852,19 @@ function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseS
 end
 
 --- Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
-function AIBALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
+function AI_BALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
 
   self.ToHomeAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param #string ClientName
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
+function AI_BALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
 
   -- OK, Spawn a new group from the default SpawnAI object provided.
   local AIGroup = self.SpawnAI:Spawn()
@@ -23878,18 +23878,18 @@ function AIBALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
   self:Spawned( AIGroup ) 
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterDestroying( SetGroup, Event, From, To, AIGroup )
+function AI_BALANCER:onenterDestroying( SetGroup, Event, From, To, AIGroup )
 
   AIGroup:Destroy()
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
+function AI_BALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
 
     local AIGroupTemplate = AIGroup:GetTemplate()
     if self.ToHomeAirbase == true then
@@ -23912,8 +23912,8 @@ function AIBALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
 end
 
 
---- @param #AIBALANCER self
-function AIBALANCER:onenterMonitoring( SetGroup )
+--- @param #AI_BALANCER self
+function AI_BALANCER:onenterMonitoring( SetGroup )
 
   self.SetClient:ForEachClient(
     --- @param Wrapper.Client#CLIENT Client
@@ -23983,9 +23983,9 @@ end
 -- 
 -- ===
 -- 
--- 1) @{#PATROLZONE} class, extends @{Core.Fsm#FSM_CONTROLLABLE}
+-- 1) @{#AI_PATROLZONE} class, extends @{Core.Fsm#FSM_CONTROLLABLE}
 -- ================================================================
--- The @{#PATROLZONE} class implements the core functions to patrol a @{Zone} by an AIR @{Controllable} @{Group}.
+-- The @{#AI_PATROLZONE} class implements the core functions to patrol a @{Zone} by an AIR @{Controllable} @{Group}.
 -- The patrol algorithm works that for each airplane patrolling, upon arrival at the patrol zone,
 -- a random point is selected as the route point within the 3D space, within the given boundary limits.
 -- The airplane will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits.
@@ -23993,24 +23993,24 @@ end
 -- This cycle will continue until a fuel treshold has been reached by the airplane.
 -- When the fuel treshold has been reached, the airplane will fly towards the nearest friendly airbase and will land.
 -- 
--- 1.1) PATROLZONE constructor:
+-- 1.1) AI_PATROLZONE constructor:
 -- ----------------------------
 --   
---   * @{#PATROLZONE.New}(): Creates a new PATROLZONE object.
+--   * @{#AI_PATROLZONE.New}(): Creates a new AI_PATROLZONE object.
 -- 
--- 1.2) PATROLZONE state machine:
+-- 1.2) AI_PATROLZONE state machine:
 -- ----------------------------------
--- The PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.
+-- The AI_PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.
 -- 
--- ### 1.2.1) PATROLZONE Events:
+-- ### 1.2.1) AI_PATROLZONE Events:
 -- 
---   * @{#PATROLZONE.Route}( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
---   * @{#PATROLZONE.Patrol}( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.
---   * @{#PATROLZONE.RTB}( AIControllable ): The AIControllable will report return to base.
---   * @{#PATROLZONE.End}( AIControllable ): The end of the PATROLZONE process.
---   * @{#PATROLZONE.Dead}( AIControllable ): The AIControllable is dead. The PATROLZONE process will be ended.
+--   * @{#AI_PATROLZONE.Route}( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
+--   * @{#AI_PATROLZONE.Patrol}( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.
+--   * @{#AI_PATROLZONE.RTB}( AIControllable ): The AIControllable will report return to base.
+--   * @{#AI_PATROLZONE.End}( AIControllable ): The end of the AI_PATROLZONE process.
+--   * @{#AI_PATROLZONE.Dead}( AIControllable ): The AIControllable is dead. The AI_PATROLZONE process will be ended.
 -- 
--- ### 1.2.2) PATROLZONE States:
+-- ### 1.2.2) AI_PATROLZONE States:
 -- 
 --   * **Route**: A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
 --   * **Patrol**: The AIControllable is patrolling. This state is set every 30 seconds, so every 30 seconds, a state transition method can be used.
@@ -24018,7 +24018,7 @@ end
 --   * **Dead**: The AIControllable is dead ...
 --   * **End**: The process has come to an end.
 --   
--- ### 1.2.3) PATROLZONE state transition methods:
+-- ### 1.2.3) AI_PATROLZONE state transition methods:
 -- 
 -- State transition functions can be set **by the mission designer** customizing or improving the behaviour of the state.
 -- There are 2 moments when state transition methods will be called by the state machine:
@@ -24033,7 +24033,7 @@ end
 --     The state transition method needs to start with the name **OnAfter + the name of the state**. 
 --     These state transition methods need to provide a return value, which is specified at the function description.
 --
--- An example how to manage a state transition for an PATROLZONE object **Patrol** for the state **RTB**:
+-- An example how to manage a state transition for an AI_PATROLZONE object **Patrol** for the state **RTB**:
 -- 
 --      local PatrolZoneGroup = GROUP:FindByName( "Patrol Zone" )
 --      local PatrolZone = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
@@ -24041,46 +24041,46 @@ end
 --      local PatrolSpawn = SPAWN:New( "Patrol Group" )
 --      local PatrolGroup = PatrolSpawn:Spawn()
 --
---      local Patrol = PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
+--      local Patrol = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
 --      Patrol:SetControllable( PatrolGroup )
 --      Patrol:ManageFuel( 0.2, 60 )
 --
--- **OnBefore**RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but **before** the RTB default action is processed by the PATROLZONE object.
+-- **OnBefore**RTB( AIGroup ) will be called by the AI_PATROLZONE object when the AIGroup reports RTB, but **before** the RTB default action is processed by the AI_PATROLZONE object.
 --
---      --- State transition function for the PATROLZONE **Patrol** object
---      -- @param #PATROLZONE self 
+--      --- State transition function for the AI_PATROLZONE **Patrol** object
+--      -- @param #AI_PATROLZONE self 
 --      -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
 --      -- @return #boolean If false is returned, then the OnAfter state transition method will not be called.
 --      function Patrol:OnBeforeRTB( AIGroup )
 --        AIGroup:MessageToRed( "Returning to base", 20 )
 --      end
 --       
--- **OnAfter**RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but **after** the RTB default action was processed by the PATROLZONE object.
+-- **OnAfter**RTB( AIGroup ) will be called by the AI_PATROLZONE object when the AIGroup reports RTB, but **after** the RTB default action was processed by the AI_PATROLZONE object.
 --
---      --- State transition function for the PATROLZONE **Patrol** object
---      -- @param #PATROLZONE self 
+--      --- State transition function for the AI_PATROLZONE **Patrol** object
+--      -- @param #AI_PATROLZONE self 
 --      -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
 --      -- @return #Wrapper.Controllable#CONTROLLABLE The new AIGroup object that is set to be patrolling the zone.
 --      function Patrol:OnAfterRTB( AIGroup )
 --        return PatrolSpawn:Spawn()
 --      end 
 --    
--- 1.3) Manage the PATROLZONE parameters:
+-- 1.3) Manage the AI_PATROLZONE parameters:
 -- ------------------------------------------
--- The following methods are available to modify the parameters of a PATROLZONE object:
+-- The following methods are available to modify the parameters of a AI_PATROLZONE object:
 -- 
---   * @{#PATROLZONE.SetControllable}(): Set the AIControllable.
---   * @{#PATROLZONE.GetControllable}(): Get the AIControllable.
---   * @{#PATROLZONE.SetSpeed}(): Set the patrol speed of the AI, for the next patrol.
---   * @{#PATROLZONE.SetAltitude}(): Set altitude of the AI, for the next patrol.
+--   * @{#AI_PATROLZONE.SetControllable}(): Set the AIControllable.
+--   * @{#AI_PATROLZONE.GetControllable}(): Get the AIControllable.
+--   * @{#AI_PATROLZONE.SetSpeed}(): Set the patrol speed of the AI, for the next patrol.
+--   * @{#AI_PATROLZONE.SetAltitude}(): Set altitude of the AI, for the next patrol.
 -- 
--- 1.3) Manage the out of fuel in the PATROLZONE:
+-- 1.3) Manage the out of fuel in the AI_PATROLZONE:
 -- ----------------------------------------------
 -- When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 -- Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
--- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+-- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 -- Once the time is finished, the old AIControllable will return to the base.
--- Use the method @{#PATROLZONE.ManageFuel}() to have this proces in place.
+-- Use the method @{#AI_PATROLZONE.ManageFuel}() to have this proces in place.
 -- 
 -- ====
 -- 
@@ -24116,20 +24116,20 @@ end
 -- State Transition Functions
 
 --- OnBefore State Transition Function
--- @function [parent=#PATROLZONE] OnBeforeRoute
--- @param #PATROLZONE self
+-- @function [parent=#AI_PATROLZONE] OnBeforeRoute
+-- @param #AI_PATROLZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
 --- OnAfter State Transition Function
--- @function [parent=#PATROLZONE] OnAfterRoute
--- @param #PATROLZONE self
+-- @function [parent=#AI_PATROLZONE] OnAfterRoute
+-- @param #AI_PATROLZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 
 
---- PATROLZONE class
--- @type PATROLZONE
+--- AI_PATROLZONE class
+-- @type AI_PATROLZONE
 -- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Controllable} patrolling.
 -- @field Core.Zone#ZONE_BASE PatrolZone The @{Zone} where the patrol needs to be executed.
 -- @field Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
@@ -24137,26 +24137,26 @@ end
 -- @field Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @field Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
 -- @extends Core.Fsm#FSM_CONTROLLABLE
-PATROLZONE = {
-  ClassName = "PATROLZONE",
+AI_PATROLZONE = {
+  ClassName = "AI_PATROLZONE",
 }
 
 
 
---- Creates a new PATROLZONE object
--- @param #PATROLZONE self
+--- Creates a new AI_PATROLZONE object
+-- @param #AI_PATROLZONE self
 -- @param Core.Zone#ZONE_BASE PatrolZone The @{Zone} where the patrol needs to be executed.
 -- @param Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Altitude PatrolCeilingAltitude The highest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @param Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
--- @return #PATROLZONE self
+-- @return #AI_PATROLZONE self
 -- @usage
--- -- Define a new PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
+-- -- Define a new AI_PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
 -- PatrolZone = ZONE:New( 'PatrolZone' )
 -- PatrolSpawn = SPAWN:New( 'Patrol Group' )
--- PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )
-function PATROLZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
+-- PatrolArea = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )
+function AI_PATROLZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
 
   -- Inherits from BASE
   local self = BASE:Inherit( self, FSM_CONTROLLABLE:New() ) -- Core.Fsm#FSM_CONTROLLABLE
@@ -24182,11 +24182,11 @@ end
 
 
 --- Sets (modifies) the minimum and maximum speed of the patrol.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @param Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
--- @return #PATROLZONE self
-function PATROLZONE:SetSpeed( PatrolMinSpeed, PatrolMaxSpeed )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:SetSpeed( PatrolMinSpeed, PatrolMaxSpeed )
   self:F2( { PatrolMinSpeed, PatrolMaxSpeed } )
   
   self.PatrolMinSpeed = PatrolMinSpeed
@@ -24196,11 +24196,11 @@ end
 
 
 --- Sets the floor and ceiling altitude of the patrol.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Altitude PatrolCeilingAltitude The highest altitude in meters where to execute the patrol.
--- @return #PATROLZONE self
-function PATROLZONE:SetAltitude( PatrolFloorAltitude, PatrolCeilingAltitude )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:SetAltitude( PatrolFloorAltitude, PatrolCeilingAltitude )
   self:F2( { PatrolFloorAltitude, PatrolCeilingAltitude } )
   
   self.PatrolFloorAltitude = PatrolFloorAltitude
@@ -24213,7 +24213,7 @@ end
 function _NewPatrolRoute( AIControllable )
 
   AIControllable:T( "NewPatrolRoute" )
-  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#PATROLZONE
+  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#AI_PATROLZONE
   PatrolZone:__Route( 1 )
 end
 
@@ -24222,13 +24222,13 @@ end
 
 --- When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 -- Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
--- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+-- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 -- Once the time is finished, the old AIControllable will return to the base.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param #number PatrolFuelTresholdPercentage The treshold in percentage (between 0 and 1) when the AIControllable is considered to get out of fuel.
 -- @param #number PatrolOutOfFuelOrbitTime The amount of seconds the out of fuel AIControllable will orbit before returning to the base.
--- @return #PATROLZONE self
-function PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime )
 
   self.PatrolManageFuel = true
   self.PatrolFuelTresholdPercentage = PatrolFuelTresholdPercentage
@@ -24238,9 +24238,9 @@ function PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrb
 end
 
 --- Defines a new patrol route using the @{Process_PatrolZone} parameters and settings.
--- @param #PATROLZONE self
--- @return #PATROLZONE self
-function PATROLZONE:onenterRoute()
+-- @param #AI_PATROLZONE self
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:onenterRoute()
 
   self:F2()
 
@@ -24335,8 +24335,8 @@ function PATROLZONE:onenterRoute()
 end
 
 
---- @param #PATROLZONE self
-function PATROLZONE:onenterPatrol()
+--- @param #AI_PATROLZONE self
+function AI_PATROLZONE:onenterPatrol()
   self:F2()
 
   if self.Controllable and self.Controllable:IsAlive() then
@@ -24363,31 +24363,31 @@ end
 -- 
 -- Cargo can be of various forms, always are composed out of ONE object ( one unit or one static or one slingload crate ):
 --
---   * CARGO_UNIT, represented by a @{Unit} in a @{Group}: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.
+--   * AI_CARGO_UNIT, represented by a @{Unit} in a @{Group}: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.
 --   * CARGO_STATIC, represented by a @{Static}: Cargo can be represented by a Static. Destruction of the Static will mean that the cargo is lost.
---   * CARGO_PACKAGE, contained in a @{Unit} of a @{Group}: Cargo can be contained within a Unit of a Group. The cargo can be **delivered** by the @{Unit}. If the Unit is destroyed, the cargo will be destroyed also.
---   * CARGO_PACKAGE, Contained in a @{Static}: Cargo can be contained within a Static. The cargo can be **collected** from the @Static. If the @{Static} is destroyed, the cargo will be destroyed.
+--   * AI_CARGO_PACKAGE, contained in a @{Unit} of a @{Group}: Cargo can be contained within a Unit of a Group. The cargo can be **delivered** by the @{Unit}. If the Unit is destroyed, the cargo will be destroyed also.
+--   * AI_CARGO_PACKAGE, Contained in a @{Static}: Cargo can be contained within a Static. The cargo can be **collected** from the @Static. If the @{Static} is destroyed, the cargo will be destroyed.
 --   * CARGO_SLINGLOAD, represented by a @{Cargo} that is transportable: Cargo can be represented by a Cargo object that is transportable. Destruction of the Cargo will mean that the cargo is lost.
 --   
---   * CARGO_GROUPED, represented by a Group of CARGO_UNITs.
+--   * AI_CARGO_GROUPED, represented by a Group of CARGO_UNITs.
 -- 
--- 1) @{AI.AI_Cargo#CARGO_BASE} class, extends @{Core.Fsm#FSM_PROCESS}
+-- 1) @{AI.AI_Cargo#AI_CARGO} class, extends @{Core.Fsm#FSM_PROCESS}
 -- ==========================================================================
--- The @{#CARGO_BASE} class defines the core functions that defines a cargo object within MOOSE.
+-- The @{#AI_CARGO} class defines the core functions that defines a cargo object within MOOSE.
 -- A cargo is a logical object defined that is available for transport, and has a life status within a simulation.
 --
--- The CARGO_BASE is a state machine: it manages the different events and states of the cargo.
--- All derived classes from CARGO_BASE follow the same state machine, expose the same cargo event functions, and provide the same cargo states.
+-- The AI_CARGO is a state machine: it manages the different events and states of the cargo.
+-- All derived classes from AI_CARGO follow the same state machine, expose the same cargo event functions, and provide the same cargo states.
 -- 
--- ## 1.2.1) CARGO_BASE Events:
+-- ## 1.2.1) AI_CARGO Events:
 -- 
---   * @{#CARGO_BASE.Board}( ToCarrier ):  Boards the cargo to a carrier.
---   * @{#CARGO_BASE.Load}( ToCarrier ): Loads the cargo into a carrier, regardless of its position.
---   * @{#CARGO_BASE.UnBoard}( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.
---   * @{#CARGO_BASE.UnLoad}( ToPointVec2 ): UnLoads the cargo from a carrier.
---   * @{#CARGO_BASE.Dead}( Controllable ): The cargo is dead. The cargo process will be ended.
+--   * @{#AI_CARGO.Board}( ToCarrier ):  Boards the cargo to a carrier.
+--   * @{#AI_CARGO.Load}( ToCarrier ): Loads the cargo into a carrier, regardless of its position.
+--   * @{#AI_CARGO.UnBoard}( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.
+--   * @{#AI_CARGO.UnLoad}( ToPointVec2 ): UnLoads the cargo from a carrier.
+--   * @{#AI_CARGO.Dead}( Controllable ): The cargo is dead. The cargo process will be ended.
 -- 
--- ## 1.2.2) CARGO_BASE States:
+-- ## 1.2.2) AI_CARGO States:
 -- 
 --   * **UnLoaded**: The cargo is unloaded from a carrier.
 --   * **Boarding**: The cargo is currently boarding (= running) into a carrier.
@@ -24396,7 +24396,7 @@ end
 --   * **Dead**: The cargo is dead ...
 --   * **End**: The process has come to an end.
 --   
--- ## 1.2.3) CARGO_BASE state transition methods:
+-- ## 1.2.3) AI_CARGO state transition methods:
 -- 
 -- State transition functions can be set **by the mission designer** customizing or improving the behaviour of the state.
 -- There are 2 moments when state transition methods will be called by the state machine:
@@ -24411,15 +24411,15 @@ end
 --     The state transition method needs to start with the name **OnAfter + the name of the state**. 
 --     These state transition methods need to provide a return value, which is specified at the function description.
 -- 
--- 2) #CARGO_UNIT class
+-- 2) #AI_CARGO_UNIT class
 -- ====================
--- The CARGO_UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
--- Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO_UNIT objects to and from carriers.
+-- The AI_CARGO_UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
+-- Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI_CARGO_UNIT objects to and from carriers.
 -- 
--- 5) #CARGO_GROUPED class
+-- 5) #AI_CARGO_GROUPED class
 -- =======================
--- The CARGO_GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
--- Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO_UNIT objects to and from carriers.
+-- The AI_CARGO_GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
+-- Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI_CARGO_UNIT objects to and from carriers.
 -- 
 -- This module is still under construction, but is described above works already, and will keep working ...
 -- 
@@ -24431,14 +24431,14 @@ end
 
 --- Boards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo to the Carrier.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] Board
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] Board
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
 --- Boards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo to the Carrier.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] __Board
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __Board
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
@@ -24447,14 +24447,14 @@ end
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] UnBoard
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] UnBoard
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] __UnBoard
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __UnBoard
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
@@ -24463,14 +24463,14 @@ end
 
 --- Loads the cargo to a Carrier. The event will load the cargo into the Carrier regardless of its position. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] Load
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] Load
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
 --- Loads the cargo to a Carrier. The event will load the cargo into the Carrier regardless of its position. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] __Load
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __Load
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
@@ -24479,14 +24479,14 @@ end
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] UnLoad
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] UnLoad
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] __UnLoad
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __UnLoad
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
@@ -24494,46 +24494,46 @@ end
 
 -- UnLoaded
 
---- @function [parent=#CARGO_BASE] OnBeforeUnLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeUnLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterUnLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterUnLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- Loaded
 
---- @function [parent=#CARGO_BASE] OnBeforeLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- Boarding
 
---- @function [parent=#CARGO_BASE] OnBeforeBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- UnBoarding
 
---- @function [parent=#CARGO_BASE] OnBeforeUnBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeUnBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterUnBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterUnBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 
@@ -24541,9 +24541,9 @@ end
 
 CARGOS = {}
 
-do -- CARGO_BASE
+do -- AI_CARGO
 
-  --- @type CARGO_BASE
+  --- @type AI_CARGO
   -- @extends Core.Fsm#FSM_PROCESS
   -- @field #string Type A string defining the type of the cargo. eg. Engineers, Equipment, Screwdrivers.
   -- @field #string Name A string defining the name of the cargo. The name is the unique identifier of the cargo.
@@ -24556,8 +24556,8 @@ do -- CARGO_BASE
   -- @field #boolean Moveable This flag defines if the cargo is moveable.
   -- @field #boolean Representable This flag defines if the cargo can be represented by a DCS Unit.
   -- @field #boolean Containable This flag defines if the cargo can be contained within a DCS Unit.
-  CARGO_BASE = {
-    ClassName = "CARGO_BASE",
+  AI_CARGO = {
+    ClassName = "AI_CARGO",
     Type = nil,
     Name = nil,
     Weight = nil,
@@ -24569,19 +24569,19 @@ do -- CARGO_BASE
     Containable = false,
   }
 
---- @type CARGO_BASE.CargoObjects
+--- @type AI_CARGO.CargoObjects
 -- @map < #string, Wrapper.Positionable#POSITIONABLE > The alive POSITIONABLE objects representing the the cargo.
 
 
---- CARGO_BASE Constructor. This class is an abstract class and should not be instantiated.
--- @param #CARGO_BASE self
+--- AI_CARGO Constructor. This class is an abstract class and should not be instantiated.
+-- @param #AI_CARGO self
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_BASE
-function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius )
+-- @return #AI_CARGO
+function AI_CARGO:New( Type, Name, Weight, ReportRadius, NearRadius )
 
   local self = BASE:Inherit( self, FSM:New() ) -- Core.Fsm#FSM_CONTROLLABLE
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
@@ -24618,20 +24618,20 @@ function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius )
 end
 
 
---- Template method to spawn a new representation of the CARGO_BASE in the simulator.
--- @param #CARGO_BASE self
--- @return #CARGO_BASE
-function CARGO_BASE:Spawn( PointVec2 )
+--- Template method to spawn a new representation of the AI_CARGO in the simulator.
+-- @param #AI_CARGO self
+-- @return #AI_CARGO
+function AI_CARGO:Spawn( PointVec2 )
   self:F()
 
 end
 
 
 --- Check if CargoCarrier is near the Cargo to be Loaded.
--- @param #CARGO_BASE self
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 PointVec2
 -- @return #boolean
-function CARGO_BASE:IsNear( PointVec2 )
+function AI_CARGO:IsNear( PointVec2 )
   self:F( { PointVec2 } )
 
   local Distance = PointVec2:DistanceFromPointVec2( self.CargoObject:GetPointVec2() )
@@ -24646,36 +24646,36 @@ end
 
 end
 
-do -- CARGO_REPRESENTABLE
+do -- AI_CARGO_REPRESENTABLE
 
-  --- @type CARGO_REPRESENTABLE
-  -- @extends #CARGO_BASE
-  CARGO_REPRESENTABLE = {
-    ClassName = "CARGO_REPRESENTABLE"
+  --- @type AI_CARGO_REPRESENTABLE
+  -- @extends #AI_CARGO
+  AI_CARGO_REPRESENTABLE = {
+    ClassName = "AI_CARGO_REPRESENTABLE"
   }
 
---- CARGO_REPRESENTABLE Constructor.
--- @param #CARGO_REPRESENTABLE self
+--- AI_CARGO_REPRESENTABLE Constructor.
+-- @param #AI_CARGO_REPRESENTABLE self
 -- @param Wrapper.Controllable#Controllable CargoObject
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_REPRESENTABLE
-function CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_BASE
+-- @return #AI_CARGO_REPRESENTABLE
+function AI_CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   return self
 end
 
 --- Route a cargo unit to a PointVec2.
--- @param #CARGO_REPRESENTABLE self
+-- @param #AI_CARGO_REPRESENTABLE self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #number Speed
--- @return #CARGO_REPRESENTABLE
-function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
+-- @return #AI_CARGO_REPRESENTABLE
+function AI_CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
   self:F2( ToPointVec2 )
 
   local Points = {}
@@ -24690,27 +24690,27 @@ function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
   return self  
 end
 
-end -- CARGO_BASE
+end -- AI_CARGO
 
-do -- CARGO_UNIT
+do -- AI_CARGO_UNIT
 
-  --- @type CARGO_UNIT
-  -- @extends #CARGO_REPRESENTABLE
-  CARGO_UNIT = {
-    ClassName = "CARGO_UNIT"
+  --- @type AI_CARGO_UNIT
+  -- @extends #AI_CARGO_REPRESENTABLE
+  AI_CARGO_UNIT = {
+    ClassName = "AI_CARGO_UNIT"
   }
 
---- CARGO_UNIT Constructor.
--- @param #CARGO_UNIT self
+--- AI_CARGO_UNIT Constructor.
+-- @param #AI_CARGO_UNIT self
 -- @param Wrapper.Unit#UNIT CargoUnit
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_UNIT
-function CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_UNIT
+-- @return #AI_CARGO_UNIT
+function AI_CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_REPRESENTABLE:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO_UNIT
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   self:T( CargoUnit )
@@ -24722,12 +24722,12 @@ function CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius
 end
 
 --- Enter UnBoarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
   self:F()
 
   local Angle = 180
@@ -24767,12 +24767,12 @@ function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- Leave UnBoarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -24791,12 +24791,12 @@ function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- UnBoard Event.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   self.CargoInAir = self.CargoObject:InAir()
@@ -24816,12 +24816,12 @@ end
 
 
 --- Enter UnLoaded State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2
-function CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2  )
+function AI_CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2  )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -24854,12 +24854,12 @@ end
 
 
 --- Enter Boarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   local Speed = 10
@@ -24886,12 +24886,12 @@ function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Leave Boarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
 
   if self:IsNear( CargoCarrier:GetPointVec2() ) then
@@ -24904,12 +24904,12 @@ function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Loaded State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier )
   self:F()
 
   self.CargoCarrier = CargoCarrier
@@ -24923,11 +24923,11 @@ end
 
 
 --- Board Event.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier )
   self:F()
 
   self.CargoInAir = self.CargoObject:InAir()
@@ -24944,25 +24944,25 @@ end
 
 end
 
-do -- CARGO_PACKAGE
+do -- AI_CARGO_PACKAGE
 
-  --- @type CARGO_PACKAGE
-  -- @extends #CARGO_REPRESENTABLE
-  CARGO_PACKAGE = {
-    ClassName = "CARGO_PACKAGE"
+  --- @type AI_CARGO_PACKAGE
+  -- @extends #AI_CARGO_REPRESENTABLE
+  AI_CARGO_PACKAGE = {
+    ClassName = "AI_CARGO_PACKAGE"
   }
 
---- CARGO_PACKAGE Constructor.
--- @param #CARGO_PACKAGE self
+--- AI_CARGO_PACKAGE Constructor.
+-- @param #AI_CARGO_PACKAGE self
 -- @param Wrapper.Unit#UNIT CargoCarrier The UNIT carrying the package.
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_PACKAGE
-function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_PACKAGE
+-- @return #AI_CARGO_PACKAGE
+function AI_CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO_PACKAGE
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   self:T( CargoCarrier )
@@ -24972,7 +24972,7 @@ function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, Near
 end
 
 --- Board Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -24980,7 +24980,7 @@ end
 -- @param #number Speed
 -- @param #number BoardDistance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
   self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
@@ -25010,10 +25010,10 @@ function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, Boa
 end
 
 --- Check if CargoCarrier is near the Cargo to be Loaded.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @return #boolean
-function CARGO_PACKAGE:IsNear( CargoCarrier )
+function AI_CARGO_PACKAGE:IsNear( CargoCarrier )
   self:F()
 
   local CargoCarrierPoint = CargoCarrier:GetPointVec2()
@@ -25029,12 +25029,12 @@ function CARGO_PACKAGE:IsNear( CargoCarrier )
 end
 
 --- Boarded Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
   self:F()
 
   if self:IsNear( CargoCarrier ) then
@@ -25045,7 +25045,7 @@ function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, B
 end
 
 --- UnBoard Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -25054,7 +25054,7 @@ end
 -- @param #number UnBoardDistance
 -- @param #number Radius
 -- @param #number Angle
-function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
+function AI_CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
   self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
@@ -25087,12 +25087,12 @@ function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnL
 end
 
 --- UnBoarded Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
+function AI_CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
   self:F()
 
   if self:IsNear( CargoCarrier ) then
@@ -25103,7 +25103,7 @@ function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
 end
 
 --- Load Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -25111,7 +25111,7 @@ end
 -- @param #number Speed
 -- @param #number LoadDistance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle )
   self:F()
 
   self.CargoCarrier = CargoCarrier
@@ -25131,13 +25131,13 @@ function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDi
 end
 
 --- UnLoad Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param #number Distance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle )
+function AI_CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle )
   self:F()
   
   local StartPointVec2 = self.CargoCarrier:GetPointVec2()
@@ -25159,27 +25159,27 @@ end
 
 end
 
-do -- CARGO_GROUP
+do -- AI_CARGO_GROUP
 
-  --- @type CARGO_GROUP
-  -- @extends AI.AI_Cargo#CARGO_BASE
+  --- @type AI_CARGO_GROUP
+  -- @extends AI.AI_Cargo#AI_CARGO
   -- @field Set#SET_BASE CargoSet A set of cargo objects.
   -- @field #string Name A string defining the name of the cargo group. The name is the unique identifier of the cargo.
-  CARGO_GROUP = {
-    ClassName = "CARGO_GROUP",
+  AI_CARGO_GROUP = {
+    ClassName = "AI_CARGO_GROUP",
   }
 
---- CARGO_GROUP constructor.
--- @param #CARGO_GROUP self
+--- AI_CARGO_GROUP constructor.
+-- @param #AI_CARGO_GROUP self
 -- @param Core.Set#Set_BASE CargoSet
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_GROUP
-function CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, 0, ReportRadius, NearRadius ) ) -- #CARGO_GROUP
+-- @return #AI_CARGO_GROUP
+function AI_CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO:New( Type, Name, 0, ReportRadius, NearRadius ) ) -- #AI_CARGO_GROUP
   self:F( { Type, Name, ReportRadius, NearRadius } )
 
   self.CargoSet = CargoSet
@@ -25188,44 +25188,44 @@ function CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
   return self
 end
 
-end -- CARGO_GROUP
+end -- AI_CARGO_GROUP
 
-do -- CARGO_GROUPED
+do -- AI_CARGO_GROUPED
 
-  --- @type CARGO_GROUPED
-  -- @extends AI.AI_Cargo#CARGO_GROUP
-  CARGO_GROUPED = {
-    ClassName = "CARGO_GROUPED",
+  --- @type AI_CARGO_GROUPED
+  -- @extends AI.AI_Cargo#AI_CARGO_GROUP
+  AI_CARGO_GROUPED = {
+    ClassName = "AI_CARGO_GROUPED",
   }
 
---- CARGO_GROUPED constructor.
--- @param #CARGO_GROUPED self
+--- AI_CARGO_GROUPED constructor.
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Set#Set_BASE CargoSet
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_GROUPED
-function CARGO_GROUPED:New( CargoSet, Type, Name, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius ) ) -- #CARGO_GROUPED
+-- @return #AI_CARGO_GROUPED
+function AI_CARGO_GROUPED:New( CargoSet, Type, Name, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius ) ) -- #AI_CARGO_GROUPED
   self:F( { Type, Name, ReportRadius, NearRadius } )
 
   return self
 end
 
 --- Enter Boarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   if From == "UnLoaded" then
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:__Board( 1, CargoCarrier )
@@ -25238,16 +25238,16 @@ function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Enter Loaded State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   if From == "UnLoaded" then
-    -- For each Cargo object within the CARGO_GROUPED, load each cargo to the CargoCarrier.
+    -- For each Cargo object within the AI_CARGO_GROUPED, load each cargo to the CargoCarrier.
     for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
       Cargo:Load( CargoCarrier )
     end
@@ -25255,17 +25255,17 @@ function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
 end
 
 --- Leave Boarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
 
   local Boarded = true
 
-  -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+  -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
   for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
     self:T( Cargo.current )
     if not Cargo:is( "Loaded" ) then
@@ -25282,19 +25282,19 @@ function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Enter UnBoarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
   self:F()
 
   local Timer = 1
 
   if From == "Loaded" then
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:__UnBoard( Timer, ToPointVec2 )
@@ -25308,12 +25308,12 @@ function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- Leave UnBoarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -25323,7 +25323,7 @@ function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   if From == "UnBoarding" then
     local UnBoarded = true
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
       self:T( Cargo.current )
       if not Cargo:is( "UnLoaded" ) then
@@ -25343,12 +25343,12 @@ function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- UnBoard Event.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   self:__UnLoad( 1, ToPointVec2 )
@@ -25357,17 +25357,17 @@ end
 
 
 --- Enter UnLoaded State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   if From == "Loaded" then
     
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:UnLoad( ToPointVec2 )
@@ -25378,7 +25378,7 @@ function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
 
 end
 
-end -- CARGO_GROUPED
+end -- AI_CARGO_GROUPED
 
 
 
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index b1d605373..ac46b458e 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: 20161216_1630' ) 
+env.info( 'Moose Generation Timestamp: 20161216_1640' ) 
 local base = _G
 
 Include = {}
@@ -23723,38 +23723,38 @@ function DETECTION_AREAS:CreateDetectionSets()
 end
 
 
---- This module contains the AIBALANCER class.
+--- This module contains the AI_BALANCER class.
 -- 
 -- ===
 -- 
--- 1) @{AI.AI_Balancer#AIBALANCER} class, extends @{Core.Fsm#FSM_SET}
+-- 1) @{AI.AI_Balancer#AI_BALANCER} class, extends @{Core.Fsm#FSM_SET}
 -- ===================================================================================
--- The @{AI.AI_Balancer#AIBALANCER} class monitors and manages as many AI GROUPS as there are
+-- The @{AI.AI_Balancer#AI_BALANCER} class monitors and manages as many AI GROUPS as there are
 -- CLIENTS in a SET_CLIENT collection not occupied by players.
--- The AIBALANCER class manages internally a collection of AI management objects, which govern the behaviour 
+-- The AI_BALANCER class manages internally a collection of AI management objects, which govern the behaviour 
 -- of the underlying AI GROUPS.
 -- 
 -- The parent class @{Core.Fsm#FSM_SET} manages the functionality to control the Finite State Machine (FSM) 
 -- and calls for each event the state transition methods providing the internal @{Core.Fsm#FSM_SET.Set} object containing the
 -- SET_GROUP and additional event parameters provided during the event.
 -- 
--- 1.1) AIBALANCER construction method
+-- 1.1) AI_BALANCER construction method
 -- ---------------------------------------
--- Create a new AIBALANCER object with the @{#AIBALANCER.New} method:
+-- Create a new AI_BALANCER object with the @{#AI_BALANCER.New} method:
 -- 
---    * @{#AIBALANCER.New}: Creates a new AIBALANCER object.
+--    * @{#AI_BALANCER.New}: Creates a new AI_BALANCER object.
 --    
 -- 1.2) 
 -- ----
 --    * Add
 --    * Remove
 -- 
--- 1.2) AIBALANCER returns AI to Airbases
+-- 1.2) AI_BALANCER returns AI to Airbases
 -- ------------------------------------------
 -- You can configure to have the AI to return to:
 -- 
---    * @{#AIBALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
---    * @{#AIBALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToHomeAirbase}: Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
+--    * @{#AI_BALANCER.ReturnToNearestAirbases}: Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
 -- --
 -- ===
 -- 
@@ -23781,12 +23781,12 @@ end
 -- ### Contributions: 
 -- 
 --   * **Dutch_Baron (James)**: Who you can search on the Eagle Dynamics Forums.  
---   Working together with James has resulted in the creation of the AIBALANCER class.  
+--   Working together with James has resulted in the creation of the AI_BALANCER class.  
 --   James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-)
 -- 
 --   * **SNAFU**:
 --   Had a couple of mails with the guys to validate, if the same concept in the GCI/CAP script could be reworked within MOOSE.
---   None of the script code has been used however within the new AIBALANCER moose class.
+--   None of the script code has been used however within the new AI_BALANCER moose class.
 -- 
 -- ### Authors: 
 -- 
@@ -23796,24 +23796,24 @@ end
 
 
 
---- AIBALANCER class
--- @type AIBALANCER
+--- AI_BALANCER class
+-- @type AI_BALANCER
 -- @field Core.Set#SET_CLIENT SetClient
 -- @extends Core.Fsm#FSM_SET
-AIBALANCER = {
-  ClassName = "AIBALANCER",
+AI_BALANCER = {
+  ClassName = "AI_BALANCER",
   PatrolZones = {},
   AIGroups = {},
 }
 
---- Creates a new AIBALANCER object
--- @param #AIBALANCER self
+--- Creates a new AI_BALANCER object
+-- @param #AI_BALANCER self
 -- @param Core.Set#SET_CLIENT SetClient A SET\_CLIENT object that will contain the CLIENT objects to be monitored if they are alive or not (joined by a player).
 -- @param Functional.Spawn#SPAWN SpawnAI The default Spawn object to spawn new AI Groups when needed.
--- @return #AIBALANCER
+-- @return #AI_BALANCER
 -- @usage
--- -- Define a new AIBALANCER Object.
-function AIBALANCER:New( SetClient, SpawnAI )
+-- -- Define a new AI_BALANCER Object.
+function AI_BALANCER:New( SetClient, SpawnAI )
   
   -- Inherits from BASE
   local self = BASE:Inherit( self, FSM_SET:New( SET_GROUP:New() ) ) -- Core.Fsm#FSM_SET
@@ -23841,10 +23841,10 @@ function AIBALANCER:New( SetClient, SpawnAI )
 end
 
 --- Returns the AI to the nearest friendly @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
 -- @param Core.Set#SET_AIRBASE ReturnAirbaseSet The SET of @{Core.Set#SET_AIRBASE}s to evaluate where to return to.
-function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
+function AI_BALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseSet )
 
   self.ToNearestAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
@@ -23852,19 +23852,19 @@ function AIBALANCER:ReturnToNearestAirbases( ReturnTresholdRange, ReturnAirbaseS
 end
 
 --- Returns the AI to the home @{Wrapper.Airbase#AIRBASE}.
--- @param #AIBALANCER self
+-- @param #AI_BALANCER self
 -- @param Dcs.DCSTypes#Distance ReturnTresholdRange If there is an enemy @{Wrapper.Client#CLIENT} within the ReturnTresholdRange given in meters, the AI will not return to the nearest @{Wrapper.Airbase#AIRBASE}.
-function AIBALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
+function AI_BALANCER:ReturnToHomeAirbase( ReturnTresholdRange )
 
   self.ToHomeAirbase = true
   self.ReturnTresholdRange = ReturnTresholdRange
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param #string ClientName
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
+function AI_BALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
 
   -- OK, Spawn a new group from the default SpawnAI object provided.
   local AIGroup = self.SpawnAI:Spawn()
@@ -23878,18 +23878,18 @@ function AIBALANCER:onenterSpawning( SetGroup, Event, From, To, ClientName )
   self:Spawned( AIGroup ) 
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterDestroying( SetGroup, Event, From, To, AIGroup )
+function AI_BALANCER:onenterDestroying( SetGroup, Event, From, To, AIGroup )
 
   AIGroup:Destroy()
 end
 
---- @param #AIBALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
-function AIBALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
+function AI_BALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
 
     local AIGroupTemplate = AIGroup:GetTemplate()
     if self.ToHomeAirbase == true then
@@ -23912,8 +23912,8 @@ function AIBALANCER:onenterReturning( SetGroup, Event, From, To, AIGroup )
 end
 
 
---- @param #AIBALANCER self
-function AIBALANCER:onenterMonitoring( SetGroup )
+--- @param #AI_BALANCER self
+function AI_BALANCER:onenterMonitoring( SetGroup )
 
   self.SetClient:ForEachClient(
     --- @param Wrapper.Client#CLIENT Client
@@ -23983,9 +23983,9 @@ end
 -- 
 -- ===
 -- 
--- 1) @{#PATROLZONE} class, extends @{Core.Fsm#FSM_CONTROLLABLE}
+-- 1) @{#AI_PATROLZONE} class, extends @{Core.Fsm#FSM_CONTROLLABLE}
 -- ================================================================
--- The @{#PATROLZONE} class implements the core functions to patrol a @{Zone} by an AIR @{Controllable} @{Group}.
+-- The @{#AI_PATROLZONE} class implements the core functions to patrol a @{Zone} by an AIR @{Controllable} @{Group}.
 -- The patrol algorithm works that for each airplane patrolling, upon arrival at the patrol zone,
 -- a random point is selected as the route point within the 3D space, within the given boundary limits.
 -- The airplane will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits.
@@ -23993,24 +23993,24 @@ end
 -- This cycle will continue until a fuel treshold has been reached by the airplane.
 -- When the fuel treshold has been reached, the airplane will fly towards the nearest friendly airbase and will land.
 -- 
--- 1.1) PATROLZONE constructor:
+-- 1.1) AI_PATROLZONE constructor:
 -- ----------------------------
 --   
---   * @{#PATROLZONE.New}(): Creates a new PATROLZONE object.
+--   * @{#AI_PATROLZONE.New}(): Creates a new AI_PATROLZONE object.
 -- 
--- 1.2) PATROLZONE state machine:
+-- 1.2) AI_PATROLZONE state machine:
 -- ----------------------------------
--- The PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.
+-- The AI_PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.
 -- 
--- ### 1.2.1) PATROLZONE Events:
+-- ### 1.2.1) AI_PATROLZONE Events:
 -- 
---   * @{#PATROLZONE.Route}( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
---   * @{#PATROLZONE.Patrol}( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.
---   * @{#PATROLZONE.RTB}( AIControllable ): The AIControllable will report return to base.
---   * @{#PATROLZONE.End}( AIControllable ): The end of the PATROLZONE process.
---   * @{#PATROLZONE.Dead}( AIControllable ): The AIControllable is dead. The PATROLZONE process will be ended.
+--   * @{#AI_PATROLZONE.Route}( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
+--   * @{#AI_PATROLZONE.Patrol}( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.
+--   * @{#AI_PATROLZONE.RTB}( AIControllable ): The AIControllable will report return to base.
+--   * @{#AI_PATROLZONE.End}( AIControllable ): The end of the AI_PATROLZONE process.
+--   * @{#AI_PATROLZONE.Dead}( AIControllable ): The AIControllable is dead. The AI_PATROLZONE process will be ended.
 -- 
--- ### 1.2.2) PATROLZONE States:
+-- ### 1.2.2) AI_PATROLZONE States:
 -- 
 --   * **Route**: A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.
 --   * **Patrol**: The AIControllable is patrolling. This state is set every 30 seconds, so every 30 seconds, a state transition method can be used.
@@ -24018,7 +24018,7 @@ end
 --   * **Dead**: The AIControllable is dead ...
 --   * **End**: The process has come to an end.
 --   
--- ### 1.2.3) PATROLZONE state transition methods:
+-- ### 1.2.3) AI_PATROLZONE state transition methods:
 -- 
 -- State transition functions can be set **by the mission designer** customizing or improving the behaviour of the state.
 -- There are 2 moments when state transition methods will be called by the state machine:
@@ -24033,7 +24033,7 @@ end
 --     The state transition method needs to start with the name **OnAfter + the name of the state**. 
 --     These state transition methods need to provide a return value, which is specified at the function description.
 --
--- An example how to manage a state transition for an PATROLZONE object **Patrol** for the state **RTB**:
+-- An example how to manage a state transition for an AI_PATROLZONE object **Patrol** for the state **RTB**:
 -- 
 --      local PatrolZoneGroup = GROUP:FindByName( "Patrol Zone" )
 --      local PatrolZone = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
@@ -24041,46 +24041,46 @@ end
 --      local PatrolSpawn = SPAWN:New( "Patrol Group" )
 --      local PatrolGroup = PatrolSpawn:Spawn()
 --
---      local Patrol = PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
+--      local Patrol = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
 --      Patrol:SetControllable( PatrolGroup )
 --      Patrol:ManageFuel( 0.2, 60 )
 --
--- **OnBefore**RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but **before** the RTB default action is processed by the PATROLZONE object.
+-- **OnBefore**RTB( AIGroup ) will be called by the AI_PATROLZONE object when the AIGroup reports RTB, but **before** the RTB default action is processed by the AI_PATROLZONE object.
 --
---      --- State transition function for the PATROLZONE **Patrol** object
---      -- @param #PATROLZONE self 
+--      --- State transition function for the AI_PATROLZONE **Patrol** object
+--      -- @param #AI_PATROLZONE self 
 --      -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
 --      -- @return #boolean If false is returned, then the OnAfter state transition method will not be called.
 --      function Patrol:OnBeforeRTB( AIGroup )
 --        AIGroup:MessageToRed( "Returning to base", 20 )
 --      end
 --       
--- **OnAfter**RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but **after** the RTB default action was processed by the PATROLZONE object.
+-- **OnAfter**RTB( AIGroup ) will be called by the AI_PATROLZONE object when the AIGroup reports RTB, but **after** the RTB default action was processed by the AI_PATROLZONE object.
 --
---      --- State transition function for the PATROLZONE **Patrol** object
---      -- @param #PATROLZONE self 
+--      --- State transition function for the AI_PATROLZONE **Patrol** object
+--      -- @param #AI_PATROLZONE self 
 --      -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
 --      -- @return #Wrapper.Controllable#CONTROLLABLE The new AIGroup object that is set to be patrolling the zone.
 --      function Patrol:OnAfterRTB( AIGroup )
 --        return PatrolSpawn:Spawn()
 --      end 
 --    
--- 1.3) Manage the PATROLZONE parameters:
+-- 1.3) Manage the AI_PATROLZONE parameters:
 -- ------------------------------------------
--- The following methods are available to modify the parameters of a PATROLZONE object:
+-- The following methods are available to modify the parameters of a AI_PATROLZONE object:
 -- 
---   * @{#PATROLZONE.SetControllable}(): Set the AIControllable.
---   * @{#PATROLZONE.GetControllable}(): Get the AIControllable.
---   * @{#PATROLZONE.SetSpeed}(): Set the patrol speed of the AI, for the next patrol.
---   * @{#PATROLZONE.SetAltitude}(): Set altitude of the AI, for the next patrol.
+--   * @{#AI_PATROLZONE.SetControllable}(): Set the AIControllable.
+--   * @{#AI_PATROLZONE.GetControllable}(): Get the AIControllable.
+--   * @{#AI_PATROLZONE.SetSpeed}(): Set the patrol speed of the AI, for the next patrol.
+--   * @{#AI_PATROLZONE.SetAltitude}(): Set altitude of the AI, for the next patrol.
 -- 
--- 1.3) Manage the out of fuel in the PATROLZONE:
+-- 1.3) Manage the out of fuel in the AI_PATROLZONE:
 -- ----------------------------------------------
 -- When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 -- Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
--- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+-- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 -- Once the time is finished, the old AIControllable will return to the base.
--- Use the method @{#PATROLZONE.ManageFuel}() to have this proces in place.
+-- Use the method @{#AI_PATROLZONE.ManageFuel}() to have this proces in place.
 -- 
 -- ====
 -- 
@@ -24116,20 +24116,20 @@ end
 -- State Transition Functions
 
 --- OnBefore State Transition Function
--- @function [parent=#PATROLZONE] OnBeforeRoute
--- @param #PATROLZONE self
+-- @function [parent=#AI_PATROLZONE] OnBeforeRoute
+-- @param #AI_PATROLZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
 --- OnAfter State Transition Function
--- @function [parent=#PATROLZONE] OnAfterRoute
--- @param #PATROLZONE self
+-- @function [parent=#AI_PATROLZONE] OnAfterRoute
+-- @param #AI_PATROLZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 
 
---- PATROLZONE class
--- @type PATROLZONE
+--- AI_PATROLZONE class
+-- @type AI_PATROLZONE
 -- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Controllable} patrolling.
 -- @field Core.Zone#ZONE_BASE PatrolZone The @{Zone} where the patrol needs to be executed.
 -- @field Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
@@ -24137,26 +24137,26 @@ end
 -- @field Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @field Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
 -- @extends Core.Fsm#FSM_CONTROLLABLE
-PATROLZONE = {
-  ClassName = "PATROLZONE",
+AI_PATROLZONE = {
+  ClassName = "AI_PATROLZONE",
 }
 
 
 
---- Creates a new PATROLZONE object
--- @param #PATROLZONE self
+--- Creates a new AI_PATROLZONE object
+-- @param #AI_PATROLZONE self
 -- @param Core.Zone#ZONE_BASE PatrolZone The @{Zone} where the patrol needs to be executed.
 -- @param Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Altitude PatrolCeilingAltitude The highest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @param Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
--- @return #PATROLZONE self
+-- @return #AI_PATROLZONE self
 -- @usage
--- -- Define a new PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
+-- -- Define a new AI_PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
 -- PatrolZone = ZONE:New( 'PatrolZone' )
 -- PatrolSpawn = SPAWN:New( 'Patrol Group' )
--- PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )
-function PATROLZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
+-- PatrolArea = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )
+function AI_PATROLZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed )
 
   -- Inherits from BASE
   local self = BASE:Inherit( self, FSM_CONTROLLABLE:New() ) -- Core.Fsm#FSM_CONTROLLABLE
@@ -24182,11 +24182,11 @@ end
 
 
 --- Sets (modifies) the minimum and maximum speed of the patrol.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param Dcs.DCSTypes#Speed  PatrolMinSpeed The minimum speed of the @{Controllable} in km/h.
 -- @param Dcs.DCSTypes#Speed  PatrolMaxSpeed The maximum speed of the @{Controllable} in km/h.
--- @return #PATROLZONE self
-function PATROLZONE:SetSpeed( PatrolMinSpeed, PatrolMaxSpeed )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:SetSpeed( PatrolMinSpeed, PatrolMaxSpeed )
   self:F2( { PatrolMinSpeed, PatrolMaxSpeed } )
   
   self.PatrolMinSpeed = PatrolMinSpeed
@@ -24196,11 +24196,11 @@ end
 
 
 --- Sets the floor and ceiling altitude of the patrol.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param Dcs.DCSTypes#Altitude PatrolFloorAltitude The lowest altitude in meters where to execute the patrol.
 -- @param Dcs.DCSTypes#Altitude PatrolCeilingAltitude The highest altitude in meters where to execute the patrol.
--- @return #PATROLZONE self
-function PATROLZONE:SetAltitude( PatrolFloorAltitude, PatrolCeilingAltitude )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:SetAltitude( PatrolFloorAltitude, PatrolCeilingAltitude )
   self:F2( { PatrolFloorAltitude, PatrolCeilingAltitude } )
   
   self.PatrolFloorAltitude = PatrolFloorAltitude
@@ -24213,7 +24213,7 @@ end
 function _NewPatrolRoute( AIControllable )
 
   AIControllable:T( "NewPatrolRoute" )
-  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#PATROLZONE
+  local PatrolZone = AIControllable:GetState( AIControllable, "PatrolZone" ) -- PatrolCore.Zone#AI_PATROLZONE
   PatrolZone:__Route( 1 )
 end
 
@@ -24222,13 +24222,13 @@ end
 
 --- When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 -- Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
--- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+-- When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 -- Once the time is finished, the old AIControllable will return to the base.
--- @param #PATROLZONE self
+-- @param #AI_PATROLZONE self
 -- @param #number PatrolFuelTresholdPercentage The treshold in percentage (between 0 and 1) when the AIControllable is considered to get out of fuel.
 -- @param #number PatrolOutOfFuelOrbitTime The amount of seconds the out of fuel AIControllable will orbit before returning to the base.
--- @return #PATROLZONE self
-function PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime )
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime )
 
   self.PatrolManageFuel = true
   self.PatrolFuelTresholdPercentage = PatrolFuelTresholdPercentage
@@ -24238,9 +24238,9 @@ function PATROLZONE:ManageFuel( PatrolFuelTresholdPercentage, PatrolOutOfFuelOrb
 end
 
 --- Defines a new patrol route using the @{Process_PatrolZone} parameters and settings.
--- @param #PATROLZONE self
--- @return #PATROLZONE self
-function PATROLZONE:onenterRoute()
+-- @param #AI_PATROLZONE self
+-- @return #AI_PATROLZONE self
+function AI_PATROLZONE:onenterRoute()
 
   self:F2()
 
@@ -24335,8 +24335,8 @@ function PATROLZONE:onenterRoute()
 end
 
 
---- @param #PATROLZONE self
-function PATROLZONE:onenterPatrol()
+--- @param #AI_PATROLZONE self
+function AI_PATROLZONE:onenterPatrol()
   self:F2()
 
   if self.Controllable and self.Controllable:IsAlive() then
@@ -24363,31 +24363,31 @@ end
 -- 
 -- Cargo can be of various forms, always are composed out of ONE object ( one unit or one static or one slingload crate ):
 --
---   * CARGO_UNIT, represented by a @{Unit} in a @{Group}: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.
+--   * AI_CARGO_UNIT, represented by a @{Unit} in a @{Group}: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.
 --   * CARGO_STATIC, represented by a @{Static}: Cargo can be represented by a Static. Destruction of the Static will mean that the cargo is lost.
---   * CARGO_PACKAGE, contained in a @{Unit} of a @{Group}: Cargo can be contained within a Unit of a Group. The cargo can be **delivered** by the @{Unit}. If the Unit is destroyed, the cargo will be destroyed also.
---   * CARGO_PACKAGE, Contained in a @{Static}: Cargo can be contained within a Static. The cargo can be **collected** from the @Static. If the @{Static} is destroyed, the cargo will be destroyed.
+--   * AI_CARGO_PACKAGE, contained in a @{Unit} of a @{Group}: Cargo can be contained within a Unit of a Group. The cargo can be **delivered** by the @{Unit}. If the Unit is destroyed, the cargo will be destroyed also.
+--   * AI_CARGO_PACKAGE, Contained in a @{Static}: Cargo can be contained within a Static. The cargo can be **collected** from the @Static. If the @{Static} is destroyed, the cargo will be destroyed.
 --   * CARGO_SLINGLOAD, represented by a @{Cargo} that is transportable: Cargo can be represented by a Cargo object that is transportable. Destruction of the Cargo will mean that the cargo is lost.
 --   
---   * CARGO_GROUPED, represented by a Group of CARGO_UNITs.
+--   * AI_CARGO_GROUPED, represented by a Group of CARGO_UNITs.
 -- 
--- 1) @{AI.AI_Cargo#CARGO_BASE} class, extends @{Core.Fsm#FSM_PROCESS}
+-- 1) @{AI.AI_Cargo#AI_CARGO} class, extends @{Core.Fsm#FSM_PROCESS}
 -- ==========================================================================
--- The @{#CARGO_BASE} class defines the core functions that defines a cargo object within MOOSE.
+-- The @{#AI_CARGO} class defines the core functions that defines a cargo object within MOOSE.
 -- A cargo is a logical object defined that is available for transport, and has a life status within a simulation.
 --
--- The CARGO_BASE is a state machine: it manages the different events and states of the cargo.
--- All derived classes from CARGO_BASE follow the same state machine, expose the same cargo event functions, and provide the same cargo states.
+-- The AI_CARGO is a state machine: it manages the different events and states of the cargo.
+-- All derived classes from AI_CARGO follow the same state machine, expose the same cargo event functions, and provide the same cargo states.
 -- 
--- ## 1.2.1) CARGO_BASE Events:
+-- ## 1.2.1) AI_CARGO Events:
 -- 
---   * @{#CARGO_BASE.Board}( ToCarrier ):  Boards the cargo to a carrier.
---   * @{#CARGO_BASE.Load}( ToCarrier ): Loads the cargo into a carrier, regardless of its position.
---   * @{#CARGO_BASE.UnBoard}( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.
---   * @{#CARGO_BASE.UnLoad}( ToPointVec2 ): UnLoads the cargo from a carrier.
---   * @{#CARGO_BASE.Dead}( Controllable ): The cargo is dead. The cargo process will be ended.
+--   * @{#AI_CARGO.Board}( ToCarrier ):  Boards the cargo to a carrier.
+--   * @{#AI_CARGO.Load}( ToCarrier ): Loads the cargo into a carrier, regardless of its position.
+--   * @{#AI_CARGO.UnBoard}( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.
+--   * @{#AI_CARGO.UnLoad}( ToPointVec2 ): UnLoads the cargo from a carrier.
+--   * @{#AI_CARGO.Dead}( Controllable ): The cargo is dead. The cargo process will be ended.
 -- 
--- ## 1.2.2) CARGO_BASE States:
+-- ## 1.2.2) AI_CARGO States:
 -- 
 --   * **UnLoaded**: The cargo is unloaded from a carrier.
 --   * **Boarding**: The cargo is currently boarding (= running) into a carrier.
@@ -24396,7 +24396,7 @@ end
 --   * **Dead**: The cargo is dead ...
 --   * **End**: The process has come to an end.
 --   
--- ## 1.2.3) CARGO_BASE state transition methods:
+-- ## 1.2.3) AI_CARGO state transition methods:
 -- 
 -- State transition functions can be set **by the mission designer** customizing or improving the behaviour of the state.
 -- There are 2 moments when state transition methods will be called by the state machine:
@@ -24411,15 +24411,15 @@ end
 --     The state transition method needs to start with the name **OnAfter + the name of the state**. 
 --     These state transition methods need to provide a return value, which is specified at the function description.
 -- 
--- 2) #CARGO_UNIT class
+-- 2) #AI_CARGO_UNIT class
 -- ====================
--- The CARGO_UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
--- Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO_UNIT objects to and from carriers.
+-- The AI_CARGO_UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
+-- Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI_CARGO_UNIT objects to and from carriers.
 -- 
--- 5) #CARGO_GROUPED class
+-- 5) #AI_CARGO_GROUPED class
 -- =======================
--- The CARGO_GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
--- Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO_UNIT objects to and from carriers.
+-- The AI_CARGO_GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
+-- Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI_CARGO_UNIT objects to and from carriers.
 -- 
 -- This module is still under construction, but is described above works already, and will keep working ...
 -- 
@@ -24431,14 +24431,14 @@ end
 
 --- Boards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo to the Carrier.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] Board
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] Board
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
 --- Boards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo to the Carrier.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] __Board
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __Board
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
@@ -24447,14 +24447,14 @@ end
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] UnBoard
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] UnBoard
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] __UnBoard
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __UnBoard
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
@@ -24463,14 +24463,14 @@ end
 
 --- Loads the cargo to a Carrier. The event will load the cargo into the Carrier regardless of its position. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] Load
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] Load
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
 --- Loads the cargo to a Carrier. The event will load the cargo into the Carrier regardless of its position. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **UnLoaded** state.
--- @function [parent=#CARGO_BASE] __Load
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __Load
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Wrapper.Controllable#CONTROLLABLE ToCarrier The Carrier that will hold the cargo.
 
@@ -24479,14 +24479,14 @@ end
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] UnLoad
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] UnLoad
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
--- @function [parent=#CARGO_BASE] __UnLoad
--- @param #CARGO_BASE self
+-- @function [parent=#AI_CARGO] __UnLoad
+-- @param #AI_CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
 -- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
@@ -24494,46 +24494,46 @@ end
 
 -- UnLoaded
 
---- @function [parent=#CARGO_BASE] OnBeforeUnLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeUnLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterUnLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterUnLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- Loaded
 
---- @function [parent=#CARGO_BASE] OnBeforeLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterLoaded
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterLoaded
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- Boarding
 
---- @function [parent=#CARGO_BASE] OnBeforeBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 -- UnBoarding
 
---- @function [parent=#CARGO_BASE] OnBeforeUnBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnBeforeUnBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 -- @return #boolean
 
---- @function [parent=#CARGO_BASE] OnAfterUnBoarding
--- @param #CARGO_BASE self
+--- @function [parent=#AI_CARGO] OnAfterUnBoarding
+-- @param #AI_CARGO self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable
 
 
@@ -24541,9 +24541,9 @@ end
 
 CARGOS = {}
 
-do -- CARGO_BASE
+do -- AI_CARGO
 
-  --- @type CARGO_BASE
+  --- @type AI_CARGO
   -- @extends Core.Fsm#FSM_PROCESS
   -- @field #string Type A string defining the type of the cargo. eg. Engineers, Equipment, Screwdrivers.
   -- @field #string Name A string defining the name of the cargo. The name is the unique identifier of the cargo.
@@ -24556,8 +24556,8 @@ do -- CARGO_BASE
   -- @field #boolean Moveable This flag defines if the cargo is moveable.
   -- @field #boolean Representable This flag defines if the cargo can be represented by a DCS Unit.
   -- @field #boolean Containable This flag defines if the cargo can be contained within a DCS Unit.
-  CARGO_BASE = {
-    ClassName = "CARGO_BASE",
+  AI_CARGO = {
+    ClassName = "AI_CARGO",
     Type = nil,
     Name = nil,
     Weight = nil,
@@ -24569,19 +24569,19 @@ do -- CARGO_BASE
     Containable = false,
   }
 
---- @type CARGO_BASE.CargoObjects
+--- @type AI_CARGO.CargoObjects
 -- @map < #string, Wrapper.Positionable#POSITIONABLE > The alive POSITIONABLE objects representing the the cargo.
 
 
---- CARGO_BASE Constructor. This class is an abstract class and should not be instantiated.
--- @param #CARGO_BASE self
+--- AI_CARGO Constructor. This class is an abstract class and should not be instantiated.
+-- @param #AI_CARGO self
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_BASE
-function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius )
+-- @return #AI_CARGO
+function AI_CARGO:New( Type, Name, Weight, ReportRadius, NearRadius )
 
   local self = BASE:Inherit( self, FSM:New() ) -- Core.Fsm#FSM_CONTROLLABLE
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
@@ -24618,20 +24618,20 @@ function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius )
 end
 
 
---- Template method to spawn a new representation of the CARGO_BASE in the simulator.
--- @param #CARGO_BASE self
--- @return #CARGO_BASE
-function CARGO_BASE:Spawn( PointVec2 )
+--- Template method to spawn a new representation of the AI_CARGO in the simulator.
+-- @param #AI_CARGO self
+-- @return #AI_CARGO
+function AI_CARGO:Spawn( PointVec2 )
   self:F()
 
 end
 
 
 --- Check if CargoCarrier is near the Cargo to be Loaded.
--- @param #CARGO_BASE self
+-- @param #AI_CARGO self
 -- @param Core.Point#POINT_VEC2 PointVec2
 -- @return #boolean
-function CARGO_BASE:IsNear( PointVec2 )
+function AI_CARGO:IsNear( PointVec2 )
   self:F( { PointVec2 } )
 
   local Distance = PointVec2:DistanceFromPointVec2( self.CargoObject:GetPointVec2() )
@@ -24646,36 +24646,36 @@ end
 
 end
 
-do -- CARGO_REPRESENTABLE
+do -- AI_CARGO_REPRESENTABLE
 
-  --- @type CARGO_REPRESENTABLE
-  -- @extends #CARGO_BASE
-  CARGO_REPRESENTABLE = {
-    ClassName = "CARGO_REPRESENTABLE"
+  --- @type AI_CARGO_REPRESENTABLE
+  -- @extends #AI_CARGO
+  AI_CARGO_REPRESENTABLE = {
+    ClassName = "AI_CARGO_REPRESENTABLE"
   }
 
---- CARGO_REPRESENTABLE Constructor.
--- @param #CARGO_REPRESENTABLE self
+--- AI_CARGO_REPRESENTABLE Constructor.
+-- @param #AI_CARGO_REPRESENTABLE self
 -- @param Wrapper.Controllable#Controllable CargoObject
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_REPRESENTABLE
-function CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_BASE
+-- @return #AI_CARGO_REPRESENTABLE
+function AI_CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   return self
 end
 
 --- Route a cargo unit to a PointVec2.
--- @param #CARGO_REPRESENTABLE self
+-- @param #AI_CARGO_REPRESENTABLE self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #number Speed
--- @return #CARGO_REPRESENTABLE
-function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
+-- @return #AI_CARGO_REPRESENTABLE
+function AI_CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
   self:F2( ToPointVec2 )
 
   local Points = {}
@@ -24690,27 +24690,27 @@ function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
   return self  
 end
 
-end -- CARGO_BASE
+end -- AI_CARGO
 
-do -- CARGO_UNIT
+do -- AI_CARGO_UNIT
 
-  --- @type CARGO_UNIT
-  -- @extends #CARGO_REPRESENTABLE
-  CARGO_UNIT = {
-    ClassName = "CARGO_UNIT"
+  --- @type AI_CARGO_UNIT
+  -- @extends #AI_CARGO_REPRESENTABLE
+  AI_CARGO_UNIT = {
+    ClassName = "AI_CARGO_UNIT"
   }
 
---- CARGO_UNIT Constructor.
--- @param #CARGO_UNIT self
+--- AI_CARGO_UNIT Constructor.
+-- @param #AI_CARGO_UNIT self
 -- @param Wrapper.Unit#UNIT CargoUnit
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_UNIT
-function CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_UNIT
+-- @return #AI_CARGO_UNIT
+function AI_CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_REPRESENTABLE:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO_UNIT
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   self:T( CargoUnit )
@@ -24722,12 +24722,12 @@ function CARGO_UNIT:New( CargoUnit, Type, Name, Weight, ReportRadius, NearRadius
 end
 
 --- Enter UnBoarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
   self:F()
 
   local Angle = 180
@@ -24767,12 +24767,12 @@ function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- Leave UnBoarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -24791,12 +24791,12 @@ function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- UnBoard Event.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2 ToPointVec2
-function CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   self.CargoInAir = self.CargoObject:InAir()
@@ -24816,12 +24816,12 @@ end
 
 
 --- Enter UnLoaded State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Core.Point#POINT_VEC2
-function CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2  )
+function AI_CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2  )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -24854,12 +24854,12 @@ end
 
 
 --- Enter Boarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   local Speed = 10
@@ -24886,12 +24886,12 @@ function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Leave Boarding State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
 
   if self:IsNear( CargoCarrier:GetPointVec2() ) then
@@ -24904,12 +24904,12 @@ function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Loaded State.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier )
   self:F()
 
   self.CargoCarrier = CargoCarrier
@@ -24923,11 +24923,11 @@ end
 
 
 --- Board Event.
--- @param #CARGO_UNIT self
+-- @param #AI_CARGO_UNIT self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier )
+function AI_CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier )
   self:F()
 
   self.CargoInAir = self.CargoObject:InAir()
@@ -24944,25 +24944,25 @@ end
 
 end
 
-do -- CARGO_PACKAGE
+do -- AI_CARGO_PACKAGE
 
-  --- @type CARGO_PACKAGE
-  -- @extends #CARGO_REPRESENTABLE
-  CARGO_PACKAGE = {
-    ClassName = "CARGO_PACKAGE"
+  --- @type AI_CARGO_PACKAGE
+  -- @extends #AI_CARGO_REPRESENTABLE
+  AI_CARGO_PACKAGE = {
+    ClassName = "AI_CARGO_PACKAGE"
   }
 
---- CARGO_PACKAGE Constructor.
--- @param #CARGO_PACKAGE self
+--- AI_CARGO_PACKAGE Constructor.
+-- @param #AI_CARGO_PACKAGE self
 -- @param Wrapper.Unit#UNIT CargoCarrier The UNIT carrying the package.
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_PACKAGE
-function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_PACKAGE
+-- @return #AI_CARGO_PACKAGE
+function AI_CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius ) ) -- #AI_CARGO_PACKAGE
   self:F( { Type, Name, Weight, ReportRadius, NearRadius } )
 
   self:T( CargoCarrier )
@@ -24972,7 +24972,7 @@ function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, ReportRadius, Near
 end
 
 --- Board Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -24980,7 +24980,7 @@ end
 -- @param #number Speed
 -- @param #number BoardDistance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
   self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
@@ -25010,10 +25010,10 @@ function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, Boa
 end
 
 --- Check if CargoCarrier is near the Cargo to be Loaded.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @return #boolean
-function CARGO_PACKAGE:IsNear( CargoCarrier )
+function AI_CARGO_PACKAGE:IsNear( CargoCarrier )
   self:F()
 
   local CargoCarrierPoint = CargoCarrier:GetPointVec2()
@@ -25029,12 +25029,12 @@ function CARGO_PACKAGE:IsNear( CargoCarrier )
 end
 
 --- Boarded Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
   self:F()
 
   if self:IsNear( CargoCarrier ) then
@@ -25045,7 +25045,7 @@ function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, B
 end
 
 --- UnBoard Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -25054,7 +25054,7 @@ end
 -- @param #number UnBoardDistance
 -- @param #number Radius
 -- @param #number Angle
-function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
+function AI_CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
   self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
@@ -25087,12 +25087,12 @@ function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnL
 end
 
 --- UnBoarded Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param Wrapper.Unit#UNIT CargoCarrier
-function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
+function AI_CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
   self:F()
 
   if self:IsNear( CargoCarrier ) then
@@ -25103,7 +25103,7 @@ function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed )
 end
 
 --- Load Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
@@ -25111,7 +25111,7 @@ end
 -- @param #number Speed
 -- @param #number LoadDistance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle )
+function AI_CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle )
   self:F()
 
   self.CargoCarrier = CargoCarrier
@@ -25131,13 +25131,13 @@ function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDi
 end
 
 --- UnLoad Event.
--- @param #CARGO_PACKAGE self
+-- @param #AI_CARGO_PACKAGE self
 -- @param #string Event
 -- @param #string From
 -- @param #string To
 -- @param #number Distance
 -- @param #number Angle
-function CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle )
+function AI_CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle )
   self:F()
   
   local StartPointVec2 = self.CargoCarrier:GetPointVec2()
@@ -25159,27 +25159,27 @@ end
 
 end
 
-do -- CARGO_GROUP
+do -- AI_CARGO_GROUP
 
-  --- @type CARGO_GROUP
-  -- @extends AI.AI_Cargo#CARGO_BASE
+  --- @type AI_CARGO_GROUP
+  -- @extends AI.AI_Cargo#AI_CARGO
   -- @field Set#SET_BASE CargoSet A set of cargo objects.
   -- @field #string Name A string defining the name of the cargo group. The name is the unique identifier of the cargo.
-  CARGO_GROUP = {
-    ClassName = "CARGO_GROUP",
+  AI_CARGO_GROUP = {
+    ClassName = "AI_CARGO_GROUP",
   }
 
---- CARGO_GROUP constructor.
--- @param #CARGO_GROUP self
+--- AI_CARGO_GROUP constructor.
+-- @param #AI_CARGO_GROUP self
 -- @param Core.Set#Set_BASE CargoSet
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_GROUP
-function CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, 0, ReportRadius, NearRadius ) ) -- #CARGO_GROUP
+-- @return #AI_CARGO_GROUP
+function AI_CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO:New( Type, Name, 0, ReportRadius, NearRadius ) ) -- #AI_CARGO_GROUP
   self:F( { Type, Name, ReportRadius, NearRadius } )
 
   self.CargoSet = CargoSet
@@ -25188,44 +25188,44 @@ function CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius )
   return self
 end
 
-end -- CARGO_GROUP
+end -- AI_CARGO_GROUP
 
-do -- CARGO_GROUPED
+do -- AI_CARGO_GROUPED
 
-  --- @type CARGO_GROUPED
-  -- @extends AI.AI_Cargo#CARGO_GROUP
-  CARGO_GROUPED = {
-    ClassName = "CARGO_GROUPED",
+  --- @type AI_CARGO_GROUPED
+  -- @extends AI.AI_Cargo#AI_CARGO_GROUP
+  AI_CARGO_GROUPED = {
+    ClassName = "AI_CARGO_GROUPED",
   }
 
---- CARGO_GROUPED constructor.
--- @param #CARGO_GROUPED self
+--- AI_CARGO_GROUPED constructor.
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Set#Set_BASE CargoSet
 -- @param #string Type
 -- @param #string Name
 -- @param #number Weight
 -- @param #number ReportRadius (optional)
 -- @param #number NearRadius (optional)
--- @return #CARGO_GROUPED
-function CARGO_GROUPED:New( CargoSet, Type, Name, ReportRadius, NearRadius )
-  local self = BASE:Inherit( self, CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius ) ) -- #CARGO_GROUPED
+-- @return #AI_CARGO_GROUPED
+function AI_CARGO_GROUPED:New( CargoSet, Type, Name, ReportRadius, NearRadius )
+  local self = BASE:Inherit( self, AI_CARGO_GROUP:New( CargoSet, Type, Name, ReportRadius, NearRadius ) ) -- #AI_CARGO_GROUPED
   self:F( { Type, Name, ReportRadius, NearRadius } )
 
   return self
 end
 
 --- Enter Boarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   if From == "UnLoaded" then
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:__Board( 1, CargoCarrier )
@@ -25238,16 +25238,16 @@ function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Enter Loaded State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
   
   if From == "UnLoaded" then
-    -- For each Cargo object within the CARGO_GROUPED, load each cargo to the CargoCarrier.
+    -- For each Cargo object within the AI_CARGO_GROUPED, load each cargo to the CargoCarrier.
     for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
       Cargo:Load( CargoCarrier )
     end
@@ -25255,17 +25255,17 @@ function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier )
 end
 
 --- Leave Boarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
+function AI_CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
   self:F( { CargoCarrier.UnitName, Event, From, To } )
 
   local Boarded = true
 
-  -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+  -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
   for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
     self:T( Cargo.current )
     if not Cargo:is( "Loaded" ) then
@@ -25282,19 +25282,19 @@ function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier )
 end
 
 --- Enter UnBoarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
   self:F()
 
   local Timer = 1
 
   if From == "Loaded" then
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:__UnBoard( Timer, ToPointVec2 )
@@ -25308,12 +25308,12 @@ function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- Leave UnBoarding State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   local Angle = 180
@@ -25323,7 +25323,7 @@ function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
   if From == "UnBoarding" then
     local UnBoarded = true
 
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     for CargoID, Cargo in pairs( self.CargoSet:GetSet() ) do
       self:T( Cargo.current )
       if not Cargo:is( "UnLoaded" ) then
@@ -25343,12 +25343,12 @@ function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 )
 end
 
 --- UnBoard Event.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2 ToPointVec2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   self:__UnLoad( 1, ToPointVec2 )
@@ -25357,17 +25357,17 @@ end
 
 
 --- Enter UnLoaded State.
--- @param #CARGO_GROUPED self
+-- @param #AI_CARGO_GROUPED self
 -- @param Core.Point#POINT_VEC2
 -- @param #string Event
 -- @param #string From
 -- @param #string To
-function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
+function AI_CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
   self:F( { ToPointVec2, Event, From, To } )
 
   if From == "Loaded" then
     
-    -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
+    -- For each Cargo object within the AI_CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo )
         Cargo:UnLoad( ToPointVec2 )
@@ -25378,7 +25378,7 @@ function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 )
 
 end
 
-end -- CARGO_GROUPED
+end -- AI_CARGO_GROUPED
 
 
 
diff --git a/Moose Test Missions/ABP - Airbase Police/APL-001 - Caucasus/APL-001 - Caucasus.miz b/Moose Test Missions/ABP - Airbase Police/APL-001 - Caucasus/APL-001 - Caucasus.miz
index 48cdd439f..a8b1d54d1 100644
Binary files a/Moose Test Missions/ABP - Airbase Police/APL-001 - Caucasus/APL-001 - Caucasus.miz and b/Moose Test Missions/ABP - Airbase Police/APL-001 - Caucasus/APL-001 - Caucasus.miz differ
diff --git a/Moose Test Missions/ABP - Airbase Police/APL-002 - Nevada/APL-002 - Nevada.miz b/Moose Test Missions/ABP - Airbase Police/APL-002 - Nevada/APL-002 - Nevada.miz
index 4eaa7bdb5..9268dd90d 100644
Binary files a/Moose Test Missions/ABP - Airbase Police/APL-002 - Nevada/APL-002 - Nevada.miz and b/Moose Test Missions/ABP - Airbase Police/APL-002 - Nevada/APL-002 - Nevada.miz differ
diff --git a/Moose Test Missions/ACL - Airbase Cleaner/ACL-001 - Airbase CleanUp/ACL-001 - Airbase CleanUp.miz b/Moose Test Missions/ACL - Airbase Cleaner/ACL-001 - Airbase CleanUp/ACL-001 - Airbase CleanUp.miz
index 5bdf8e1db..a3aa76e86 100644
Binary files a/Moose Test Missions/ACL - Airbase Cleaner/ACL-001 - Airbase CleanUp/ACL-001 - Airbase CleanUp.miz and b/Moose Test Missions/ACL - Airbase Cleaner/ACL-001 - Airbase CleanUp/ACL-001 - Airbase CleanUp.miz differ
diff --git a/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 - Spawned AI.lua b/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 - Spawned AI.lua
index 4aec78cf6..bf9376140 100644
--- a/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 - Spawned AI.lua	
+++ b/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 - Spawned AI.lua	
@@ -21,7 +21,7 @@
 --
 -- # Status: TESTED 07 Dec 2016
 -- 
--- @module TEST.AIBALANCER.T001
+-- @module TEST.AI_BALANCER.T001
 
 -- Define the SET of CLIENTs from the red coalition. This SET is filled during startup.
 local RU_PlanesClientSet = SET_CLIENT:New():FilterCountries( "RUSSIA" ):FilterCategories( "plane" ):FilterStart()
@@ -31,5 +31,5 @@ local RU_PlanesClientSet = SET_CLIENT:New():FilterCountries( "RUSSIA" ):FilterCa
 -- If a blocked plane exists, this red plane will be ReSpawned.
 local RU_PlanesSpawn = SPAWN:New( "AI RU" ):InitCleanUp( 20 )
 
--- Start the AIBALANCER, using the SET of red CLIENTs, and the SPAWN object as a parameter.
-local RU_AI_Balancer = AIBALANCER:New( RU_PlanesClientSet, RU_PlanesSpawn )
+-- Start the AI_BALANCER, using the SET of red CLIENTs, and the SPAWN object as a parameter.
+local RU_AI_Balancer = AI_BALANCER:New( RU_PlanesClientSet, RU_PlanesSpawn )
diff --git a/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 -Spawned AI.miz b/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 -Spawned AI.miz
index 5bed8d605..a7d029212 100644
Binary files a/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 -Spawned AI.miz and b/Moose Test Missions/AIB - AI Balancing/AIB-001 - Spawned AI/AIB-001 -Spawned AI.miz differ
diff --git a/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.lua b/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.lua
index 9ac9be889..fa68376cb 100644
--- a/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.lua	
+++ b/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.lua	
@@ -22,7 +22,7 @@
 -- 
 -- # Status: DEVELOP 07 Dec 2016
 --
--- @module TEST.AIBALANCER.T002
+-- @module TEST.AI_BALANCER.T002
 
 -- Define the SET of CLIENTs from the red coalition. This SET is filled during startup.
 local RU_PlanesClientSet = SET_CLIENT:New():FilterCountries( "RUSSIA" ):FilterCategories( "plane" ):FilterStart()
@@ -32,8 +32,8 @@ local RU_PlanesClientSet = SET_CLIENT:New():FilterCountries( "RUSSIA" ):FilterCa
 -- If a blocked plane exists, this red plane will be ReSpawned.
 local RU_PlanesSpawn = SPAWN:New( "AI RU" ):InitCleanUp( 20 )
 
--- Start the AIBALANCER, using the SET of red CLIENTs, and the SPAWN object as a parameter.
-local RU_AI_Balancer = AIBALANCER:New( RU_PlanesClientSet, RU_PlanesSpawn )
+-- Start the AI_BALANCER, using the SET of red CLIENTs, and the SPAWN object as a parameter.
+local RU_AI_Balancer = AI_BALANCER:New( RU_PlanesClientSet, RU_PlanesSpawn )
 
 function RU_AI_Balancer:OnAfterSpawned( SetGroup, Event, From, To, AIGroup )
 
@@ -41,7 +41,7 @@ function RU_AI_Balancer:OnAfterSpawned( SetGroup, Event, From, To, AIGroup )
   local PatrolZone = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
 
 
-  local Patrol = PATROLZONE:New( PatrolZone, 3000, 6000, 400, 600 )
+  local Patrol = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 400, 600 )
   Patrol:ManageFuel( 0.2, 60 )
   Patrol:SetControllable( AIGroup )
   Patrol:__Start( 5 )
diff --git a/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.miz b/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.miz
index 2eb30e601..f579a7971 100644
Binary files a/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.miz and b/Moose Test Missions/AIB - AI Balancing/AIB-002 - Patrol AI/AIB-002 - Patrol AI.miz differ
diff --git a/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.lua b/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.lua
index 573efc284..ff37d8cdd 100644
--- a/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.lua	
+++ b/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.lua	
@@ -2,11 +2,11 @@
 local US_PlanesClientSet = SET_CLIENT:New():FilterCountries( "USA" ):FilterCategories( "plane" ):FilterStart()
 
 local US_PlanesSpawn = SPAWN:New( "AI US" ):InitCleanUp( 20 )
-local US_AI_Balancer = AIBALANCER:New( US_PlanesClientSet, US_PlanesSpawn )
+local US_AI_Balancer = AI_BALANCER:New( US_PlanesClientSet, US_PlanesSpawn )
 
 local RU_PlanesClientSet = SET_CLIENT:New():FilterCountries( "RUSSIA" ):FilterCategories( "plane" ):FilterStart()
 local RU_PlanesSpawn = SPAWN:New( "AI RU" ):InitCleanUp( 20 )
-local RU_AI_Balancer = AIBALANCER:New( RU_PlanesClientSet, RU_PlanesSpawn )
+local RU_AI_Balancer = AI_BALANCER:New( RU_PlanesClientSet, RU_PlanesSpawn )
 
 local RU_AirbasesSet = SET_AIRBASE:New():FilterCoalitions("red"):FilterStart()
 RU_AirbasesSet:Flush()
@@ -15,10 +15,10 @@ RU_AI_Balancer:ReturnToNearestAirbases( 10000, RU_AirbasesSet )
 
 --local PatrolZoneGroup = GROUP:FindByName( "Patrol Zone Blue" )
 --local PatrolZoneBlue = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
---local PatrolZoneB = PATROLZONE:New( PatrolZoneBlue, 3000, 6000, 900, 1100 ):ManageFuel( 0.2, 180 )
+--local PatrolZoneB = AI_PATROLZONE:New( PatrolZoneBlue, 3000, 6000, 900, 1100 ):ManageFuel( 0.2, 180 )
 --US_AI_Balancer:SetPatrolZone( PatrolZoneB )
 --
 --local PatrolZoneGroup = GROUP:FindByName( "Patrol Zone Red" )
 --local PatrolZoneRed = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
---local PatrolZoneR = PATROLZONE:New( PatrolZoneRed, 3000, 6000, 900, 1100 ):ManageFuel( 0.2, 180 )
+--local PatrolZoneR = AI_PATROLZONE:New( PatrolZoneRed, 3000, 6000, 900, 1100 ):ManageFuel( 0.2, 180 )
 --RU_AI_Balancer:SetPatrolZone( PatrolZoneR )
diff --git a/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.miz b/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.miz
index 6b712a8ad..3a641c641 100644
Binary files a/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.miz and b/Moose Test Missions/AIB - AI Balancing/AIB-003 - Two coalitions InitCleanUp test/AIB-003 - Two coalitions InitCleanUp test.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.lua b/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.lua
index 3025639fb..b4a1e62f4 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.lua	
@@ -1,6 +1,6 @@
 
 local CargoEngineer = UNIT:FindByName( "Engineer" )
-local InfantryCargo = CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
+local InfantryCargo = AI_CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
 
 local CargoCarrier = UNIT:FindByName( "Carrier" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.miz b/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.miz
index 8d9253fc0..928af9d98 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.miz and b/Moose Test Missions/CGO - Cargo/CGO-001 - Unit Boarding/CGO-001 - Unit Boarding.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.lua b/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.lua
index 096577fd8..ff8716a23 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.lua	
@@ -1,6 +1,6 @@
 
 local CargoEngineer = UNIT:FindByName( "Engineer" )
-local InfantryCargo = CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
+local InfantryCargo = AI_CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
 
 local CargoCarrier = UNIT:FindByName( "Carrier" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.miz b/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.miz
index db674c4b5..5e1a54bf1 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.miz and b/Moose Test Missions/CGO - Cargo/CGO-002 - Unit Unboarding/CGO-002 - Unit Unboarding.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.lua b/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.lua
index 4dc304c15..b5eb57036 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.lua	
@@ -1,6 +1,6 @@
 
 local CargoEngineer = UNIT:FindByName( "Engineer" )
-local InfantryCargo = CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
+local InfantryCargo = AI_CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
 
 local CargoCarrierFrom = UNIT:FindByName( "CarrierFrom" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.miz b/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.miz
index 5b34356cf..77df5dd47 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.miz and b/Moose Test Missions/CGO - Cargo/CGO-003 - Unit Transferring/CGO-003 - Unit Transferring.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.lua b/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.lua
index 3c101175d..355680ed9 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.lua	
@@ -1,11 +1,11 @@
 
 local CargoSet = SET_BASE:New()
-CargoSet:Add( "Engineer1", CARGO_UNIT:New( UNIT:FindByName( "Engineer1" ), "Engineers", "Engineer", 81, 2000, 25 ) )
-CargoSet:Add( "Engineer2", CARGO_UNIT:New( UNIT:FindByName( "Engineer2" ), "Engineers", "Engineer", 64, 2000, 25 ) )
-CargoSet:Add( "Engineer3", CARGO_UNIT:New( UNIT:FindByName( "Engineer3" ), "Engineers", "Engineer", 72, 2000, 25 ) )
-CargoSet:Add( "Engineer4", CARGO_UNIT:New( UNIT:FindByName( "Engineer4" ), "Engineers", "Engineer", 69, 2000, 25 ) )
+CargoSet:Add( "Engineer1", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer1" ), "Engineers", "Engineer", 81, 2000, 25 ) )
+CargoSet:Add( "Engineer2", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer2" ), "Engineers", "Engineer", 64, 2000, 25 ) )
+CargoSet:Add( "Engineer3", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer3" ), "Engineers", "Engineer", 72, 2000, 25 ) )
+CargoSet:Add( "Engineer4", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer4" ), "Engineers", "Engineer", 69, 2000, 25 ) )
 
-local InfantryCargo = CARGO_GROUPED:New( CargoSet, "Engineers", "Engineers", 2000, 25 )
+local InfantryCargo = AI_CARGO_GROUPED:New( CargoSet, "Engineers", "Engineers", 2000, 25 )
 
 local CargoCarrier = UNIT:FindByName( "Carrier" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.miz b/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.miz
index 5a41e7f46..47444a5bf 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.miz and b/Moose Test Missions/CGO - Cargo/CGO-101 - Group Boarding/CGO-101 - Group Boarding.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.lua b/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.lua
index 4849e658c..26693a557 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.lua	
@@ -1,11 +1,11 @@
 
 local CargoSet = SET_BASE:New()
-CargoSet:Add( "Engineer1", CARGO_UNIT:New( UNIT:FindByName( "Engineer1" ), "Engineers", "Engineer", 81, 2000, 25 ) )
-CargoSet:Add( "Engineer2", CARGO_UNIT:New( UNIT:FindByName( "Engineer2" ), "Engineers", "Engineer", 64, 2000, 25 ) )
-CargoSet:Add( "Engineer3", CARGO_UNIT:New( UNIT:FindByName( "Engineer3" ), "Engineers", "Engineer", 72, 2000, 25 ) )
-CargoSet:Add( "Engineer4", CARGO_UNIT:New( UNIT:FindByName( "Engineer4" ), "Engineers", "Engineer", 69, 2000, 25 ) )
+CargoSet:Add( "Engineer1", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer1" ), "Engineers", "Engineer", 81, 2000, 25 ) )
+CargoSet:Add( "Engineer2", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer2" ), "Engineers", "Engineer", 64, 2000, 25 ) )
+CargoSet:Add( "Engineer3", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer3" ), "Engineers", "Engineer", 72, 2000, 25 ) )
+CargoSet:Add( "Engineer4", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer4" ), "Engineers", "Engineer", 69, 2000, 25 ) )
 
-local InfantryCargo = CARGO_GROUPED:New( CargoSet, "Engineers", "Engineers", 2000, 25 )
+local InfantryCargo = AI_CARGO_GROUPED:New( CargoSet, "Engineers", "Engineers", 2000, 25 )
 
 local CargoCarrier = UNIT:FindByName( "Carrier" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.miz b/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.miz
index f3707521f..d3eafecd5 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.miz and b/Moose Test Missions/CGO - Cargo/CGO-102 - Group Unboarding/CGO-102 - Group Unboarding.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.lua b/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.lua
index a69e5c482..06968a6da 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.lua	
@@ -1,11 +1,11 @@
 
 local CargoSet = SET_BASE:New()
-CargoSet:Add( "Engineer1", CARGO_UNIT:New( UNIT:FindByName( "Engineer1" ), "Engineers", "Engineer", 81, 2000, 25 ) )
-CargoSet:Add( "Engineer2", CARGO_UNIT:New( UNIT:FindByName( "Engineer2" ), "Engineers", "Engineer", 64, 2000, 25 ) )
-CargoSet:Add( "Engineer3", CARGO_UNIT:New( UNIT:FindByName( "Engineer3" ), "Engineers", "Engineer", 72, 2000, 25 ) )
-CargoSet:Add( "Engineer4", CARGO_UNIT:New( UNIT:FindByName( "Engineer4" ), "Engineers", "Engineer", 69, 2000, 25 ) )
+CargoSet:Add( "Engineer1", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer1" ), "Engineers", "Engineer", 81, 2000, 25 ) )
+CargoSet:Add( "Engineer2", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer2" ), "Engineers", "Engineer", 64, 2000, 25 ) )
+CargoSet:Add( "Engineer3", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer3" ), "Engineers", "Engineer", 72, 2000, 25 ) )
+CargoSet:Add( "Engineer4", AI_CARGO_UNIT:New( UNIT:FindByName( "Engineer4" ), "Engineers", "Engineer", 69, 2000, 25 ) )
 
-local InfantryCargo = CARGO_GROUPED:New( CargoSet, "Engineers", "Engineers", 2000, 25 )
+local InfantryCargo = AI_CARGO_GROUPED:New( CargoSet, "Engineers", "Engineers", 2000, 25 )
 
 local CargoCarrierFrom = UNIT:FindByName( "CarrierFrom" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.miz b/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.miz
index d712296fd..6a38c9367 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.miz and b/Moose Test Missions/CGO - Cargo/CGO-103 - Group Transferring/CGO-103 - Group Transferring.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.lua b/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.lua
index d68971c21..91f6b537f 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.lua	
@@ -1,6 +1,6 @@
 
 local DeliveryUnit = UNIT:FindByName( "Delivery" )
-local Letter = CARGO_PACKAGE:New( DeliveryUnit, "Letter", "Secret Orders", "0.3", 2000, 25 )
+local Letter = AI_CARGO_PACKAGE:New( DeliveryUnit, "Letter", "Secret Orders", "0.3", 2000, 25 )
 
 local CargoCarrier = UNIT:FindByName( "Carrier" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.miz b/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.miz
index 98bd8f6f0..cc0ab2664 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.miz and b/Moose Test Missions/CGO - Cargo/CGO-201 - Package Boarding/CGO-201 - Package Boarding.miz differ
diff --git a/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.lua b/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.lua
index a80062fd0..a611c8ad6 100644
--- a/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.lua	
+++ b/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.lua	
@@ -1,6 +1,6 @@
 
 local CargoEngineer = UNIT:FindByName( "Engineer" )
-local InfantryCargo = CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
+local InfantryCargo = AI_CARGO_UNIT:New( CargoEngineer, "Engineer", "Engineer Sven", "81", 2000, 25 )
 
 local CargoCarrier = UNIT:FindByName( "Carrier" )
 
diff --git a/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.miz b/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.miz
index e1757c9ef..c9b37144a 100644
Binary files a/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.miz and b/Moose Test Missions/CGO - Cargo/CGO-202 - Package Unboarding/CGO-202 - Package Unboarding.miz differ
diff --git a/Moose Test Missions/DET - Detection/DET-001 - Detection Areas/DET-001 - Detection Areas.miz b/Moose Test Missions/DET - Detection/DET-001 - Detection Areas/DET-001 - Detection Areas.miz
index e7964493a..e72284e0c 100644
Binary files a/Moose Test Missions/DET - Detection/DET-001 - Detection Areas/DET-001 - Detection Areas.miz and b/Moose Test Missions/DET - Detection/DET-001 - Detection Areas/DET-001 - Detection Areas.miz differ
diff --git a/Moose Test Missions/DET - Detection/DET-101 - Detection Reporting/DET-101 - Detection Reporting.miz b/Moose Test Missions/DET - Detection/DET-101 - Detection Reporting/DET-101 - Detection Reporting.miz
index 562acfbd6..48e2d4d4f 100644
Binary files a/Moose Test Missions/DET - Detection/DET-101 - Detection Reporting/DET-101 - Detection Reporting.miz and b/Moose Test Missions/DET - Detection/DET-101 - Detection Reporting/DET-101 - Detection Reporting.miz differ
diff --git a/Moose Test Missions/ESC - Escorting/ESC-001 - Escorting Helicopters/ESC-001 - Escorting Helicopters.miz b/Moose Test Missions/ESC - Escorting/ESC-001 - Escorting Helicopters/ESC-001 - Escorting Helicopters.miz
index fcaba4d8f..7303511a3 100644
Binary files a/Moose Test Missions/ESC - Escorting/ESC-001 - Escorting Helicopters/ESC-001 - Escorting Helicopters.miz and b/Moose Test Missions/ESC - Escorting/ESC-001 - Escorting Helicopters/ESC-001 - Escorting Helicopters.miz differ
diff --git a/Moose Test Missions/GRP - Group Commands/GRP-200 - Follow Group/GRP-200 - Follow Group.miz b/Moose Test Missions/GRP - Group Commands/GRP-200 - Follow Group/GRP-200 - Follow Group.miz
index bb57fa757..8d3cefbbc 100644
Binary files a/Moose Test Missions/GRP - Group Commands/GRP-200 - Follow Group/GRP-200 - Follow Group.miz and b/Moose Test Missions/GRP - Group Commands/GRP-200 - Follow Group/GRP-200 - Follow Group.miz differ
diff --git a/Moose Test Missions/GRP - Group Commands/GRP-300 - Switch WayPoints/GRP-300 - Switch WayPoints.miz b/Moose Test Missions/GRP - Group Commands/GRP-300 - Switch WayPoints/GRP-300 - Switch WayPoints.miz
index 93f753172..d2c5679c9 100644
Binary files a/Moose Test Missions/GRP - Group Commands/GRP-300 - Switch WayPoints/GRP-300 - Switch WayPoints.miz and b/Moose Test Missions/GRP - Group Commands/GRP-300 - Switch WayPoints/GRP-300 - Switch WayPoints.miz differ
diff --git a/Moose Test Missions/GRP - Group Commands/Moose_Test_WRAPPER.miz b/Moose Test Missions/GRP - Group Commands/Moose_Test_WRAPPER.miz
index f593db07b..b32feac07 100644
Binary files a/Moose Test Missions/GRP - Group Commands/Moose_Test_WRAPPER.miz and b/Moose Test Missions/GRP - Group Commands/Moose_Test_WRAPPER.miz differ
diff --git a/Moose Test Missions/MEN - Menu Options/MEN-001 - Menu Client/MEN-001 - Menu Client.miz b/Moose Test Missions/MEN - Menu Options/MEN-001 - Menu Client/MEN-001 - Menu Client.miz
index 7f555a15d..d3ca7eea0 100644
Binary files a/Moose Test Missions/MEN - Menu Options/MEN-001 - Menu Client/MEN-001 - Menu Client.miz and b/Moose Test Missions/MEN - Menu Options/MEN-001 - Menu Client/MEN-001 - Menu Client.miz differ
diff --git a/Moose Test Missions/MEN - Menu Options/MEN-002 - Menu Coalition/MEN-002 - Menu Coalition.miz b/Moose Test Missions/MEN - Menu Options/MEN-002 - Menu Coalition/MEN-002 - Menu Coalition.miz
index 4ad5ee076..d64a196dc 100644
Binary files a/Moose Test Missions/MEN - Menu Options/MEN-002 - Menu Coalition/MEN-002 - Menu Coalition.miz and b/Moose Test Missions/MEN - Menu Options/MEN-002 - Menu Coalition/MEN-002 - Menu Coalition.miz differ
diff --git a/Moose Test Missions/MEN - Menu Options/MEN-003 - Menu Group/MEN-003 - Menu Group.miz b/Moose Test Missions/MEN - Menu Options/MEN-003 - Menu Group/MEN-003 - Menu Group.miz
index 64294e650..cdf2f7527 100644
Binary files a/Moose Test Missions/MEN - Menu Options/MEN-003 - Menu Group/MEN-003 - Menu Group.miz and b/Moose Test Missions/MEN - Menu Options/MEN-003 - Menu Group/MEN-003 - Menu Group.miz differ
diff --git a/Moose Test Missions/MIT - Missile Trainer/MIT-001 - Missile Trainer/MIT-001 - Missile Trainer.miz b/Moose Test Missions/MIT - Missile Trainer/MIT-001 - Missile Trainer/MIT-001 - Missile Trainer.miz
index 5568d47da..14d80023e 100644
Binary files a/Moose Test Missions/MIT - Missile Trainer/MIT-001 - Missile Trainer/MIT-001 - Missile Trainer.miz and b/Moose Test Missions/MIT - Missile Trainer/MIT-001 - Missile Trainer/MIT-001 - Missile Trainer.miz differ
diff --git a/Moose Test Missions/MOOSE_Test_Template.miz b/Moose Test Missions/MOOSE_Test_Template.miz
index 8737cbea5..56ca68cd5 100644
Binary files a/Moose Test Missions/MOOSE_Test_Template.miz and b/Moose Test Missions/MOOSE_Test_Template.miz differ
diff --git a/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.lua b/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.lua
index b33b25e70..2c35574c8 100644
--- a/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.lua	
+++ b/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.lua	
@@ -1,6 +1,6 @@
--- This test mission models the behaviour of the PATROLZONE class.
+-- This test mission models the behaviour of the AI_PATROLZONE class.
 -- 
--- It creates a 2 PATROLZONE objects with the name Patrol1 and Patrol2.
+-- It creates a 2 AI_PATROLZONE objects with the name Patrol1 and Patrol2.
 -- Patrol1 will govern a GROUP object to patrol the zone defined by PatrolZone1, within 3000 meters and 6000 meters, within a speed of 400 and 600 km/h.
 -- When the GROUP object that is assigned to Patrol has fuel below 20%, the GROUP object will orbit for 60 secondes, before returning to base.
 -- 
@@ -23,16 +23,16 @@ local PatrolZone2 = ZONE_POLYGON:New( "Patrol Zone 2", PatrolZoneGroup2 )
 local PatrolSpawn = SPAWN:New( "Patrol Group" )
 local PatrolGroup = PatrolSpawn:Spawn()
 
-local Patrol1 = PATROLZONE:New( PatrolZone1, 3000, 6000, 400, 600 )
+local Patrol1 = AI_PATROLZONE:New( PatrolZone1, 3000, 6000, 400, 600 )
 Patrol1:ManageFuel( 0.2, 60 )
 Patrol1:SetControllable( PatrolGroup )
 Patrol1:__Start( 5 )
 
-local Patrol2 = PATROLZONE:New( PatrolZone2, 600, 1000, 300, 400 )
+local Patrol2 = AI_PATROLZONE:New( PatrolZone2, 600, 1000, 300, 400 )
 Patrol2:ManageFuel( 0.2, 0 )
 
 --- State transition function for the PROCESS\_PATROLZONE **Patrol1** object
--- @param #PATROLZONE self 
+-- @param #AI_PATROLZONE self 
 -- @param Wrapper.Group#GROUP AIGroup
 -- @return #boolean If false is returned, then the OnAfter state transition function will not be called.
 function Patrol1:OnBeforeRTB( AIGroup )
@@ -40,7 +40,7 @@ function Patrol1:OnBeforeRTB( AIGroup )
 end 
 
 --- State transition function for the PROCESS\_PATROLZONE **Patrol1** object
--- @param Process_PatrolCore.Zone#PATROLZONE self 
+-- @param Process_PatrolCore.Zone#AI_PATROLZONE self 
 -- @param Wrapper.Group#GROUP AIGroup
 function Patrol1:OnAfterRTB( AIGroup )
   local NewGroup = PatrolSpawn:Spawn()
@@ -49,14 +49,14 @@ function Patrol1:OnAfterRTB( AIGroup )
 end 
 
 --- State transition function for the PROCESS\_PATROLZONE **Patrol1** object
--- @param Process_PatrolCore.Zone#PATROLZONE self 
+-- @param Process_PatrolCore.Zone#AI_PATROLZONE self 
 -- @param Wrapper.Group#GROUP AIGroup
 function Patrol1:OnAfterPatrol( AIGroup )
   AIGroup:MessageToRed( "Patrolling in zone " .. PatrolZone1:GetName() , 20 )
 end 
 
 --- State transition function for the PROCESS\_PATROLZONE **Patrol2** object
--- @param #PATROLZONE self 
+-- @param #AI_PATROLZONE self 
 -- @param Wrapper.Group#GROUP AIGroup
 -- @return #boolean If false is returned, then the OnAfter state transition function will not be called.
 function Patrol2:OnBeforeRTB( AIGroup )
@@ -64,7 +64,7 @@ function Patrol2:OnBeforeRTB( AIGroup )
 end 
 
 --- State transition function for the PROCESS\_PATROLZONE **Patrol2** object
--- @param Process_PatrolCore.Zone#PATROLZONE self 
+-- @param Process_PatrolCore.Zone#AI_PATROLZONE self 
 -- @param Wrapper.Group#GROUP AIGroup
 function Patrol2:OnAfterRTB( AIGroup )
   local NewGroup = PatrolSpawn:Spawn()
@@ -73,7 +73,7 @@ function Patrol2:OnAfterRTB( AIGroup )
 end 
 
 --- State transition function for the PROCESS\_PATROLZONE **Patrol2** object
--- @param Process_PatrolCore.Zone#PATROLZONE self 
+-- @param Process_PatrolCore.Zone#AI_PATROLZONE self 
 -- @param Wrapper.Group#GROUP AIGroup
 function Patrol2:OnAfterPatrol( AIGroup )
   AIGroup:MessageToRed( "Patrolling in zone " .. PatrolZone2:GetName() , 20 )
diff --git a/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.miz b/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.miz
index dd082da9d..a750a80e3 100644
Binary files a/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.miz and b/Moose Test Missions/PAT - Patrolling/PAT-001 - Switching Patrol Zones/PAT-001 - Switching Patrol Zones.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-000 - Simple Scheduling/SCH-000 - Simple Scheduling.miz b/Moose Test Missions/SCH - Scheduler/SCH-000 - Simple Scheduling/SCH-000 - Simple Scheduling.miz
index 815610bda..cdd67e9ba 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-000 - Simple Scheduling/SCH-000 - Simple Scheduling.miz and b/Moose Test Missions/SCH - Scheduler/SCH-000 - Simple Scheduling/SCH-000 - Simple Scheduling.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-001 - Simple Object Scheduling/SCH-001 - Simple Object Scheduling.miz b/Moose Test Missions/SCH - Scheduler/SCH-001 - Simple Object Scheduling/SCH-001 - Simple Object Scheduling.miz
index 950ab8307..4269e3141 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-001 - Simple Object Scheduling/SCH-001 - Simple Object Scheduling.miz and b/Moose Test Missions/SCH - Scheduler/SCH-001 - Simple Object Scheduling/SCH-001 - Simple Object Scheduling.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-100 - Simple Repeat Scheduling/SCH-100 - Simple Repeat Scheduling.miz b/Moose Test Missions/SCH - Scheduler/SCH-100 - Simple Repeat Scheduling/SCH-100 - Simple Repeat Scheduling.miz
index 387a72325..98263f585 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-100 - Simple Repeat Scheduling/SCH-100 - Simple Repeat Scheduling.miz and b/Moose Test Missions/SCH - Scheduler/SCH-100 - Simple Repeat Scheduling/SCH-100 - Simple Repeat Scheduling.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-110 - Object Repeat Scheduling/SCH-110 - Object Repeat Scheduling.miz b/Moose Test Missions/SCH - Scheduler/SCH-110 - Object Repeat Scheduling/SCH-110 - Object Repeat Scheduling.miz
index bf5ee69af..7967b4026 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-110 - Object Repeat Scheduling/SCH-110 - Object Repeat Scheduling.miz and b/Moose Test Missions/SCH - Scheduler/SCH-110 - Object Repeat Scheduling/SCH-110 - Object Repeat Scheduling.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-200 - Simple Repeat Scheduling Stop and Start/SCH-200 - Simple Repeat Scheduling Stop and Start.miz b/Moose Test Missions/SCH - Scheduler/SCH-200 - Simple Repeat Scheduling Stop and Start/SCH-200 - Simple Repeat Scheduling Stop and Start.miz
index 952828e46..67dde599f 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-200 - Simple Repeat Scheduling Stop and Start/SCH-200 - Simple Repeat Scheduling Stop and Start.miz and b/Moose Test Missions/SCH - Scheduler/SCH-200 - Simple Repeat Scheduling Stop and Start/SCH-200 - Simple Repeat Scheduling Stop and Start.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-300 - GC Simple Object Scheduling/SCH-300 - GC Simple Object Scheduling.miz b/Moose Test Missions/SCH - Scheduler/SCH-300 - GC Simple Object Scheduling/SCH-300 - GC Simple Object Scheduling.miz
index f0b44f713..f689f3988 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-300 - GC Simple Object Scheduling/SCH-300 - GC Simple Object Scheduling.miz and b/Moose Test Missions/SCH - Scheduler/SCH-300 - GC Simple Object Scheduling/SCH-300 - GC Simple Object Scheduling.miz differ
diff --git a/Moose Test Missions/SCH - Scheduler/SCH-310 - GC Object Repeat Scheduling/SCH-310 - GC Object Repeat Scheduling.miz b/Moose Test Missions/SCH - Scheduler/SCH-310 - GC Object Repeat Scheduling/SCH-310 - GC Object Repeat Scheduling.miz
index b1883f6dd..e8130b2c7 100644
Binary files a/Moose Test Missions/SCH - Scheduler/SCH-310 - GC Object Repeat Scheduling/SCH-310 - GC Object Repeat Scheduling.miz and b/Moose Test Missions/SCH - Scheduler/SCH-310 - GC Object Repeat Scheduling/SCH-310 - GC Object Repeat Scheduling.miz differ
diff --git a/Moose Test Missions/SET - Data Sets/SET-001 - Airbase Sets/SET-001 - Airbase Sets.miz b/Moose Test Missions/SET - Data Sets/SET-001 - Airbase Sets/SET-001 - Airbase Sets.miz
index f18ccfcc9..e18bef886 100644
Binary files a/Moose Test Missions/SET - Data Sets/SET-001 - Airbase Sets/SET-001 - Airbase Sets.miz and b/Moose Test Missions/SET - Data Sets/SET-001 - Airbase Sets/SET-001 - Airbase Sets.miz differ
diff --git a/Moose Test Missions/SET - Data Sets/SET-101 - Group Sets/SET-101 - Group Sets.miz b/Moose Test Missions/SET - Data Sets/SET-101 - Group Sets/SET-101 - Group Sets.miz
index d50c6de4b..d3e1c04bd 100644
Binary files a/Moose Test Missions/SET - Data Sets/SET-101 - Group Sets/SET-101 - Group Sets.miz and b/Moose Test Missions/SET - Data Sets/SET-101 - Group Sets/SET-101 - Group Sets.miz differ
diff --git a/Moose Test Missions/SET - Data Sets/SET-201 - Client Sets/SET-201 - Client Sets.miz b/Moose Test Missions/SET - Data Sets/SET-201 - Client Sets/SET-201 - Client Sets.miz
index 5e4f92438..cf7236875 100644
Binary files a/Moose Test Missions/SET - Data Sets/SET-201 - Client Sets/SET-201 - Client Sets.miz and b/Moose Test Missions/SET - Data Sets/SET-201 - Client Sets/SET-201 - Client Sets.miz differ
diff --git a/Moose Test Missions/SEV - SEAD Evasion/SEV-001 - SEAD Evasion/SEV-001 - SEAD Evasion.miz b/Moose Test Missions/SEV - SEAD Evasion/SEV-001 - SEAD Evasion/SEV-001 - SEAD Evasion.miz
index 368d06cee..0a240c859 100644
Binary files a/Moose Test Missions/SEV - SEAD Evasion/SEV-001 - SEAD Evasion/SEV-001 - SEAD Evasion.miz and b/Moose Test Missions/SEV - SEAD Evasion/SEV-001 - SEAD Evasion/SEV-001 - SEAD Evasion.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-010 - Spawn Demo/SPA-010 - Spawn Demo.miz b/Moose Test Missions/SPA - Spawning/SPA-010 - Spawn Demo/SPA-010 - Spawn Demo.miz
index a45784f92..39932e811 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-010 - Spawn Demo/SPA-010 - Spawn Demo.miz and b/Moose Test Missions/SPA - Spawning/SPA-010 - Spawn Demo/SPA-010 - Spawn Demo.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-100 - CleanUp Inactive Units/SPA-100 - CleanUp Inactive Units.miz b/Moose Test Missions/SPA - Spawning/SPA-100 - CleanUp Inactive Units/SPA-100 - CleanUp Inactive Units.miz
index 1e795ce4e..0245a4547 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-100 - CleanUp Inactive Units/SPA-100 - CleanUp Inactive Units.miz and b/Moose Test Missions/SPA - Spawning/SPA-100 - CleanUp Inactive Units/SPA-100 - CleanUp Inactive Units.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-110 - Limit Spawning/SPA-110 - Limit Spawning.miz b/Moose Test Missions/SPA - Spawning/SPA-110 - Limit Spawning/SPA-110 - Limit Spawning.miz
index 8e72bc66e..6b19bddef 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-110 - Limit Spawning/SPA-110 - Limit Spawning.miz and b/Moose Test Missions/SPA - Spawning/SPA-110 - Limit Spawning/SPA-110 - Limit Spawning.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-120 - Repeat Spawning/SPA-120 - Repeat Spawning.miz b/Moose Test Missions/SPA - Spawning/SPA-120 - Repeat Spawning/SPA-120 - Repeat Spawning.miz
index fffacfa61..40dbc6dd4 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-120 - Repeat Spawning/SPA-120 - Repeat Spawning.miz and b/Moose Test Missions/SPA - Spawning/SPA-120 - Repeat Spawning/SPA-120 - Repeat Spawning.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-200 - Randomize Unit Types/SPA-200 - Randomize Unit Types.miz b/Moose Test Missions/SPA - Spawning/SPA-200 - Randomize Unit Types/SPA-200 - Randomize Unit Types.miz
index 5e5409429..5aa4e2919 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-200 - Randomize Unit Types/SPA-200 - Randomize Unit Types.miz and b/Moose Test Missions/SPA - Spawning/SPA-200 - Randomize Unit Types/SPA-200 - Randomize Unit Types.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-220 - Randomize Zones/SPA-220 - Randomize Zones.miz b/Moose Test Missions/SPA - Spawning/SPA-220 - Randomize Zones/SPA-220 - Randomize Zones.miz
index 9e0739bd6..081a9339a 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-220 - Randomize Zones/SPA-220 - Randomize Zones.miz and b/Moose Test Missions/SPA - Spawning/SPA-220 - Randomize Zones/SPA-220 - Randomize Zones.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-310 - Spawn at Static position/SPA-310 - Spawn at Static position.miz b/Moose Test Missions/SPA - Spawning/SPA-310 - Spawn at Static position/SPA-310 - Spawn at Static position.miz
index 5c37c38b6..6c446ec42 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-310 - Spawn at Static position/SPA-310 - Spawn at Static position.miz and b/Moose Test Missions/SPA - Spawning/SPA-310 - Spawn at Static position/SPA-310 - Spawn at Static position.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-320 - Spawn at Unit position/SPA-320 - Spawn at Unit position.miz b/Moose Test Missions/SPA - Spawning/SPA-320 - Spawn at Unit position/SPA-320 - Spawn at Unit position.miz
index 0c7643107..1bc0f71d1 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-320 - Spawn at Unit position/SPA-320 - Spawn at Unit position.miz and b/Moose Test Missions/SPA - Spawning/SPA-320 - Spawn at Unit position/SPA-320 - Spawn at Unit position.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-330 - Spawn at Vec2 position/SPA-330 - Spawn at Vec2 position.miz b/Moose Test Missions/SPA - Spawning/SPA-330 - Spawn at Vec2 position/SPA-330 - Spawn at Vec2 position.miz
index 27d6aacb9..85a58cd78 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-330 - Spawn at Vec2 position/SPA-330 - Spawn at Vec2 position.miz and b/Moose Test Missions/SPA - Spawning/SPA-330 - Spawn at Vec2 position/SPA-330 - Spawn at Vec2 position.miz differ
diff --git a/Moose Test Missions/SPA - Spawning/SPA-340 - Spawn at Vec3 position/SPA-340 - Spawn at Vec3 position.miz b/Moose Test Missions/SPA - Spawning/SPA-340 - Spawn at Vec3 position/SPA-340 - Spawn at Vec3 position.miz
index 0c6e833d5..b95aba2de 100644
Binary files a/Moose Test Missions/SPA - Spawning/SPA-340 - Spawn at Vec3 position/SPA-340 - Spawn at Vec3 position.miz and b/Moose Test Missions/SPA - Spawning/SPA-340 - Spawn at Vec3 position/SPA-340 - Spawn at Vec3 position.miz differ
diff --git a/Moose Test Missions/TAD - Task Dispatching/TAD-010 - Task Dispatching Demo/TAD-010 - Task Dispatching Demo.miz b/Moose Test Missions/TAD - Task Dispatching/TAD-010 - Task Dispatching Demo/TAD-010 - Task Dispatching Demo.miz
index e996174c3..0c0d7d78d 100644
Binary files a/Moose Test Missions/TAD - Task Dispatching/TAD-010 - Task Dispatching Demo/TAD-010 - Task Dispatching Demo.miz and b/Moose Test Missions/TAD - Task Dispatching/TAD-010 - Task Dispatching Demo/TAD-010 - Task Dispatching Demo.miz differ
diff --git a/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz b/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz
index 8d5e6d64f..4226a86c8 100644
Binary files a/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz and b/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz differ
diff --git a/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.lua b/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.lua
index 28bf2a9d8..e9a776183 100644
--- a/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.lua	
+++ b/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.lua	
@@ -25,11 +25,11 @@ do
     Cargo_Pickup_Zone_2 = CARGO_ZONE:New( 'Pickup Zone 2', 'DE Communication Center 2' ):RedSmoke()
 	
 	for CargoItem = 1, 2 do
-		CargoTable[CargoItem] = CARGO_GROUP:New( 'Engineers', 'Team ' .. EngineerNames[CargoItem], math.random( 70, 100 ) * 3, 'DE Infantry',  Cargo_Pickup_Zone_1 )
+		CargoTable[CargoItem] = AI_CARGO_GROUP:New( 'Engineers', 'Team ' .. EngineerNames[CargoItem], math.random( 70, 100 ) * 3, 'DE Infantry',  Cargo_Pickup_Zone_1 )
 	end
 
 	for CargoItem = 3, 5 do
-		CargoTable[CargoItem] = CARGO_GROUP:New( 'Engineers', 'Team ' .. EngineerNames[CargoItem], math.random( 70, 100 ) * 3, 'DE Infantry',  Cargo_Pickup_Zone_2 )
+		CargoTable[CargoItem] = AI_CARGO_GROUP:New( 'Engineers', 'Team ' .. EngineerNames[CargoItem], math.random( 70, 100 ) * 3, 'DE Infantry',  Cargo_Pickup_Zone_2 )
 	end
 	
 	--Cargo_Package = CARGO_INVISIBLE:New( 'Letter', 0.1, 'DE Secret Agent', 'Pickup Zone Package' )
@@ -68,7 +68,7 @@ do
 
 	Package_Pickup_Zone = CARGO_ZONE:New( 'Package Pickup Zone', 'DE Guard' ):GreenSmoke()
 
-	Cargo_Package = CARGO_PACKAGE:New( 'Letter', 'Letter to Command', 0.1, Client_Package_1 )
+	Cargo_Package = AI_CARGO_PACKAGE:New( 'Letter', 'Letter to Command', 0.1, Client_Package_1 )
 	--Cargo_Goods = CARGO_STATIC:New( 'Goods', 20, 'Goods', 'Pickup Zone Goods', 'DE Collection Point' )
 	--Cargo_SlingLoad = CARGO_SLING:New( 'Basket', 40, 'Basket', 'Pickup Zone Sling Load', 'DE Cargo Guard' )
 
diff --git a/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.miz b/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.miz
index aec9d0296..1a15d084c 100644
Binary files a/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.miz and b/Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.miz differ
diff --git a/Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal Zone.miz b/Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal Zone.miz
index 64466be6a..d5b6201d3 100644
Binary files a/Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal Zone.miz and b/Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal Zone.miz differ
diff --git a/Moose Test Missions/ZON - Zones/ZON-200 - Group Zone/ZON-200 - Group Zone.miz b/Moose Test Missions/ZON - Zones/ZON-200 - Group Zone/ZON-200 - Group Zone.miz
index 653cce9a5..ec10bb063 100644
Binary files a/Moose Test Missions/ZON - Zones/ZON-200 - Group Zone/ZON-200 - Group Zone.miz and b/Moose Test Missions/ZON - Zones/ZON-200 - Group Zone/ZON-200 - Group Zone.miz differ
diff --git a/Moose Test Missions/ZON - Zones/ZON-300 - Unit Zone/ZON-300 - Unit Zone.miz b/Moose Test Missions/ZON - Zones/ZON-300 - Unit Zone/ZON-300 - Unit Zone.miz
index 43e724427..7a4a994e6 100644
Binary files a/Moose Test Missions/ZON - Zones/ZON-300 - Unit Zone/ZON-300 - Unit Zone.miz and b/Moose Test Missions/ZON - Zones/ZON-300 - Unit Zone/ZON-300 - Unit Zone.miz differ
diff --git a/Moose Test Missions/ZON - Zones/ZON-400 - Radius Zone/ZON-400 - Radius Zone.miz b/Moose Test Missions/ZON - Zones/ZON-400 - Radius Zone/ZON-400 - Radius Zone.miz
index 62fa626d8..9319318e6 100644
Binary files a/Moose Test Missions/ZON - Zones/ZON-400 - Radius Zone/ZON-400 - Radius Zone.miz and b/Moose Test Missions/ZON - Zones/ZON-400 - Radius Zone/ZON-400 - Radius Zone.miz differ
diff --git a/Moose Test Missions/ZON - Zones/ZON-500 - Polygon Zone/ZON-500 - Polygon Zone.miz b/Moose Test Missions/ZON - Zones/ZON-500 - Polygon Zone/ZON-500 - Polygon Zone.miz
index 791d5de0e..74f3d898f 100644
Binary files a/Moose Test Missions/ZON - Zones/ZON-500 - Polygon Zone/ZON-500 - Polygon Zone.miz and b/Moose Test Missions/ZON - Zones/ZON-500 - Polygon Zone/ZON-500 - Polygon Zone.miz differ
diff --git a/Moose Training/Documentation/AI_Balancer.html b/Moose Training/Documentation/AI_Balancer.html
new file mode 100644
index 000000000..95bdbfe1c
--- /dev/null
+++ b/Moose Training/Documentation/AI_Balancer.html	
@@ -0,0 +1,641 @@
+<!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>AI_Balancer</li>
+					<li><a href="Account.html">Account</a></li>
+					<li><a href="Airbase.html">Airbase</a></li>
+					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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="CommandCenter.html">CommandCenter</a></li>
+					<li><a href="Controllable.html">Controllable</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="DCScountry.html">DCScountry</a></li>
+					<li><a href="DCStimer.html">DCStimer</a></li>
+					<li><a href="DCStrigger.html">DCStrigger</a></li>
+					<li><a href="Database.html">Database</a></li>
+					<li><a href="Detection.html">Detection</a></li>
+					<li><a href="Escort.html">Escort</a></li>
+					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
+					<li><a href="Group.html">Group</a></li>
+					<li><a href="Identifiable.html">Identifiable</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="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
+					<li><a href="Point.html">Point</a></li>
+					<li><a href="Positionable.html">Positionable</a></li>
+					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
+					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
+					<li><a href="Spawn.html">Spawn</a></li>
+					<li><a href="Static.html">Static</a></li>
+					<li><a href="StaticObject.html">StaticObject</a></li>
+					<li><a href="Task.html">Task</a></li>
+					<li><a href="Task_A2G.html">Task_A2G</a></li>
+					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
+					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
+					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>AI_Balancer</code></h1>
+   
+<p>This module contains the AI_BALANCER class.</p>
+
+   
+
+<hr/>
+
+<h1>1) <a href="AI.AI_Balancer.html##(AI_BALANCER)">AI.AI<em>Balancer#AI</em>BALANCER</a> class, extends <a href="Core.Fsm.html##(FSM_SET)">Core.Fsm#FSM_SET</a></h1>
+<p>The <a href="AI.AI_Balancer.html##(AI_BALANCER)">AI.AI<em>Balancer#AI</em>BALANCER</a> class monitors and manages as many AI GROUPS as there are
+CLIENTS in a SET<em>CLIENT collection not occupied by players.
+The AI</em>BALANCER class manages internally a collection of AI management objects, which govern the behaviour 
+of the underlying AI GROUPS.</p>
+
+<p>The parent class <a href="Core.Fsm.html##(FSM_SET)">Core.Fsm#FSM_SET</a> manages the functionality to control the Finite State Machine (FSM) 
+and calls for each event the state transition methods providing the internal <a href="Core.Fsm.html##(FSM_SET).Set">Core.Fsm#FSM_SET.Set</a> object containing the
+SET_GROUP and additional event parameters provided during the event.</p>
+
+<h2>1.1) AI_BALANCER construction method</h2>
+<p>Create a new AI_BALANCER object with the <a href="##(AI_BALANCER).New">AI_BALANCER.New</a> method:</p>
+
+<ul>
+    <li><a href="##(AI_BALANCER).New">AI_BALANCER.New</a>: Creates a new AI_BALANCER object.</li>
+</ul>
+
+<h2>1.2) </h2>
+<p>   * Add
+   * Remove</p>
+
+<h2>1.2) AI_BALANCER returns AI to Airbases</h2>
+<p>You can configure to have the AI to return to:</p>
+
+<ul>
+    <li><a href="##(AI_BALANCER).ReturnToHomeAirbase">AI_BALANCER.ReturnToHomeAirbase</a>: Returns the AI to the home <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</li>
+    <li><a href="##(AI_BALANCER).ReturnToNearestAirbases">AI_BALANCER.ReturnToNearestAirbases</a>: Returns the AI to the nearest friendly <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.
+    --</li>
+</ul>
+
+<h1><strong>API CHANGE HISTORY</strong></h1>
+
+<p>The underlying change log documents the API changes. Please read this carefully. The following notation is used:</p>
+
+<ul>
+    <li><strong>Added</strong> parts are expressed in bold type face.</li>
+    <li><em>Removed</em> parts are expressed in italic type face.</li>
+</ul>
+
+<p>Hereby the change log:</p>
+
+<p>2016-08-17: SPAWN:<strong>InitCleanUp</strong>( SpawnCleanUpInterval ) replaces SPAWN:<em>CleanUp</em>( SpawnCleanUpInterval )</p>
+
+<ul>
+    <li>Want to ensure that the methods starting with <strong>Init</strong> are the first called methods before any <em>Spawn</em> method is called!</li>
+    <li>This notation makes it now more clear which methods are initialization methods and which methods are Spawn enablement methods.</li>
+</ul>
+
+<hr/>
+
+<h1>AUTHORS and CONTRIBUTIONS</h1>
+
+<h3>Contributions:</h3>
+
+<ul>
+    <li><p><strong>Dutch_Baron (James)</strong>: Who you can search on the Eagle Dynamics Forums. <br/>
+    Working together with James has resulted in the creation of the AI_BALANCER class. <br/>
+    James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-)</p></li>
+    <li><p><strong>SNAFU</strong>:
+    Had a couple of mails with the guys to validate, if the same concept in the GCI/CAP script could be reworked within MOOSE.
+    None of the script code has been used however within the new AI_BALANCER moose class.</p></li>
+</ul>
+
+<h3>Authors:</h3>
+
+<ul>
+    <li>FlightControl: Framework Design &amp;  Programming</li>
+</ul>
+
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AI_BALANCER">AI_BALANCER</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(AI_BALANCER)">Type <code>AI_BALANCER</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).AIGroups">AI_BALANCER.AIGroups</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ClassName">AI_BALANCER.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).New">AI_BALANCER:New(SetClient, SpawnAI)</a></td>
+		<td class="summary">
+<p>Creates a new AI_BALANCER object</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).PatrolZones">AI_BALANCER.PatrolZones</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ReturnAirbaseSet">AI_BALANCER.ReturnAirbaseSet</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ReturnToHomeAirbase">AI_BALANCER:ReturnToHomeAirbase(ReturnTresholdRange)</a></td>
+		<td class="summary">
+<p>Returns the AI to the home <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ReturnToNearestAirbases">AI_BALANCER:ReturnToNearestAirbases(ReturnTresholdRange, ReturnAirbaseSet)</a></td>
+		<td class="summary">
+<p>Returns the AI to the nearest friendly <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ReturnTresholdRange">AI_BALANCER.ReturnTresholdRange</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).SetClient">AI_BALANCER.SetClient</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ToHomeAirbase">AI_BALANCER.ToHomeAirbase</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).ToNearestAirbase">AI_BALANCER.ToNearestAirbase</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).onenterDestroying">AI_BALANCER:onenterDestroying(SetGroup, AIGroup, Event, From, To)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).onenterMonitoring">AI_BALANCER:onenterMonitoring(SetGroup)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).onenterReturning">AI_BALANCER:onenterReturning(SetGroup, AIGroup, Event, From, To)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(AI_BALANCER).onenterSpawning">AI_BALANCER:onenterSpawning(SetGroup, ClientName, AIGroup, Event, From, To)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AI_BALANCER)">#AI_BALANCER</a></em>
+<a id="AI_BALANCER" >
+<strong>AI_BALANCER</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(AI_Balancer)" >Type <code>AI_Balancer</code></a></h2>
+	
+			<h2><a id="#(AI_BALANCER)" >Type <code>AI_BALANCER</code></a></h2>
+				
+<p>AI_BALANCER class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(AI_BALANCER).AIGroups" >
+<strong>AI_BALANCER.AIGroups</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(AI_BALANCER).ClassName" >
+<strong>AI_BALANCER.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).New" >
+<strong>AI_BALANCER:New(SetClient, SpawnAI)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new AI_BALANCER object</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a> SetClient </em></code>: 
+A SET_CLIENT object that will contain the CLIENT objects to be monitored if they are alive or not (joined by a player).</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Functional.Spawn.html##(SPAWN)">Functional.Spawn#SPAWN</a> SpawnAI </em></code>: 
+The default Spawn object to spawn new AI Groups when needed.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(AI_BALANCER)">#AI_BALANCER</a>:</em></p>
+
+
+			<h3>Usage:</h3>
+		<pre class="example"><code>-- Define a new AI_BALANCER Object.</code></pre>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(AI_BALANCER).PatrolZones" >
+<strong>AI_BALANCER.PatrolZones</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(AI_BALANCER).ReturnAirbaseSet" >
+<strong>AI_BALANCER.ReturnAirbaseSet</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).ReturnToHomeAirbase" >
+<strong>AI_BALANCER:ReturnToHomeAirbase(ReturnTresholdRange)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the AI to the home <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> ReturnTresholdRange </em></code>: 
+If there is an enemy <a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> within the ReturnTresholdRange given in meters, the AI will not return to the nearest <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).ReturnToNearestAirbases" >
+<strong>AI_BALANCER:ReturnToNearestAirbases(ReturnTresholdRange, ReturnAirbaseSet)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns the AI to the nearest friendly <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> ReturnTresholdRange </em></code>: 
+If there is an enemy <a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> within the ReturnTresholdRange given in meters, the AI will not return to the nearest <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Core.Set.html##(SET_AIRBASE)">Core.Set#SET_AIRBASE</a> ReturnAirbaseSet </em></code>: 
+The SET of <a href="Core.Set.html##(SET_AIRBASE)">Core.Set#SET_AIRBASE</a>s to evaluate where to return to.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(AI_BALANCER).ReturnTresholdRange" >
+<strong>AI_BALANCER.ReturnTresholdRange</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a></em>
+<a id="#(AI_BALANCER).SetClient" >
+<strong>AI_BALANCER.SetClient</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#boolean</em>
+<a id="#(AI_BALANCER).ToHomeAirbase" >
+<strong>AI_BALANCER.ToHomeAirbase</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#boolean</em>
+<a id="#(AI_BALANCER).ToNearestAirbase" >
+<strong>AI_BALANCER.ToNearestAirbase</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).onenterDestroying" >
+<strong>AI_BALANCER:onenterDestroying(SetGroup, AIGroup, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> SetGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> AIGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).onenterMonitoring" >
+<strong>AI_BALANCER:onenterMonitoring(SetGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> SetGroup </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).onenterReturning" >
+<strong>AI_BALANCER:onenterReturning(SetGroup, AIGroup, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> SetGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> AIGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(AI_BALANCER).onenterSpawning" >
+<strong>AI_BALANCER:onenterSpawning(SetGroup, ClientName, AIGroup, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> SetGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string ClientName </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> AIGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Account.html b/Moose Training/Documentation/Account.html
index fbd3a867e..c7fd789ae 100644
--- a/Moose Training/Documentation/Account.html	
+++ b/Moose Training/Documentation/Account.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li>Account</li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,16 +91,16 @@
 
 <hr/>
 
-<h1><a href="##(ACCOUNT)">#ACCOUNT</a> FSM class, extends <a href="Process.html##(PROCESS)">Process#PROCESS</a></h1>
+<h1><a href="##(ACT_ACCOUNT)">#ACT_ACCOUNT</a> FSM class, extends <a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a></h1>
 
-<h2>ACCOUNT state machine:</h2>
+<h2>ACT_ACCOUNT state machine:</h2>
 
 <p>This class is a state machine: it manages a process that is triggered by events causing state transitions to occur.
 All derived classes from this class will start with the class name, followed by a _. See the relevant derived class descriptions below.
 Each derived class follows exactly the same process, using the same events and following the same state transitions, 
 but will have <strong>different implementation behaviour</strong> upon each event or state transition.</p>
 
-<h3>ACCOUNT <strong>Events</strong>:</h3>
+<h3>ACT_ACCOUNT <strong>Events</strong>:</h3>
 
 <p>These are the events defined in this class:</p>
 
@@ -110,7 +112,7 @@ but will have <strong>different implementation behaviour</strong> upon each even
     <li><strong>NoMore</strong>:  There are no more DCS events that need to be accounted for. The process will go into the Success state.</li>
 </ul>
 
-<h3>ACCOUNT <strong>Event methods</strong>:</h3>
+<h3>ACT_ACCOUNT <strong>Event methods</strong>:</h3>
 
 <p>Event methods are available (dynamically allocated by the state machine), that accomodate for state transitions occurring in the process.
 There are two types of event methods, which you can use to influence the normal mechanisms in the state machine:</p>
@@ -120,7 +122,7 @@ There are two types of event methods, which you can use to influence the normal
     <li><strong>Delayed</strong>: The event method starts with a __ + the name of the event. The first parameter of the event method is a number value, expressing the delay in seconds when the event will be executed. </li>
 </ul>
 
-<h3>ACCOUNT <strong>States</strong>:</h3>
+<h3>ACT_ACCOUNT <strong>States</strong>:</h3>
 
 <ul>
     <li><strong>Assigned</strong>: The player is assigned to the task. This is the initialization state for the process.</li>
@@ -133,34 +135,34 @@ There are two types of event methods, which you can use to influence the normal
 
 <p>(*) End states of the process.</p>
 
-<h3>ACCOUNT state transition functions:</h3>
+<h3>ACT_ACCOUNT state transition methods:</h3>
 
 <p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
-There are 2 moments when state transition functions will be called by the state machine:</p>
+There are 2 moments when state transition methods will be called by the state machine:</p>
 
 <ul>
     <li><p><strong>Before</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnBefore + the name of the state</strong>. 
-    If the state transition function returns false, then the processing of the state transition will not be done!
+    The state transition method needs to start with the name <strong>OnBefore + the name of the state</strong>. 
+    If the state transition method returns false, then the processing of the state transition will not be done!
     If you want to change the behaviour of the AIControllable at this event, return false, 
     but then you'll need to specify your own logic using the AIControllable!</p></li>
     <li><p><strong>After</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnAfter + the name of the state</strong>. 
-    These state transition functions need to provide a return value, which is specified at the function description.</p></li>
+    The state transition method needs to start with the name <strong>OnAfter + the name of the state</strong>. 
+    These state transition methods need to provide a return value, which is specified at the function description.</p></li>
 </ul>
 
-<h1>1) <a href="##(ACCOUNT_DEADS)">#ACCOUNT_DEADS</a> FSM class, extends <a href="Account.html##(ACCOUNT)">Account#ACCOUNT</a></h1>
+<h1>1) <a href="##(ACT_ACCOUNT_DEADS)">#ACT<em>ACCOUNT</em>DEADS</a> FSM class, extends <a href="Fsm.Account.html##(ACT_ACCOUNT)">Fsm.Account#ACT_ACCOUNT</a></h1>
 
-<p>The ACCOUNT_DEADS class accounts (detects, counts and reports) successful kills of DCS units.
+<p>The ACT<em>ACCOUNT</em>DEADS class accounts (detects, counts and reports) successful kills of DCS units.
 The process is given a <a href="Set.html">Set</a> of units that will be tracked upon successful destruction.
 The process will end after each target has been successfully destroyed.
 Each successful dead will trigger an Account state transition that can be scored, modified or administered.</p>
 
 
-<h2>ACCOUNT_DEADS constructor:</h2>
+<h2>ACT<em>ACCOUNT</em>DEADS constructor:</h2>
 
 <ul>
-    <li><a href="##(ACCOUNT_DEADS).New">ACCOUNT_DEADS.New</a>(): Creates a new ACCOUNT_DEADS object.</li>
+    <li><a href="##(ACT_ACCOUNT_DEADS).New">ACT<em>ACCOUNT</em>DEADS.New</a>(): Creates a new ACT<em>ACCOUNT</em>DEADS object.</li>
 </ul>
 
 <hr/>
@@ -169,136 +171,154 @@ Each successful dead will trigger an Account state transition that can be scored
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#ACCOUNT">ACCOUNT</a></td>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ACCOUNT">ACT_ACCOUNT</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#ACCOUNT_DEADS">ACCOUNT_DEADS</a></td>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ACCOUNT_DEADS">ACT_ACCOUNT_DEADS</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 	</table>
-			<h2><a id="#(ACCOUNT)">Type <code>ACCOUNT</code></a></h2>
+			<h2><a id="#(ACT_ACCOUNT)">Type <code>ACT_ACCOUNT</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).ClassName">ACCOUNT.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).ClassName">ACT_ACCOUNT.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).DisplayCategory">ACCOUNT.DisplayCategory</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).DisplayCount">ACT_ACCOUNT.DisplayCount</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).DisplayCount">ACCOUNT.DisplayCount</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).DisplayInterval">ACCOUNT.DisplayInterval</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).DisplayMessage">ACCOUNT.DisplayMessage</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).DisplayTime">ACCOUNT.DisplayTime</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).New">ACCOUNT:New(ProcessUnit)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).New">ACT_ACCOUNT:New()</a></td>
 		<td class="summary">
 <p>Creates a new DESTROY process.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).TargetSetUnit">ACCOUNT.TargetSetUnit</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).TargetSetUnit">ACT_ACCOUNT.TargetSetUnit</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).onafterEvent">ACCOUNT:onafterEvent(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).onafterEvent">ACT_ACCOUNT:onafterEvent(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).onafterStart">ACCOUNT:onafterStart(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).onafterStart">ACT_ACCOUNT:onafterStart(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT).onenterWaiting">ACCOUNT:onenterWaiting(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT).onenterWaiting">ACT_ACCOUNT:onenterWaiting(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(ACCOUNT_DEADS)">Type <code>ACCOUNT_DEADS</code></a></h2>
+			<h2><a id="#(ACT_ACCOUNT_DEADS)">Type <code>ACT_ACCOUNT_DEADS</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).ClassName">ACCOUNT_DEADS.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).ClassName">ACT_ACCOUNT_DEADS.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).EventDead">ACCOUNT_DEADS:EventDead(Event)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).DisplayCategory">ACT_ACCOUNT_DEADS.DisplayCategory</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).New">ACCOUNT_DEADS:New(ProcessUnit, TargetSetUnit, TaskName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).DisplayCount">ACT_ACCOUNT_DEADS.DisplayCount</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).DisplayInterval">ACT_ACCOUNT_DEADS.DisplayInterval</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).DisplayMessage">ACT_ACCOUNT_DEADS.DisplayMessage</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).DisplayTime">ACT_ACCOUNT_DEADS.DisplayTime</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).Init">ACT_ACCOUNT_DEADS:Init(FsmAccount)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).New">ACT_ACCOUNT_DEADS:New(TargetSetUnit, TaskName)</a></td>
 		<td class="summary">
 <p>Creates a new DESTROY process.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).TargetSetUnit">ACCOUNT_DEADS.TargetSetUnit</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).TargetSetUnit">ACT_ACCOUNT_DEADS.TargetSetUnit</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).TaskName">ACCOUNT_DEADS.TaskName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).TaskName">ACT_ACCOUNT_DEADS.TaskName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).onafterEvent">ACCOUNT_DEADS:onafterEvent(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS)._Destructor">ACT_ACCOUNT_DEADS:_Destructor()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).onafterEvent">ACT_ACCOUNT_DEADS:onafterEvent(ProcessUnit, Event, From, To, EventData)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).onenterAccount">ACCOUNT_DEADS:onenterAccount(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).onenterAccount">ACT_ACCOUNT_DEADS:onenterAccount(ProcessUnit, Event, From, To, EventData)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ACCOUNT_DEADS).onenterReport">ACCOUNT_DEADS:onenterReport(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).onenterReport">ACT_ACCOUNT_DEADS:onenterReport(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ACCOUNT_DEADS).onfuncEventDead">ACT_ACCOUNT_DEADS:onfuncEventDead(EventData)</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 	</table>
@@ -307,9 +327,9 @@ Each successful dead will trigger an Account state transition that can be scored
 		<dl class="function">
 <dt>
 
-		<em><a href="##(ACCOUNT)">#ACCOUNT</a></em>
-<a id="ACCOUNT" >
-<strong>ACCOUNT</strong>
+		<em><a href="##(ACT_ACCOUNT)">#ACT_ACCOUNT</a></em>
+<a id="ACT_ACCOUNT" >
+<strong>ACT_ACCOUNT</strong>
 </a>
 </dt>
 <dd>
@@ -321,9 +341,9 @@ Each successful dead will trigger an Account state transition that can be scored
 		<dl class="function">
 <dt>
 
-		<em><a href="##(ACCOUNT_DEADS)">#ACCOUNT_DEADS</a></em>
-<a id="ACCOUNT_DEADS" >
-<strong>ACCOUNT_DEADS</strong>
+		<em><a href="##(ACT_ACCOUNT_DEADS)">#ACT_ACCOUNT_DEADS</a></em>
+<a id="ACT_ACCOUNT_DEADS" >
+<strong>ACT_ACCOUNT_DEADS</strong>
 </a>
 </dt>
 <dd>
@@ -334,17 +354,191 @@ Each successful dead will trigger an Account state transition that can be scored
 </dl>
 	<h2><a id="#(Account)" >Type <code>Account</code></a></h2>
 	
-			<h2><a id="#(ACCOUNT)" >Type <code>ACCOUNT</code></a></h2>
+			<h2><a id="#(ACT_ACCOUNT)" >Type <code>ACT_ACCOUNT</code></a></h2>
 				
-<p>ACCOUNT class</p>
+<p>ACT_ACCOUNT class</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(ACCOUNT).ClassName" >
-<strong>ACCOUNT.ClassName</strong>
+<a id="#(ACT_ACCOUNT).ClassName" >
+<strong>ACT_ACCOUNT.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#number</em>
+<a id="#(ACT_ACCOUNT).DisplayCount" >
+<strong>ACT_ACCOUNT.DisplayCount</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT).New" >
+<strong>ACT_ACCOUNT:New()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new DESTROY process.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(ACT_ACCOUNT)">#ACT_ACCOUNT</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
+<a id="#(ACT_ACCOUNT).TargetSetUnit" >
+<strong>ACT_ACCOUNT.TargetSetUnit</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT).onafterEvent" >
+<strong>ACT_ACCOUNT:onafterEvent(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT).onafterStart" >
+<strong>ACT_ACCOUNT:onafterStart(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT).onenterWaiting" >
+<strong>ACT_ACCOUNT:onenterWaiting(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(ACT_ACCOUNT_DEADS)" >Type <code>ACT_ACCOUNT_DEADS</code></a></h2>
+				
+<p>ACT<em>ACCOUNT</em>DEADS class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(ACT_ACCOUNT_DEADS).ClassName" >
+<strong>ACT_ACCOUNT_DEADS.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -357,8 +551,8 @@ Each successful dead will trigger an Account state transition that can be scored
 <dt>
 
 		<em>#string</em>
-<a id="#(ACCOUNT).DisplayCategory" >
-<strong>ACCOUNT.DisplayCategory</strong>
+<a id="#(ACT_ACCOUNT_DEADS).DisplayCategory" >
+<strong>ACT_ACCOUNT_DEADS.DisplayCategory</strong>
 </a>
 </dt>
 <dd>
@@ -374,8 +568,8 @@ Each successful dead will trigger an Account state transition that can be scored
 <dt>
 
 		<em>#number</em>
-<a id="#(ACCOUNT).DisplayCount" >
-<strong>ACCOUNT.DisplayCount</strong>
+<a id="#(ACT_ACCOUNT_DEADS).DisplayCount" >
+<strong>ACT_ACCOUNT_DEADS.DisplayCount</strong>
 </a>
 </dt>
 <dd>
@@ -388,8 +582,8 @@ Each successful dead will trigger an Account state transition that can be scored
 <dt>
 
 		<em>#number</em>
-<a id="#(ACCOUNT).DisplayInterval" >
-<strong>ACCOUNT.DisplayInterval</strong>
+<a id="#(ACT_ACCOUNT_DEADS).DisplayInterval" >
+<strong>ACT_ACCOUNT_DEADS.DisplayInterval</strong>
 </a>
 </dt>
 <dd>
@@ -402,8 +596,8 @@ Each successful dead will trigger an Account state transition that can be scored
 <dt>
 
 		<em>#boolean</em>
-<a id="#(ACCOUNT).DisplayMessage" >
-<strong>ACCOUNT.DisplayMessage</strong>
+<a id="#(ACT_ACCOUNT_DEADS).DisplayMessage" >
+<strong>ACT_ACCOUNT_DEADS.DisplayMessage</strong>
 </a>
 </dt>
 <dd>
@@ -416,8 +610,8 @@ Each successful dead will trigger an Account state transition that can be scored
 <dt>
 
 		<em>#number</em>
-<a id="#(ACCOUNT).DisplayTime" >
-<strong>ACCOUNT.DisplayTime</strong>
+<a id="#(ACT_ACCOUNT_DEADS).DisplayTime" >
+<strong>ACT_ACCOUNT_DEADS.DisplayTime</strong>
 </a>
 </dt>
 <dd>
@@ -432,176 +626,8 @@ Each successful dead will trigger an Account state transition that can be scored
 		<dl class="function">
 <dt>
 
-<a id="#(ACCOUNT).New" >
-<strong>ACCOUNT:New(ProcessUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Creates a new DESTROY process.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ProcessUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(ACCOUNT)">#ACCOUNT</a>:</em></p>
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
-<a id="#(ACCOUNT).TargetSetUnit" >
-<strong>ACCOUNT.TargetSetUnit</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ACCOUNT).onafterEvent" >
-<strong>ACCOUNT:onafterEvent(ProcessUnit, Event, From, To)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ACCOUNT).onafterStart" >
-<strong>ACCOUNT:onafterStart(ProcessUnit, Event, From, To)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ACCOUNT).onenterWaiting" >
-<strong>ACCOUNT:onenterWaiting(ProcessUnit, Event, From, To)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-
-			<h2><a id="#(ACCOUNT_DEADS)" >Type <code>ACCOUNT_DEADS</code></a></h2>
-				
-<p>ACCOUNT_DEADS class</p>
-
-	<h3>Field(s)</h3>
-		<dl class="function">
-<dt>
-
-		<em>#string</em>
-<a id="#(ACCOUNT_DEADS).ClassName" >
-<strong>ACCOUNT_DEADS.ClassName</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ACCOUNT_DEADS).EventDead" >
-<strong>ACCOUNT_DEADS:EventDead(Event)</strong>
+<a id="#(ACT_ACCOUNT_DEADS).Init" >
+<strong>ACT_ACCOUNT_DEADS:Init(FsmAccount)</strong>
 </a>
 </dt>
 <dd>
@@ -612,7 +638,7 @@ Each successful dead will trigger an Account state transition that can be scored
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em> FsmAccount </em></code>: </p>
 
 				</li>
 		</ul>
@@ -621,8 +647,8 @@ Each successful dead will trigger an Account state transition that can be scored
 		<dl class="function">
 <dt>
 
-<a id="#(ACCOUNT_DEADS).New" >
-<strong>ACCOUNT_DEADS:New(ProcessUnit, TargetSetUnit, TaskName)</strong>
+<a id="#(ACT_ACCOUNT_DEADS).New" >
+<strong>ACT_ACCOUNT_DEADS:New(TargetSetUnit, TaskName)</strong>
 </a>
 </dt>
 <dd>
@@ -633,11 +659,6 @@ Each successful dead will trigger an Account state transition that can be scored
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> TargetSetUnit </em></code>: </p>
 
 				</li>
@@ -647,19 +668,14 @@ Each successful dead will trigger an Account state transition that can be scored
 
 				</li>
 		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(ACCOUNT_DEADS)">#ACCOUNT_DEADS</a>:</em>
-self</p>
-
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
-<a id="#(ACCOUNT_DEADS).TargetSetUnit" >
-<strong>ACCOUNT_DEADS.TargetSetUnit</strong>
+<a id="#(ACT_ACCOUNT_DEADS).TargetSetUnit" >
+<strong>ACT_ACCOUNT_DEADS.TargetSetUnit</strong>
 </a>
 </dt>
 <dd>
@@ -672,8 +688,8 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(ACCOUNT_DEADS).TaskName" >
-<strong>ACCOUNT_DEADS.TaskName</strong>
+<a id="#(ACT_ACCOUNT_DEADS).TaskName" >
+<strong>ACT_ACCOUNT_DEADS.TaskName</strong>
 </a>
 </dt>
 <dd>
@@ -685,8 +701,21 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(ACCOUNT_DEADS).onafterEvent" >
-<strong>ACCOUNT_DEADS:onafterEvent(ProcessUnit, Event, From, To)</strong>
+<a id="#(ACT_ACCOUNT_DEADS)._Destructor" >
+<strong>ACT_ACCOUNT_DEADS:_Destructor()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT_DEADS).onafterEvent" >
+<strong>ACT_ACCOUNT_DEADS:onafterEvent(ProcessUnit, Event, From, To, EventData)</strong>
 </a>
 </dt>
 <dd>
@@ -697,7 +726,89 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> EventData </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT_DEADS).onenterAccount" >
+<strong>ACT_ACCOUNT_DEADS:onenterAccount(ProcessUnit, Event, From, To, EventData)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> EventData </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ACCOUNT_DEADS).onenterReport" >
+<strong>ACT_ACCOUNT_DEADS:onenterReport(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -721,78 +832,25 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(ACCOUNT_DEADS).onenterAccount" >
-<strong>ACCOUNT_DEADS:onenterAccount(ProcessUnit, Event, From, To)</strong>
+<a id="#(ACT_ACCOUNT_DEADS).onfuncEventDead" >
+<strong>ACT_ACCOUNT_DEADS:onfuncEventDead(EventData)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>StateMachine callback function</p>
 
-		<h3>Parameters</h3>
+
+		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ACCOUNT_DEADS).onenterReport" >
-<strong>ACCOUNT_DEADS:onenterReport(ProcessUnit, Event, From, To)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
+<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> EventData </em></code>: </p>
 
 				</li>
 		</ul>
 </dd>
 </dl>
 
-			<h2><a id="#(ASSIGN_MENU_ACCEPT)" >Type <code>ASSIGN_MENU_ACCEPT</code></a></h2>
-			
 </div>
 
 </div>
diff --git a/Moose Training/Documentation/Airbase.html b/Moose Training/Documentation/Airbase.html
index caebbfa9d..466ac9524 100644
--- a/Moose Training/Documentation/Airbase.html	
+++ b/Moose Training/Documentation/Airbase.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li>Airbase</li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,7 +91,7 @@
 
 <hr/>
 
-<h1>1) <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> class, extends <a href="Positionable.html##(POSITIONABLE)">Positionable#POSITIONABLE</a></h1>
+<h1>1) <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> class, extends <a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a></h1>
 <p>The <a href="AIRBASE.html">AIRBASE</a> class is a wrapper class to handle the DCS Airbase objects:</p>
 
 <ul>
@@ -121,7 +123,7 @@ If the DCS Airbase object does not exist or is nil, the AIRBASE methods will ret
 <h2>1.2) DCS AIRBASE APIs</h2>
 <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>()
+the first letter of the method is also capitalized. So, by example, the DCS Airbase method <a href="Dcs.DCSWrapper.Airbase.html##(Airbase).getName">Dcs.DCSWrapper.Airbase#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>
@@ -242,14 +244,14 @@ is implemented in the AIRBASE class as <a href="##(AIRBASE).GetName">AIRBASE.Get
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSAirbase.html##(Airbase)">DCSAirbase#Airbase</a> DCSAirbase </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Airbase.html##(Airbase)">Dcs.DCSWrapper.Airbase#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>
+<p><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>:</em>
 self</p>
 
 </dd>
@@ -276,7 +278,7 @@ The Airbase Name.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em>
+<p><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>:</em>
 self</p>
 
 </dd>
@@ -316,7 +318,7 @@ The name of the airbase.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em></p>
+<p><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>:</em></p>
 
 
 </dd>
diff --git a/Moose Training/Documentation/AirbasePolice.html b/Moose Training/Documentation/AirbasePolice.html
index c8f0892d7..5a8018037 100644
--- a/Moose Training/Documentation/AirbasePolice.html	
+++ b/Moose Training/Documentation/AirbasePolice.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li>AirbasePolice</li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,8 +91,8 @@
 
 <hr/>
 
-<h1>1) <a href="AirbasePolice.html##(AIRBASEPOLICE_BASE)">AirbasePolice#AIRBASEPOLICE_BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<p>The <a href="AirbasePolice.html##(AIRBASEPOLICE_BASE)">AirbasePolice#AIRBASEPOLICE_BASE</a> class provides the main methods to monitor CLIENT behaviour at airbases.
+<h1>1) <a href="Functional.AirbasePolice.html##(AIRBASEPOLICE_BASE)">Functional.AirbasePolice#AIRBASEPOLICE_BASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+<p>The <a href="Functional.AirbasePolice.html##(AIRBASEPOLICE_BASE)">Functional.AirbasePolice#AIRBASEPOLICE_BASE</a> class provides the main methods to monitor CLIENT behaviour at airbases.
 CLIENTS should not be allowed to:</p>
 
 <ul>
@@ -100,7 +102,7 @@ CLIENTS should not be allowed to:</p>
     <li>Obey ground control orders.</li>
 </ul>
 
-<h1>2) <a href="AirbasePolice.html##(AIRBASEPOLICE_CAUCASUS)">AirbasePolice#AIRBASEPOLICE_CAUCASUS</a> class, extends <a href="AirbasePolice.html##(AIRBASEPOLICE_BASE)">AirbasePolice#AIRBASEPOLICE_BASE</a></h1>
+<h1>2) <a href="Functional.AirbasePolice.html##(AIRBASEPOLICE_CAUCASUS)">Functional.AirbasePolice#AIRBASEPOLICE_CAUCASUS</a> class, extends <a href="Functional.AirbasePolice.html##(AIRBASEPOLICE_BASE)">Functional.AirbasePolice#AIRBASEPOLICE_BASE</a></h1>
 <p>All the airbases on the caucasus map can be monitored using this class.
 If you want to monitor specific airbases, you need to use the <a href="##(AIRBASEPOLICE_BASE).Monitor">AIRBASEPOLICE_BASE.Monitor</a>() method, which takes a table or airbase names.
 The following names can be given:
@@ -126,7 +128,7 @@ The following names can be given:
   * TbilisiLochini
   * Vaziani</p>
 
-<h1>3) <a href="AirbasePolice.html##(AIRBASEPOLICE_NEVADA)">AirbasePolice#AIRBASEPOLICE_NEVADA</a> class, extends <a href="AirbasePolice.html##(AIRBASEPOLICE_BASE)">AirbasePolice#AIRBASEPOLICE_BASE</a></h1>
+<h1>3) <a href="Functional.AirbasePolice.html##(AIRBASEPOLICE_NEVADA)">Functional.AirbasePolice#AIRBASEPOLICE_NEVADA</a> class, extends <a href="Functional.AirbasePolice.html##(AIRBASEPOLICE_BASE)">Functional.AirbasePolice#AIRBASEPOLICE_BASE</a></h1>
 <p>All the airbases on the NEVADA map can be monitored using this class.
 If you want to monitor specific airbases, you need to use the <a href="##(AIRBASEPOLICE_BASE).Monitor">AIRBASEPOLICE_BASE.Monitor</a>() method, which takes a table or airbase names.
 The following names can be given:
@@ -272,7 +274,7 @@ The following names can be given:
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a></em>
+		<em><a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a></em>
 <a id="#(AIRBASEPOLICE_BASE).SetClient" >
 <strong>AIRBASEPOLICE_BASE.SetClient</strong>
 </a>
@@ -291,7 +293,7 @@ The following names can be given:
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a></em>
+		<em><a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a></em>
 <a id="#(AIRBASEPOLICE_CAUCASUS).SetClient" >
 <strong>AIRBASEPOLICE_CAUCASUS.SetClient</strong>
 </a>
diff --git a/Moose Training/Documentation/Assign.html b/Moose Training/Documentation/Assign.html
index 93eb68b42..44c1d0ace 100644
--- a/Moose Training/Documentation/Assign.html	
+++ b/Moose Training/Documentation/Assign.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,246 +91,300 @@
 
 <hr/>
 
-<h1>1) <a href="##(ASSIGN_ACCEPT)">#ASSIGN_ACCEPT</a> class, extends <a href="Process.html##(PROCESS)">Process#PROCESS</a></h1>
-<p>The <a href="##(ASSIGN_ACCEPT)">#ASSIGN_ACCEPT</a> class accepts by default a task for a player. No player intervention is allowed to reject the task.</p>
+<h1><a href="##(ACT_ASSIGN)">#ACT_ASSIGN</a> FSM template class, extends <a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a></h1>
 
-<h2>1.1) ASSIGN_ACCEPT constructor:</h2>
+<h2>ACT_ASSIGN state machine:</h2>
+
+<p>This class is a state machine: it manages a process that is triggered by events causing state transitions to occur.
+All derived classes from this class will start with the class name, followed by a _. See the relevant derived class descriptions below.
+Each derived class follows exactly the same process, using the same events and following the same state transitions, 
+but will have <strong>different implementation behaviour</strong> upon each event or state transition.</p>
+
+<h3>ACT_ASSIGN <strong>Events</strong>:</h3>
+
+<p>These are the events defined in this class:</p>
 
 <ul>
-    <li><a href="##(ASSIGN_ACCEPT).New">ASSIGN_ACCEPT.New</a>(): Creates a new ASSIGN_ACCEPT object.</li>
+    <li><strong>Start</strong>:  Start the tasking acceptance process.</li>
+    <li><strong>Assign</strong>:  Assign the task.</li>
+    <li><strong>Reject</strong>:  Reject the task..</li>
 </ul>
 
-<h2>1.2) ASSIGN_ACCEPT state machine:</h2>
-<p>The ASSIGN_ACCEPT is a state machine: it manages the different events and states of the Controllable it is controlling.</p>
+<h3>ACT_ASSIGN <strong>Event methods</strong>:</h3>
 
-<h3>1.2.1) ASSIGN_ACCEPT Events:</h3>
+<p>Event methods are available (dynamically allocated by the state machine), that accomodate for state transitions occurring in the process.
+There are two types of event methods, which you can use to influence the normal mechanisms in the state machine:</p>
 
 <ul>
-    <li><a href="##(ASSIGN_ACCEPT).Start">ASSIGN_ACCEPT.Start</a>( ProcessUnit ):  Start the tasking acceptance process.</li>
-    <li><a href="##(ASSIGN_ACCEPT).Assign">ASSIGN_ACCEPT.Assign</a>( ProcessUnit ):  Assign the task.</li>
+    <li><strong>Immediate</strong>: The event method has exactly the name of the event.</li>
+    <li><strong>Delayed</strong>: The event method starts with a __ + the name of the event. The first parameter of the event method is a number value, expressing the delay in seconds when the event will be executed. </li>
 </ul>
 
-<h3>1.2.2) ASSIGN_ACCEPT States:</h3>
+<h3>ACT_ASSIGN <strong>States</strong>:</h3>
 
 <ul>
     <li><strong>UnAssigned</strong>: The player has not accepted the task.</li>
-    <li><strong>Assigned</strong>: The player has accepted the task.</li>
+    <li><strong>Assigned (*)</strong>: The player has accepted the task.</li>
+    <li><strong>Rejected (*)</strong>: The player has not accepted the task.</li>
+    <li><strong>Waiting</strong>: The process is awaiting player feedback.</li>
+    <li><strong>Failed (*)</strong>: The process has failed.</li>
 </ul>
 
-<h3>1.2.3) ASSIGN_ACCEPT state transition functions:</h3>
+<p>(*) End states of the process.</p>
+
+<h3>ACT_ASSIGN state transition methods:</h3>
 
 <p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
-There are 2 moments when state transition functions will be called by the state machine:</p>
+There are 2 moments when state transition methods will be called by the state machine:</p>
 
 <ul>
     <li><p><strong>Before</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnBefore + the name of the state</strong>. 
-    If the state transition function returns false, then the processing of the state transition will not be done!
+    The state transition method needs to start with the name <strong>OnBefore + the name of the state</strong>. 
+    If the state transition method returns false, then the processing of the state transition will not be done!
     If you want to change the behaviour of the AIControllable at this event, return false, 
     but then you'll need to specify your own logic using the AIControllable!</p></li>
     <li><p><strong>After</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnAfter + the name of the state</strong>. 
-    These state transition functions need to provide a return value, which is specified at the function description.</p></li>
+    The state transition method needs to start with the name <strong>OnAfter + the name of the state</strong>. 
+    These state transition methods need to provide a return value, which is specified at the function description.</p></li>
 </ul>
 
-<h2>1.3) Manage the ASSIGN_ACCEPT parameters:</h2>
-<p>The following methods are available to modify the parameters of a ASSIGN_ACCEPT object:</p>
-
 <hr/>
 
-<h1>2) <a href="##(ASSIGN_MENU_ACCEPT)">#ASSIGN<em>MENU</em>ACCEPT</a> class, extends <a href="Process.html##(PROCESS)">Process#PROCESS</a></h1>
-<p>The <a href="##(ASSIGN_MENU_ACCEPT)">#ASSIGN<em>MENU</em>ACCEPT</a> class accepts a task when the player accepts the task through an added menu option.
+<h1>1) <a href="##(ACT_ASSIGN_ACCEPT)">#ACT<em>ASSIGN</em>ACCEPT</a> class, extends <a href="Fsm.Assign.html##(ACT_ASSIGN)">Fsm.Assign#ACT_ASSIGN</a></h1>
+
+<p>The ACT<em>ASSIGN</em>ACCEPT class accepts by default a task for a player. No player intervention is allowed to reject the task.</p>
+
+<h2>1.1) ACT<em>ASSIGN</em>ACCEPT constructor:</h2>
+
+<ul>
+    <li><a href="##(ACT_ASSIGN_ACCEPT).New">ACT<em>ASSIGN</em>ACCEPT.New</a>(): Creates a new ACT<em>ASSIGN</em>ACCEPT object.</li>
+</ul>
+
+<hr/>
+
+<h1>2) <a href="##(ACT_ASSIGN_MENU_ACCEPT)">#ACT<em>ASSIGN</em>MENU_ACCEPT</a> class, extends <a href="Fsm.Assign.html##(ACT_ASSIGN)">Fsm.Assign#ACT_ASSIGN</a></h1>
+
+<p>The ACT<em>ASSIGN</em>MENU_ACCEPT class accepts a task when the player accepts the task through an added menu option.
 This assignment type is useful to conditionally allow the player to choose whether or not he would accept the task.
 The assignment type also allows to reject the task.</p>
 
-<h2>1.1) ASSIGN<em>MENU</em>ACCEPT constructor:</h2>
+<h2>2.1) ACT<em>ASSIGN</em>MENU_ACCEPT constructor:</h2>
+<hr/>
 
 <ul>
-    <li><a href="##(ASSIGN_MENU_ACCEPT).New">ASSIGN<em>MENU</em>ACCEPT.New</a>(): Creates a new ASSIGN<em>MENU</em>ACCEPT object.</li>
+    <li><a href="##(ACT_ASSIGN_MENU_ACCEPT).New">ACT<em>ASSIGN</em>MENU_ACCEPT.New</a>(): Creates a new ACT<em>ASSIGN</em>MENU_ACCEPT object.</li>
 </ul>
 
-<h2>1.2) ASSIGN<em>MENU</em>ACCEPT state machine:</h2>
-<p>The ASSIGN<em>MENU</em>ACCEPT is a state machine: it manages the different events and states of the Controllable it is controlling.</p>
-
-<h3>1.2.1) ASSIGN<em>MENU</em>ACCEPT Events:</h3>
-
-<ul>
-    <li><a href="##(ASSIGN_MENU_ACCEPT).Start">ASSIGN<em>MENU</em>ACCEPT.Start</a>( ProcessUnit ):  Start the tasking acceptance process.</li>
-    <li><a href="##(ASSIGN_MENU_ACCEPT).Assign">ASSIGN<em>MENU</em>ACCEPT.Assign</a>( ProcessUnit ):  Assign the task.</li>
-    <li><a href="##(ASSIGN_MENU_ACCEPT).Reject">ASSIGN<em>MENU</em>ACCEPT.Reject</a>( ProcessUnit ):  Reject the task..</li>
-</ul>
-
-<h3>1.2.2) ASSIGN<em>MENU</em>ACCEPT States:</h3>
-
-<ul>
-    <li><strong>UnAssigned</strong>: The player has not accepted the task.</li>
-    <li><strong>Assigned</strong>: The player has accepted the task.</li>
-    <li><strong>Rejected</strong>: The player has rejected the task.</li>
-</ul>
-
-<h3>1.2.3) ASSIGN<em>MENU</em>ACCEPT state transition functions:</h3>
-
-<p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
-There are 2 moments when state transition functions will be called by the state machine:</p>
-
-<ul>
-    <li><p><strong>Before</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnBefore + the name of the state</strong>. 
-    If the state transition function returns false, then the processing of the state transition will not be done!
-    If you want to change the behaviour of the AIControllable at this event, return false, 
-    but then you'll need to specify your own logic using the AIControllable!</p></li>
-    <li><p><strong>After</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnAfter + the name of the state</strong>. 
-    These state transition functions need to provide a return value, which is specified at the function description.</p></li>
-</ul>
-
-<h2>1.3) Manage the ASSIGN<em>MENU</em>ACCEPT parameters:</h2>
-<p>The following methods are available to modify the parameters of a ASSIGN<em>MENU</em>ACCEPT object:</p>
+<hr/>
 
 
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#ASSIGN_ACCEPT">ASSIGN_ACCEPT</a></td>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ASSIGN">ACT_ASSIGN</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#ASSIGN_MENU_ACCEPT">ASSIGN_MENU_ACCEPT</a></td>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ASSIGN_ACCEPT">ACT_ASSIGN_ACCEPT</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ASSIGN_MENU_ACCEPT">ACT_ASSIGN_MENU_ACCEPT</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 	</table>
-			<h2><a id="#(ASSIGN_ACCEPT)">Type <code>ASSIGN_ACCEPT</code></a></h2>
+			<h2><a id="#(ACT_ASSIGN)">Type <code>ACT_ASSIGN</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_ACCEPT).ClassName">ASSIGN_ACCEPT.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN).ClassName">ACT_ASSIGN.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_ACCEPT).New">ASSIGN_ACCEPT:New(ProcessUnit, TaskBriefing)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN).New">ACT_ASSIGN:New()</a></td>
 		<td class="summary">
 <p>Creates a new task assignment state machine.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_ACCEPT).ProcessUnit">ASSIGN_ACCEPT.ProcessUnit</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN).ProcessUnit">ACT_ASSIGN.ProcessUnit</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_ACCEPT).TargetZone">ASSIGN_ACCEPT.TargetZone</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN).TargetZone">ACT_ASSIGN.TargetZone</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_ACCEPT).Task">ASSIGN_ACCEPT.Task</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_ACCEPT).TaskBriefing">ASSIGN_ACCEPT.TaskBriefing</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN).Task">ACT_ASSIGN.Task</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(ASSIGN_MENU_ACCEPT)">Type <code>ASSIGN_MENU_ACCEPT</code></a></h2>
+			<h2><a id="#(ACT_ASSIGN_ACCEPT)">Type <code>ACT_ASSIGN_ACCEPT</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).ClassName">ASSIGN_MENU_ACCEPT.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).ClassName">ACT_ASSIGN_ACCEPT.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).Menu">ASSIGN_MENU_ACCEPT.Menu</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).Init">ACT_ASSIGN_ACCEPT:Init(FsmAssign)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).MenuAcceptTask">ASSIGN_MENU_ACCEPT.MenuAcceptTask</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).MenuAssign">ASSIGN_MENU_ACCEPT:MenuAssign()</a></td>
-		<td class="summary">
-<p>Menu function.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).MenuReject">ASSIGN_MENU_ACCEPT:MenuReject()</a></td>
-		<td class="summary">
-<p>Menu function.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).MenuRejectTask">ASSIGN_MENU_ACCEPT.MenuRejectTask</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).New">ASSIGN_MENU_ACCEPT:New(ProcessUnit, TaskBriefing, TaskName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).New">ACT_ASSIGN_ACCEPT:New(TaskBriefing)</a></td>
 		<td class="summary">
 <p>Creates a new task assignment state machine.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).ProcessUnit">ASSIGN_MENU_ACCEPT.ProcessUnit</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).ProcessUnit">ACT_ASSIGN_ACCEPT.ProcessUnit</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).TargetZone">ASSIGN_MENU_ACCEPT.TargetZone</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).TargetZone">ACT_ASSIGN_ACCEPT.TargetZone</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).Task">ASSIGN_MENU_ACCEPT.Task</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).Task">ACT_ASSIGN_ACCEPT.Task</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).TaskBriefing">ASSIGN_MENU_ACCEPT.TaskBriefing</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).TaskBriefing">ACT_ASSIGN_ACCEPT.TaskBriefing</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).TaskName">ASSIGN_MENU_ACCEPT.TaskName</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).onafterAssign">ASSIGN_MENU_ACCEPT:onafterAssign(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).onafterStart">ACT_ASSIGN_ACCEPT:onafterStart(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).onafterReject">ASSIGN_MENU_ACCEPT:onafterReject(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_ACCEPT).onenterAssigned">ACT_ASSIGN_ACCEPT:onenterAssigned(ProcessUnit, Event, From, To)</a></td>
+		<td class="summary">
+<p>StateMachine callback function</p>
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(ACT_ASSIGN_MENU_ACCEPT)">Type <code>ACT_ASSIGN_MENU_ACCEPT</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).ClassName">ACT_ASSIGN_MENU_ACCEPT.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).Init">ACT_ASSIGN_MENU_ACCEPT:Init(FsmAssign)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).Menu">ACT_ASSIGN_MENU_ACCEPT.Menu</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).MenuAcceptTask">ACT_ASSIGN_MENU_ACCEPT.MenuAcceptTask</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).MenuAssign">ACT_ASSIGN_MENU_ACCEPT:MenuAssign()</a></td>
+		<td class="summary">
+<p>Menu function.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).MenuReject">ACT_ASSIGN_MENU_ACCEPT:MenuReject()</a></td>
+		<td class="summary">
+<p>Menu function.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).MenuRejectTask">ACT_ASSIGN_MENU_ACCEPT.MenuRejectTask</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).New">ACT_ASSIGN_MENU_ACCEPT:New(TaskName, TaskBriefing)</a></td>
+		<td class="summary">
+<p>Init.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).ProcessUnit">ACT_ASSIGN_MENU_ACCEPT.ProcessUnit</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).TargetZone">ACT_ASSIGN_MENU_ACCEPT.TargetZone</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).Task">ACT_ASSIGN_MENU_ACCEPT.Task</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).TaskBriefing">ACT_ASSIGN_MENU_ACCEPT.TaskBriefing</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).TaskName">ACT_ASSIGN_MENU_ACCEPT.TaskName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).onafterAssign">ACT_ASSIGN_MENU_ACCEPT:onafterAssign(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ASSIGN_MENU_ACCEPT).onafterStart">ASSIGN_MENU_ACCEPT:onafterStart(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).onafterReject">ACT_ASSIGN_MENU_ACCEPT:onafterReject(ProcessUnit, Event, From, To)</a></td>
+		<td class="summary">
+<p>StateMachine callback function</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIGN_MENU_ACCEPT).onafterStart">ACT_ASSIGN_MENU_ACCEPT:onafterStart(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
 </td>
@@ -339,9 +395,9 @@ There are 2 moments when state transition functions will be called by the state
 		<dl class="function">
 <dt>
 
-		<em><a href="##(ASSIGN_ACCEPT)">#ASSIGN_ACCEPT</a></em>
-<a id="ASSIGN_ACCEPT" >
-<strong>ASSIGN_ACCEPT</strong>
+		<em><a href="##(ACT_ASSIGN)">#ACT_ASSIGN</a></em>
+<a id="ACT_ASSIGN" >
+<strong>ACT_ASSIGN</strong>
 </a>
 </dt>
 <dd>
@@ -353,9 +409,23 @@ There are 2 moments when state transition functions will be called by the state
 		<dl class="function">
 <dt>
 
-		<em><a href="##(ASSIGN_MENU_ACCEPT)">#ASSIGN_MENU_ACCEPT</a></em>
-<a id="ASSIGN_MENU_ACCEPT" >
-<strong>ASSIGN_MENU_ACCEPT</strong>
+		<em><a href="##(ACT_ASSIGN_ACCEPT)">#ACT_ASSIGN_ACCEPT</a></em>
+<a id="ACT_ASSIGN_ACCEPT" >
+<strong>ACT_ASSIGN_ACCEPT</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(ACT_ASSIGN_MENU_ACCEPT)">#ACT_ASSIGN_MENU_ACCEPT</a></em>
+<a id="ACT_ASSIGN_MENU_ACCEPT" >
+<strong>ACT_ASSIGN_MENU_ACCEPT</strong>
 </a>
 </dt>
 <dd>
@@ -366,17 +436,17 @@ There are 2 moments when state transition functions will be called by the state
 </dl>
 	<h2><a id="#(Assign)" >Type <code>Assign</code></a></h2>
 	
-			<h2><a id="#(ASSIGN_ACCEPT)" >Type <code>ASSIGN_ACCEPT</code></a></h2>
+			<h2><a id="#(ACT_ASSIGN)" >Type <code>ACT_ASSIGN</code></a></h2>
 				
-<p>ASSIGN_ACCEPT class</p>
+<p>ACT_ASSIGN class</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(ASSIGN_ACCEPT).ClassName" >
-<strong>ASSIGN_ACCEPT.ClassName</strong>
+<a id="#(ACT_ASSIGN).ClassName" >
+<strong>ACT_ASSIGN.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -388,8 +458,8 @@ There are 2 moments when state transition functions will be called by the state
 		<dl class="function">
 <dt>
 
-<a id="#(ASSIGN_ACCEPT).New" >
-<strong>ASSIGN_ACCEPT:New(ProcessUnit, TaskBriefing)</strong>
+<a id="#(ACT_ASSIGN).New" >
+<strong>ACT_ASSIGN:New()</strong>
 </a>
 </dt>
 <dd>
@@ -399,22 +469,9 @@ There are 2 moments when state transition functions will be called by the state
 	
 <p>The process will accept the task by default, no player intervention accepted.</p>
 
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string TaskBriefing </em></code>: </p>
-
-				</li>
-		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(ASSIGN_ACCEPT)">#ASSIGN_ACCEPT</a>:</em>
+<p><em><a href="##(ACT_ASSIGN)">#ACT_ASSIGN</a>:</em>
 The task acceptance process.</p>
 
 </dd>
@@ -422,9 +479,9 @@ The task acceptance process.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
-<a id="#(ASSIGN_ACCEPT).ProcessUnit" >
-<strong>ASSIGN_ACCEPT.ProcessUnit</strong>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
+<a id="#(ACT_ASSIGN).ProcessUnit" >
+<strong>ACT_ASSIGN.ProcessUnit</strong>
 </a>
 </dt>
 <dd>
@@ -436,9 +493,9 @@ The task acceptance process.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></em>
-<a id="#(ASSIGN_ACCEPT).TargetZone" >
-<strong>ASSIGN_ACCEPT.TargetZone</strong>
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(ACT_ASSIGN).TargetZone" >
+<strong>ACT_ASSIGN.TargetZone</strong>
 </a>
 </dt>
 <dd>
@@ -450,23 +507,9 @@ The task acceptance process.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a></em>
-<a id="#(ASSIGN_ACCEPT).Task" >
-<strong>ASSIGN_ACCEPT.Task</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(ASSIGN_ACCEPT).TaskBriefing" >
-<strong>ASSIGN_ACCEPT.TaskBriefing</strong>
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(ACT_ASSIGN).Task" >
+<strong>ACT_ASSIGN.Task</strong>
 </a>
 </dt>
 <dd>
@@ -476,17 +519,17 @@ The task acceptance process.</p>
 </dd>
 </dl>
 
-			<h2><a id="#(ASSIGN_MENU_ACCEPT)" >Type <code>ASSIGN_MENU_ACCEPT</code></a></h2>
+			<h2><a id="#(ACT_ASSIGN_ACCEPT)" >Type <code>ACT_ASSIGN_ACCEPT</code></a></h2>
 				
-<p>ASSIGN<em>MENU</em>ACCEPT class</p>
+<p>ACT<em>ASSIGN</em>ACCEPT class</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(ASSIGN_MENU_ACCEPT).ClassName" >
-<strong>ASSIGN_MENU_ACCEPT.ClassName</strong>
+<a id="#(ACT_ASSIGN_ACCEPT).ClassName" >
+<strong>ACT_ASSIGN_ACCEPT.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -498,76 +541,29 @@ The task acceptance process.</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
-<a id="#(ASSIGN_MENU_ACCEPT).Menu" >
-<strong>ASSIGN_MENU_ACCEPT.Menu</strong>
+<a id="#(ACT_ASSIGN_ACCEPT).Init" >
+<strong>ACT_ASSIGN_ACCEPT:Init(FsmAssign)</strong>
 </a>
 </dt>
 <dd>
 	
 
 
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> FsmAssign </em></code>: </p>
+
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-		<em></em>
-<a id="#(ASSIGN_MENU_ACCEPT).MenuAcceptTask" >
-<strong>ASSIGN_MENU_ACCEPT.MenuAcceptTask</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ASSIGN_MENU_ACCEPT).MenuAssign" >
-<strong>ASSIGN_MENU_ACCEPT:MenuAssign()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Menu function.</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ASSIGN_MENU_ACCEPT).MenuReject" >
-<strong>ASSIGN_MENU_ACCEPT:MenuReject()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Menu function.</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(ASSIGN_MENU_ACCEPT).MenuRejectTask" >
-<strong>ASSIGN_MENU_ACCEPT.MenuRejectTask</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ASSIGN_MENU_ACCEPT).New" >
-<strong>ASSIGN_MENU_ACCEPT:New(ProcessUnit, TaskBriefing, TaskName)</strong>
+<a id="#(ACT_ASSIGN_ACCEPT).New" >
+<strong>ACT_ASSIGN_ACCEPT:New(TaskBriefing)</strong>
 </a>
 </dt>
 <dd>
@@ -575,29 +571,282 @@ The task acceptance process.</p>
 <p>Creates a new task assignment state machine.</p>
 
 	
-<p>The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.</p>
+<p>The process will accept the task by default, no player intervention accepted.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string TaskBriefing </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
+<a id="#(ACT_ASSIGN_ACCEPT).ProcessUnit" >
+<strong>ACT_ASSIGN_ACCEPT.ProcessUnit</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(ACT_ASSIGN_ACCEPT).TargetZone" >
+<strong>ACT_ASSIGN_ACCEPT.TargetZone</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(ACT_ASSIGN_ACCEPT).Task" >
+<strong>ACT_ASSIGN_ACCEPT.Task</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIGN_ACCEPT).TaskBriefing" >
+<strong>ACT_ASSIGN_ACCEPT.TaskBriefing</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIGN_ACCEPT).onafterStart" >
+<strong>ACT_ASSIGN_ACCEPT:onafterStart(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIGN_ACCEPT).onenterAssigned" >
+<strong>ACT_ASSIGN_ACCEPT:onenterAssigned(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(ACT_ASSIGN_MENU_ACCEPT)" >Type <code>ACT_ASSIGN_MENU_ACCEPT</code></a></h2>
+				
+<p>ACT<em>ASSIGN</em>MENU_ACCEPT class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).ClassName" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).Init" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:Init(FsmAssign)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> FsmAssign </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).Menu" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.Menu</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).MenuAcceptTask" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.MenuAcceptTask</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).MenuAssign" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:MenuAssign()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Menu function.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).MenuReject" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:MenuReject()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Menu function.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).MenuRejectTask" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.MenuRejectTask</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).New" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:New(TaskName, TaskBriefing)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Init.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string TaskName </em></code>: </p>
 
 				</li>
 				<li>
 				
 <p><code><em>#string TaskBriefing </em></code>: </p>
 
-				</li>
-				<li>
-				
-<p><code><em> TaskName </em></code>: </p>
-
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(ASSIGN_MENU_ACCEPT)">#ASSIGN<em>MENU</em>ACCEPT</a>:</em>
+<p><em><a href="##(ACT_ASSIGN_MENU_ACCEPT)">#ACT<em>ASSIGN</em>MENU_ACCEPT</a>:</em>
 self</p>
 
 </dd>
@@ -605,9 +854,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
-<a id="#(ASSIGN_MENU_ACCEPT).ProcessUnit" >
-<strong>ASSIGN_MENU_ACCEPT.ProcessUnit</strong>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).ProcessUnit" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.ProcessUnit</strong>
 </a>
 </dt>
 <dd>
@@ -619,9 +868,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></em>
-<a id="#(ASSIGN_MENU_ACCEPT).TargetZone" >
-<strong>ASSIGN_MENU_ACCEPT.TargetZone</strong>
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).TargetZone" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.TargetZone</strong>
 </a>
 </dt>
 <dd>
@@ -633,9 +882,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a></em>
-<a id="#(ASSIGN_MENU_ACCEPT).Task" >
-<strong>ASSIGN_MENU_ACCEPT.Task</strong>
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).Task" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.Task</strong>
 </a>
 </dt>
 <dd>
@@ -648,8 +897,8 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(ASSIGN_MENU_ACCEPT).TaskBriefing" >
-<strong>ASSIGN_MENU_ACCEPT.TaskBriefing</strong>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).TaskBriefing" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.TaskBriefing</strong>
 </a>
 </dt>
 <dd>
@@ -662,8 +911,8 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(ASSIGN_MENU_ACCEPT).TaskName" >
-<strong>ASSIGN_MENU_ACCEPT.TaskName</strong>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).TaskName" >
+<strong>ACT_ASSIGN_MENU_ACCEPT.TaskName</strong>
 </a>
 </dt>
 <dd>
@@ -675,8 +924,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(ASSIGN_MENU_ACCEPT).onafterAssign" >
-<strong>ASSIGN_MENU_ACCEPT:onafterAssign(ProcessUnit, Event, From, To)</strong>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).onafterAssign" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:onafterAssign(ProcessUnit, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -687,7 +936,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -711,8 +960,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(ASSIGN_MENU_ACCEPT).onafterReject" >
-<strong>ASSIGN_MENU_ACCEPT:onafterReject(ProcessUnit, Event, From, To)</strong>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).onafterReject" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:onafterReject(ProcessUnit, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -723,7 +972,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -747,8 +996,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(ASSIGN_MENU_ACCEPT).onafterStart" >
-<strong>ASSIGN_MENU_ACCEPT:onafterStart(ProcessUnit, Event, From, To)</strong>
+<a id="#(ACT_ASSIGN_MENU_ACCEPT).onafterStart" >
+<strong>ACT_ASSIGN_MENU_ACCEPT:onafterStart(ProcessUnit, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -759,7 +1008,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
diff --git a/Moose Training/Documentation/Base.html b/Moose Training/Documentation/Base.html
index 2fbced6cc..f195dd998 100644
--- a/Moose Training/Documentation/Base.html	
+++ b/Moose Training/Documentation/Base.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -100,7 +102,7 @@
 <p>Note: Normally you would not use the BASE class unless you are extending the MOOSE framework with new classes.</p>
 
 <h2>1.1) BASE constructor</h2>
-<p>Any class derived from BASE, must use the <a href="Base.html##(BASE).New">Base#BASE.New</a> method how this is done.</p>
+<p>Any class derived from BASE, must use the <a href="Core.Base.html##(BASE).New">Core.Base#BASE.New</a> method how this is done.</p>
 
 <h2>1.2) BASE Trace functionality</h2>
 <p>The BASE class contains trace methods to trace progress within a mission execution of a certain object.
@@ -226,6 +228,150 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 		<td class="name" nowrap="nowrap"><a href="##(BASE).Event">BASE:Event()</a></td>
 		<td class="summary">
 <p>Returns the event dispatcher</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnBaseCaptured">BASE:EventOnBaseCaptured(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>BASE_CAPTURED event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnBirth">BASE:EventOnBirth(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>BIRTH event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnCrash">BASE:EventOnCrash(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>CRASH event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnDead">BASE:EventOnDead(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>DEAD event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnEjection">BASE:EventOnEjection(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>EJECTION event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnEngineShutdown">BASE:EventOnEngineShutdown(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>ENGINE_SHUTDOWN event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnEngineStartup">BASE:EventOnEngineStartup(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>ENGINE_STARTUP event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnHit">BASE:EventOnHit(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>HIT event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnHumanFailure">BASE:EventOnHumanFailure(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>HUMAN_FAILURE event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnLand">BASE:EventOnLand(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>LAND event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnMissionStart">BASE:EventOnMissionStart(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>MISSION_START event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnPilotDead">BASE:EventOnPilotDead(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>PILOT_DEAD event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnPlayerComment">BASE:EventOnPlayerComment(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>PLAYER_COMMENT event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnPlayerEnterUnit">BASE:EventOnPlayerEnterUnit(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>PLAYER<em>ENTER</em>UNIT event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnPlayerLeaveUnit">BASE:EventOnPlayerLeaveUnit(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>PLAYER<em>LEAVE</em>UNIT event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnPlayerMissionEnd">BASE:EventOnPlayerMissionEnd(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>MISSION_END event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnRefueling">BASE:EventOnRefueling(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>REFUELING event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnRefuelingStop">BASE:EventOnRefuelingStop(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>REFUELING_STOP event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnShootingEnd">BASE:EventOnShootingEnd(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>SHOOTING_END event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnShootingStart">BASE:EventOnShootingStart(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>SHOOTING_START event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnShot">BASE:EventOnShot(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>SHOT event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnTakeOff">BASE:EventOnTakeOff(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>TAKEOFF event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventOnTookControl">BASE:EventOnTookControl(EventFunction)</a></td>
+		<td class="summary">
+<p>Subscribe to a S<em>EVENT</em>TOOK_CONTROL event.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE).EventRemoveAll">BASE:EventRemoveAll()</a></td>
+		<td class="summary">
+<p>Remove all subscribed events</p>
 </td>
 		</tr>
 		<tr>
@@ -297,7 +443,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>
@@ -360,12 +506,24 @@ These tracing levels were defined to avoid bulks of tracing to be generated by l
 <p>Set trace on or off
 Note that when trace is off, no debug statement is performed, increasing performance!
 When Moose is loaded statically, (as one file), tracing is switched off by default.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE)._Destructor">BASE:_Destructor()</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(BASE)._F">BASE:_F(Arguments, DebugInfoCurrentParam, DebugInfoFromParam)</a></td>
 		<td class="summary">
 <p>Trace a function call.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(BASE)._SetDestructor">BASE:_SetDestructor()</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -443,7 +601,7 @@ When Moose is loaded statically, (as one file), tracing is switched off by defau
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Event)">DCSTypes#Event</a> Event </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Event)">Dcs.DCSTypes#Event</a> Event </em></code>: </p>
 
 				</li>
 				<li>
@@ -539,13 +697,13 @@ When Moose is loaded statically, (as one file), tracing is switched off by defau
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Time)">DCSTypes#Time</a> EventTime </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Time)">Dcs.DCSTypes#Time</a> EventTime </em></code>: 
 The time stamp of the event.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSObject.html##(Object)">DCSObject#Object</a> Initiator </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Object.html##(Object)">Dcs.DCSWrapper.Object#Object</a> Initiator </em></code>: 
 The initiating object of the event.</p>
 
 				</li>
@@ -583,13 +741,13 @@ The initiating unit name.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Time)">DCSTypes#Time</a> EventTime </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Time)">Dcs.DCSTypes#Time</a> EventTime </em></code>: 
 The time stamp of the event.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSObject.html##(Object)">DCSObject#Object</a> Initiator </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Object.html##(Object)">Dcs.DCSWrapper.Object#Object</a> Initiator </em></code>: 
 The initiating object of the event.</p>
 
 				</li>
@@ -670,7 +828,646 @@ A #table or any field.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Event.html##(EVENT)">Event#EVENT</a>:</em></p>
+<p><em><a href="Core.Event.html##(EVENT)">Core.Event#EVENT</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnBaseCaptured" >
+<strong>BASE:EventOnBaseCaptured(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>BASE_CAPTURED event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnBirth" >
+<strong>BASE:EventOnBirth(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>BIRTH event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnCrash" >
+<strong>BASE:EventOnCrash(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>CRASH event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnDead" >
+<strong>BASE:EventOnDead(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>DEAD event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnEjection" >
+<strong>BASE:EventOnEjection(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>EJECTION event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnEngineShutdown" >
+<strong>BASE:EventOnEngineShutdown(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>ENGINE_SHUTDOWN event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnEngineStartup" >
+<strong>BASE:EventOnEngineStartup(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>ENGINE_STARTUP event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnHit" >
+<strong>BASE:EventOnHit(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>HIT event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnHumanFailure" >
+<strong>BASE:EventOnHumanFailure(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>HUMAN_FAILURE event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnLand" >
+<strong>BASE:EventOnLand(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>LAND event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnMissionStart" >
+<strong>BASE:EventOnMissionStart(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>MISSION_START event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnPilotDead" >
+<strong>BASE:EventOnPilotDead(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>PILOT_DEAD event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnPlayerComment" >
+<strong>BASE:EventOnPlayerComment(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>PLAYER_COMMENT event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnPlayerEnterUnit" >
+<strong>BASE:EventOnPlayerEnterUnit(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>PLAYER<em>ENTER</em>UNIT event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnPlayerLeaveUnit" >
+<strong>BASE:EventOnPlayerLeaveUnit(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>PLAYER<em>LEAVE</em>UNIT event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnPlayerMissionEnd" >
+<strong>BASE:EventOnPlayerMissionEnd(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>MISSION_END event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnRefueling" >
+<strong>BASE:EventOnRefueling(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>REFUELING event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnRefuelingStop" >
+<strong>BASE:EventOnRefuelingStop(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>REFUELING_STOP event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnShootingEnd" >
+<strong>BASE:EventOnShootingEnd(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>SHOOTING_END event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnShootingStart" >
+<strong>BASE:EventOnShootingStart(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>SHOOTING_START event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnShot" >
+<strong>BASE:EventOnShot(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>SHOT event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnTakeOff" >
+<strong>BASE:EventOnTakeOff(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>TAKEOFF event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventOnTookControl" >
+<strong>BASE:EventOnTookControl(EventFunction)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Subscribe to a S<em>EVENT</em>TOOK_CONTROL event.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#function EventFunction </em></code>: 
+The function to be called when the event occurs for the unit.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE).EventRemoveAll" >
+<strong>BASE:EventRemoveAll()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Remove all subscribed events</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(BASE)">#BASE</a>:</em></p>
 
 
 </dd>
@@ -934,31 +1731,10 @@ Child</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>-- This declares the constructor of the class TASK, inheriting from BASE.
---- TASK constructor
--- @param #TASK self
--- @param Parameter The parameter of the New constructor.
--- @return #TASK self
-function TASK:New( Parameter )
-
-    local self = BASE:Inherit( self, BASE:New() )
-    
-    self.Variable = Parameter 
-
-    return self
-end</code></pre>
+<p> @todo need to investigate if the deepCopy is really needed... Don't think so.</p>
 
 </dd>
 </dl>
@@ -1205,6 +1981,19 @@ BASE:TraceOn( true )
 -- Switch the tracing Off
 BASE:TraceOn( false )</code></pre>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE)._Destructor" >
+<strong>BASE:_Destructor()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1240,6 +2029,19 @@ A #table or any field.</p>
 
 				</li>
 		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(BASE)._SetDestructor" >
+<strong>BASE:_SetDestructor()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1286,10 +2088,10 @@ A #table or any field.</p>
 
 
 	
-<p> TODO: Complete DCSTypes#Event structure. <br/>
+<p> TODO: Complete Dcs.DCSTypes#Event structure. <br/>
 - The main event handling function... This function captures all events generated for the class.
  @param #BASE self
- @param DCSTypes#Event event</p>
+ @param Dcs.DCSTypes#Event event</p>
 
 		<h3>Parameter</h3>
 		<ul>
diff --git a/Moose Training/Documentation/CARGO.html b/Moose Training/Documentation/CARGO.html
index ec3814ef4..7aa7c873b 100644
--- a/Moose Training/Documentation/CARGO.html	
+++ b/Moose Training/Documentation/CARGO.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<li>Cargo</li>
 					<li><a href="CleanUp.html">CleanUp</a></li>
 					<li><a href="Client.html">Client</a></li>
+					<li><a href="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -92,32 +94,32 @@
 <p>Cargo can be of various forms, always are composed out of ONE object ( one unit or one static or one slingload crate ):</p>
 
 <ul>
-    <li><p>CARGO_UNIT, represented by a <a href="Unit.html">Unit</a> in a <a href="Group.html">Group</a>: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.</p></li>
+    <li><p>AI<em>CARGO</em>UNIT, represented by a <a href="Unit.html">Unit</a> in a <a href="Group.html">Group</a>: Cargo can be represented by a Unit in a Group. Destruction of the Unit will mean that the cargo is lost.</p></li>
     <li><p>CARGO_STATIC, represented by a <a href="Static.html">Static</a>: Cargo can be represented by a Static. Destruction of the Static will mean that the cargo is lost.</p></li>
-    <li><p>CARGO_PACKAGE, contained in a <a href="Unit.html">Unit</a> of a <a href="Group.html">Group</a>: Cargo can be contained within a Unit of a Group. The cargo can be <strong>delivered</strong> by the <a href="Unit.html">Unit</a>. If the Unit is destroyed, the cargo will be destroyed also.</p></li>
-    <li><p>CARGO_PACKAGE, Contained in a <a href="Static.html">Static</a>: Cargo can be contained within a Static. The cargo can be <strong>collected</strong> from the @Static. If the <a href="Static.html">Static</a> is destroyed, the cargo will be destroyed.</p></li>
+    <li><p>AI<em>CARGO</em>PACKAGE, contained in a <a href="Unit.html">Unit</a> of a <a href="Group.html">Group</a>: Cargo can be contained within a Unit of a Group. The cargo can be <strong>delivered</strong> by the <a href="Unit.html">Unit</a>. If the Unit is destroyed, the cargo will be destroyed also.</p></li>
+    <li><p>AI<em>CARGO</em>PACKAGE, Contained in a <a href="Static.html">Static</a>: Cargo can be contained within a Static. The cargo can be <strong>collected</strong> from the @Static. If the <a href="Static.html">Static</a> is destroyed, the cargo will be destroyed.</p></li>
     <li><p>CARGO_SLINGLOAD, represented by a <a href="Cargo.html">Cargo</a> that is transportable: Cargo can be represented by a Cargo object that is transportable. Destruction of the Cargo will mean that the cargo is lost.</p></li>
-    <li><p>CARGO<em>GROUPED, represented by a Group of CARGO</em>UNITs.</p></li>
+    <li><p>AI<em>CARGO</em>GROUPED, represented by a Group of CARGO_UNITs.</p></li>
 </ul>
 
-<h1>1) <a href="Cargo.html##(CARGO_BASE)">Cargo#CARGO_BASE</a> class, extends <a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a></h1>
-<p>The <a href="##(CARGO_BASE)">#CARGO_BASE</a> class defines the core functions that defines a cargo object within MOOSE.
+<h1>1) <a href="AI.AI_Cargo.html##(AI_CARGO)">AI.AI<em>Cargo#AI</em>CARGO</a> class, extends <a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a></h1>
+<p>The <a href="##(AI_CARGO)">#AI_CARGO</a> class defines the core functions that defines a cargo object within MOOSE.
 A cargo is a logical object defined that is available for transport, and has a life status within a simulation.</p>
 
-<p>The CARGO<em>BASE is a state machine: it manages the different events and states of the cargo.
-All derived classes from CARGO</em>BASE follow the same state machine, expose the same cargo event functions, and provide the same cargo states.</p>
+<p>The AI<em>CARGO is a state machine: it manages the different events and states of the cargo.
+All derived classes from AI</em>CARGO follow the same state machine, expose the same cargo event functions, and provide the same cargo states.</p>
 
-<h2>1.2.1) CARBO_BASE Events:</h2>
+<h2>1.2.1) AI_CARGO Events:</h2>
 
 <ul>
-    <li><a href="##(CARBO_BASE).Board">CARBO_BASE.Board</a>( ToCarrier ):  Boards the cargo to a carrier.</li>
-    <li><a href="##(CARBO_BASE).Load">CARBO_BASE.Load</a>( ToCarrier ): Loads the cargo into a carrier, regardless of its position.</li>
-    <li><a href="##(CARBO_BASE).UnBoard">CARBO_BASE.UnBoard</a>( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.</li>
-    <li><a href="##(CARBO_BASE).UnLoad">CARBO_BASE.UnLoad</a>( ToPointVec2 ): UnLoads the cargo from a carrier.</li>
-    <li><a href="##(CARBO_BASE).Dead">CARBO_BASE.Dead</a>( Controllable ): The cargo is dead. The cargo process will be ended.</li>
+    <li><a href="##(AI_CARGO).Board">AI_CARGO.Board</a>( ToCarrier ):  Boards the cargo to a carrier.</li>
+    <li><a href="##(AI_CARGO).Load">AI_CARGO.Load</a>( ToCarrier ): Loads the cargo into a carrier, regardless of its position.</li>
+    <li><a href="##(AI_CARGO).UnBoard">AI_CARGO.UnBoard</a>( ToPointVec2 ): UnBoard the cargo from a carrier. This will trigger a movement of the cargo to the option ToPointVec2.</li>
+    <li><a href="##(AI_CARGO).UnLoad">AI_CARGO.UnLoad</a>( ToPointVec2 ): UnLoads the cargo from a carrier.</li>
+    <li><a href="##(AI_CARGO).Dead">AI_CARGO.Dead</a>( Controllable ): The cargo is dead. The cargo process will be ended.</li>
 </ul>
 
-<h2>1.2.2) CARBO_BASE States:</h2>
+<h2>1.2.2) AI_CARGO States:</h2>
 
 <ul>
     <li><strong>UnLoaded</strong>: The cargo is unloaded from a carrier.</li>
@@ -128,29 +130,29 @@ All derived classes from CARGO</em>BASE follow the same state machine, expose th
     <li><strong>End</strong>: The process has come to an end.</li>
 </ul>
 
-<h2>1.2.3) CARBO_BASE state transition functions:</h2>
+<h2>1.2.3) AI_CARGO state transition methods:</h2>
 
 <p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
-There are 2 moments when state transition functions will be called by the state machine:</p>
+There are 2 moments when state transition methods will be called by the state machine:</p>
 
 <ul>
     <li><p><strong>Before</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnBefore + the name of the state</strong>. 
-    If the state transition function returns false, then the processing of the state transition will not be done!
+    The state transition method needs to start with the name <strong>OnBefore + the name of the state</strong>. 
+    If the state transition method returns false, then the processing of the state transition will not be done!
     If you want to change the behaviour of the AIControllable at this event, return false, 
     but then you'll need to specify your own logic using the AIControllable!</p></li>
     <li><p><strong>After</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnAfter + the name of the state</strong>. 
-    These state transition functions need to provide a return value, which is specified at the function description.</p></li>
+    The state transition method needs to start with the name <strong>OnAfter + the name of the state</strong>. 
+    These state transition methods need to provide a return value, which is specified at the function description.</p></li>
 </ul>
 
-<h1>2) #CARGO_UNIT class</h1>
-<p>The CARGO<em>UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
-Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO</em>UNIT objects to and from carriers.</p>
+<h1>2) #AI<em>CARGO</em>UNIT class</h1>
+<p>The AI<em>CARGO</em>UNIT class defines a cargo that is represented by a UNIT object within the simulator, and can be transported by a carrier.
+Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI<em>CARGO</em>UNIT objects to and from carriers.</p>
 
-<h1>5) #CARGO_GROUPED class</h1>
-<p>The CARGO<em>GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
-Use the event functions as described above to Load, UnLoad, Board, UnBoard the CARGO</em>UNIT objects to and from carriers.</p>
+<h1>5) #AI<em>CARGO</em>GROUPED class</h1>
+<p>The AI<em>CARGO</em>GROUPED class defines a cargo that is represented by a group of UNIT objects within the simulator, and can be transported by a carrier.
+Use the event functions as described above to Load, UnLoad, Board, UnBoard the AI<em>CARGO</em>UNIT objects to and from carriers.</p>
 
 <p>This module is still under construction, but is described above works already, and will keep working ...</p>
 
@@ -158,7 +160,37 @@ Use the event functions as described above to Load, UnLoad, Board, UnBoard the C
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#CARBO_BASE">CARBO_BASE</a></td>
+		<td class="name" nowrap="nowrap"><a href="#AI_CARGO">AI_CARGO</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AI_CARGO_GROUP">AI_CARGO_GROUP</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AI_CARGO_GROUPED">AI_CARGO_GROUPED</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AI_CARGO_PACKAGE">AI_CARGO_PACKAGE</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AI_CARGO_REPRESENTABLE">AI_CARGO_REPRESENTABLE</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#AI_CARGO_UNIT">AI_CARGO_UNIT</a></td>
 		<td class="summary">
 
 </td>
@@ -167,501 +199,459 @@ Use the event functions as described above to Load, UnLoad, Board, UnBoard the C
 		<td class="name" nowrap="nowrap"><a href="#CARGOS">CARGOS</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#CARGO_GROUP">CARGO_GROUP</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#CARGO_GROUPED">CARGO_GROUPED</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#CARGO_PACKAGE">CARGO_PACKAGE</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#CARGO_REPRESENTABLE">CARGO_REPRESENTABLE</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#CARGO_UNIT">CARGO_UNIT</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="#FSMT">FSMT</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 	</table>
-			<h2><a id="#(CARBO_BASE)">Type <code>CARBO_BASE</code></a></h2>
+			<h2><a id="#(AI_CARGO)">Type <code>AI_CARGO</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Board">CARBO_BASE:Board(ToCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Board">AI_CARGO:Board(ToCarrier)</a></td>
 		<td class="summary">
 <p>Boards the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).CargoCarrier">CARBO_BASE.CargoCarrier</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).CargoCarrier">AI_CARGO.CargoCarrier</a></td>
 		<td class="summary">
 <p>The alive DCS object carrying the cargo. This value can be nil, meaning, that the cargo is not contained anywhere...</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).CargoObject">CARBO_BASE.CargoObject</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).CargoObject">AI_CARGO.CargoObject</a></td>
 		<td class="summary">
 <p>The alive DCS object representing the cargo. This value can be nil, meaning, that the cargo is not represented anywhere...</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).CargoScheduler">CARBO_BASE.CargoScheduler</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).ClassName">AI_CARGO.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).ClassName">CARBO_BASE.ClassName</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Containable">CARBO_BASE.Containable</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Containable">AI_CARGO.Containable</a></td>
 		<td class="summary">
 <p>This flag defines if the cargo can be contained within a DCS Unit.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).IsNear">CARBO_BASE:IsNear(PointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).IsNear">AI_CARGO:IsNear(PointVec2)</a></td>
 		<td class="summary">
 <p>Check if CargoCarrier is near the Cargo to be Loaded.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Load">CARBO_BASE:Load(ToCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Load">AI_CARGO:Load(ToCarrier)</a></td>
 		<td class="summary">
 <p>Loads the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Moveable">CARBO_BASE.Moveable</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Moveable">AI_CARGO.Moveable</a></td>
 		<td class="summary">
 <p>This flag defines if the cargo is moveable.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Name">CARBO_BASE.Name</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Name">AI_CARGO.Name</a></td>
 		<td class="summary">
 <p>A string defining the name of the cargo. The name is the unique identifier of the cargo.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).NearRadius">CARBO_BASE.NearRadius</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).NearRadius">AI_CARGO.NearRadius</a></td>
 		<td class="summary">
 <p>(optional) A number defining the radius in meters when the cargo is near to a Carrier, so that it can be loaded.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).New">CARBO_BASE:New(Type, Name, Weight, ReportRadius, NearRadius)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).New">AI_CARGO:New(Type, Name, Weight, ReportRadius, NearRadius)</a></td>
 		<td class="summary">
-<p>CARBO_BASE Constructor.</p>
+<p>AI_CARGO Constructor.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnAfterBoarding">CARBO_BASE:OnAfterBoarding(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnAfterBoarding">AI_CARGO:OnAfterBoarding(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnAfterLoaded">CARBO_BASE:OnAfterLoaded(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnAfterLoaded">AI_CARGO:OnAfterLoaded(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnAfterUnBoarding">CARBO_BASE:OnAfterUnBoarding(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnAfterUnBoarding">AI_CARGO:OnAfterUnBoarding(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnAfterUnLoaded">CARBO_BASE:OnAfterUnLoaded(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnAfterUnLoaded">AI_CARGO:OnAfterUnLoaded(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnBeforeBoarding">CARBO_BASE:OnBeforeBoarding(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnBeforeBoarding">AI_CARGO:OnBeforeBoarding(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnBeforeLoaded">CARBO_BASE:OnBeforeLoaded(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnBeforeLoaded">AI_CARGO:OnBeforeLoaded(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnBeforeUnBoarding">CARBO_BASE:OnBeforeUnBoarding(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnBeforeUnBoarding">AI_CARGO:OnBeforeUnBoarding(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).OnBeforeUnLoaded">CARBO_BASE:OnBeforeUnLoaded(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).OnBeforeUnLoaded">AI_CARGO:OnBeforeUnLoaded(Controllable)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).ReportRadius">CARBO_BASE.ReportRadius</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).ReportRadius">AI_CARGO.ReportRadius</a></td>
 		<td class="summary">
 <p>(optional) A number defining the radius in meters when the cargo is signalling or reporting to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Representable">CARBO_BASE.Representable</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Representable">AI_CARGO.Representable</a></td>
 		<td class="summary">
 <p>This flag defines if the cargo can be represented by a DCS Unit.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Slingloadable">CARBO_BASE.Slingloadable</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Slingloadable">AI_CARGO.Slingloadable</a></td>
 		<td class="summary">
 <p>This flag defines if the cargo can be slingloaded.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Spawn">CARBO_BASE:Spawn(PointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Spawn">AI_CARGO:Spawn(PointVec2)</a></td>
 		<td class="summary">
-<p>Template method to spawn a new representation of the CARBO_BASE in the simulator.</p>
+<p>Template method to spawn a new representation of the AI_CARGO in the simulator.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Type">CARBO_BASE.Type</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Type">AI_CARGO.Type</a></td>
 		<td class="summary">
 <p>A string defining the type of the cargo. eg. Engineers, Equipment, Screwdrivers.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).UnBoard">CARBO_BASE:UnBoard(ToPointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).UnBoard">AI_CARGO:UnBoard(ToPointVec2)</a></td>
 		<td class="summary">
 <p>UnBoards the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).UnLoad">CARBO_BASE:UnLoad(ToPointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).UnLoad">AI_CARGO:UnLoad(ToPointVec2)</a></td>
 		<td class="summary">
 <p>UnLoads the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).Weight">CARBO_BASE.Weight</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).Weight">AI_CARGO.Weight</a></td>
 		<td class="summary">
 <p>A number defining the weight of the cargo. The weight is expressed in kg.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).__Board">CARBO_BASE:__Board(DelaySeconds, ToCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).__Board">AI_CARGO:__Board(DelaySeconds, ToCarrier)</a></td>
 		<td class="summary">
 <p>Boards the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).__Load">CARBO_BASE:__Load(DelaySeconds, ToCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).__Load">AI_CARGO:__Load(DelaySeconds, ToCarrier)</a></td>
 		<td class="summary">
 <p>Loads the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).__UnBoard">CARBO_BASE:__UnBoard(DelaySeconds, ToPointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).__UnBoard">AI_CARGO:__UnBoard(DelaySeconds, ToPointVec2)</a></td>
 		<td class="summary">
 <p>UnBoards the cargo to a Carrier.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARBO_BASE).__UnLoad">CARBO_BASE:__UnLoad(DelaySeconds, ToPointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO).__UnLoad">AI_CARGO:__UnLoad(DelaySeconds, ToPointVec2)</a></td>
 		<td class="summary">
 <p>UnLoads the cargo to a Carrier.</p>
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(CARGO_GROUP)">Type <code>CARGO_GROUP</code></a></h2>
+			<h2><a id="#(AI_CARGO_GROUP)">Type <code>AI_CARGO_GROUP</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUP).CargoSet">CARGO_GROUP.CargoSet</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUP).CargoSet">AI_CARGO_GROUP.CargoSet</a></td>
 		<td class="summary">
 <p>A set of cargo objects.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUP).ClassName">CARGO_GROUP.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUP).ClassName">AI_CARGO_GROUP.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUP).Name">CARGO_GROUP.Name</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUP).Name">AI_CARGO_GROUP.Name</a></td>
 		<td class="summary">
 <p>A string defining the name of the cargo group. The name is the unique identifier of the cargo.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUP).New">CARGO_GROUP:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUP).New">AI_CARGO_GROUP:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
 		<td class="summary">
-<p>CARGO_GROUP constructor.</p>
+<p>AI<em>CARGO</em>GROUP constructor.</p>
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(CARGO_GROUPED)">Type <code>CARGO_GROUPED</code></a></h2>
+			<h2><a id="#(AI_CARGO_GROUPED)">Type <code>AI_CARGO_GROUPED</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).ClassName">CARGO_GROUPED.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).ClassName">AI_CARGO_GROUPED.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).New">CARGO_GROUPED:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).New">AI_CARGO_GROUPED:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
 		<td class="summary">
-<p>CARGO_GROUPED constructor.</p>
+<p>AI<em>CARGO</em>GROUPED constructor.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onafterUnBoarding">CARGO_GROUPED:onafterUnBoarding(ToPointVec2, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onafterUnBoarding">AI_CARGO_GROUPED:onafterUnBoarding(ToPointVec2, Event, From, To)</a></td>
 		<td class="summary">
 <p>UnBoard Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onenterBoarding">CARGO_GROUPED:onenterBoarding(CargoCarrier, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onenterBoarding">AI_CARGO_GROUPED:onenterBoarding(CargoCarrier, Event, From, To)</a></td>
 		<td class="summary">
 <p>Enter Boarding State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onenterLoaded">CARGO_GROUPED:onenterLoaded(CargoCarrier, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onenterLoaded">AI_CARGO_GROUPED:onenterLoaded(CargoCarrier, Event, From, To)</a></td>
 		<td class="summary">
 <p>Enter Loaded State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onenterUnBoarding">CARGO_GROUPED:onenterUnBoarding(ToPointVec2, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onenterUnBoarding">AI_CARGO_GROUPED:onenterUnBoarding(ToPointVec2, Event, From, To)</a></td>
 		<td class="summary">
 <p>Enter UnBoarding State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onenterUnLoaded">CARGO_GROUPED:onenterUnLoaded(Point, Event, From, To, ToPointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onenterUnLoaded">AI_CARGO_GROUPED:onenterUnLoaded(Core, Event, From, To, ToPointVec2)</a></td>
 		<td class="summary">
 <p>Enter UnLoaded State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onleaveBoarding">CARGO_GROUPED:onleaveBoarding(CargoCarrier, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onleaveBoarding">AI_CARGO_GROUPED:onleaveBoarding(CargoCarrier, Event, From, To)</a></td>
 		<td class="summary">
 <p>Leave Boarding State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_GROUPED).onleaveUnBoarding">CARGO_GROUPED:onleaveUnBoarding(ToPointVec2, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_GROUPED).onleaveUnBoarding">AI_CARGO_GROUPED:onleaveUnBoarding(ToPointVec2, Event, From, To)</a></td>
 		<td class="summary">
 <p>Leave UnBoarding State.</p>
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(CARGO_PACKAGE)">Type <code>CARGO_PACKAGE</code></a></h2>
+			<h2><a id="#(AI_CARGO_PACKAGE)">Type <code>AI_CARGO_PACKAGE</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).CargoCarrier">CARGO_PACKAGE.CargoCarrier</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).CargoCarrier">AI_CARGO_PACKAGE.CargoCarrier</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).CargoInAir">CARGO_PACKAGE.CargoInAir</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).CargoInAir">AI_CARGO_PACKAGE.CargoInAir</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).ClassName">CARGO_PACKAGE.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).ClassName">AI_CARGO_PACKAGE.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).IsNear">CARGO_PACKAGE:IsNear(CargoCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).IsNear">AI_CARGO_PACKAGE:IsNear(CargoCarrier)</a></td>
 		<td class="summary">
 <p>Check if CargoCarrier is near the Cargo to be Loaded.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).New">CARGO_PACKAGE:New(CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).New">AI_CARGO_PACKAGE:New(CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
 		<td class="summary">
-<p>CARGO_PACKAGE Constructor.</p>
+<p>AI<em>CARGO</em>PACKAGE Constructor.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).onafterLoad">CARGO_PACKAGE:onafterLoad(FsmP, Event, From, To, CargoCarrier, Speed, LoadDistance, Angle)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).onafterLoad">AI_CARGO_PACKAGE:onafterLoad(Event, From, To, CargoCarrier, Speed, LoadDistance, Angle)</a></td>
 		<td class="summary">
 <p>Load Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).onafterOnBoard">CARGO_PACKAGE:onafterOnBoard(FsmP, Event, From, To, CargoCarrier, Speed, BoardDistance, Angle, LoadDistance)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).onafterOnBoard">AI_CARGO_PACKAGE:onafterOnBoard(Event, From, To, CargoCarrier, Speed, BoardDistance, Angle, LoadDistance)</a></td>
 		<td class="summary">
 <p>Board Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).onafterOnBoarded">CARGO_PACKAGE:onafterOnBoarded(FsmP, Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).onafterOnBoarded">AI_CARGO_PACKAGE:onafterOnBoarded(Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle)</a></td>
 		<td class="summary">
 <p>Boarded Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).onafterUnBoard">CARGO_PACKAGE:onafterUnBoard(FsmP, Event, From, To, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle, CargoCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).onafterUnBoard">AI_CARGO_PACKAGE:onafterUnBoard(Event, From, To, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle, CargoCarrier)</a></td>
 		<td class="summary">
 <p>UnBoard Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).onafterUnBoarded">CARGO_PACKAGE:onafterUnBoarded(FsmP, Event, From, To, CargoCarrier, Speed)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).onafterUnBoarded">AI_CARGO_PACKAGE:onafterUnBoarded(Event, From, To, CargoCarrier, Speed)</a></td>
 		<td class="summary">
 <p>UnBoarded Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_PACKAGE).onafterUnLoad">CARGO_PACKAGE:onafterUnLoad(FsmP, Event, From, To, Distance, Angle, CargoCarrier, Speed)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_PACKAGE).onafterUnLoad">AI_CARGO_PACKAGE:onafterUnLoad(Event, From, To, Distance, Angle, CargoCarrier, Speed)</a></td>
 		<td class="summary">
 <p>UnLoad Event.</p>
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(CARGO_REPRESENTABLE)">Type <code>CARGO_REPRESENTABLE</code></a></h2>
+			<h2><a id="#(AI_CARGO_REPRESENTABLE)">Type <code>AI_CARGO_REPRESENTABLE</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_REPRESENTABLE).ClassName">CARGO_REPRESENTABLE.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_REPRESENTABLE).ClassName">AI_CARGO_REPRESENTABLE.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_REPRESENTABLE).New">CARGO_REPRESENTABLE:New(CargoObject, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_REPRESENTABLE).New">AI_CARGO_REPRESENTABLE:New(CargoObject, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
 		<td class="summary">
-<p>CARGO_REPRESENTABLE Constructor.</p>
+<p>AI<em>CARGO</em>REPRESENTABLE Constructor.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_REPRESENTABLE).RouteTo">CARGO_REPRESENTABLE:RouteTo(ToPointVec2, Speed)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_REPRESENTABLE).RouteTo">AI_CARGO_REPRESENTABLE:RouteTo(ToPointVec2, Speed)</a></td>
 		<td class="summary">
 <p>Route a cargo unit to a PointVec2.</p>
 </td>
 		</tr>
 	</table>
 
-			<h2><a id="#(CARGO_UNIT)">Type <code>CARGO_UNIT</code></a></h2>
+			<h2><a id="#(AI_CARGO_UNIT)">Type <code>AI_CARGO_UNIT</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).CargoCarrier">CARGO_UNIT.CargoCarrier</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).CargoCarrier">AI_CARGO_UNIT.CargoCarrier</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).CargoInAir">CARGO_UNIT.CargoInAir</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).CargoInAir">AI_CARGO_UNIT.CargoInAir</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).CargoObject">CARGO_UNIT.CargoObject</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).CargoObject">AI_CARGO_UNIT.CargoObject</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).ClassName">CARGO_UNIT.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).ClassName">AI_CARGO_UNIT.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).New">CARGO_UNIT:New(CargoUnit, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).New">AI_CARGO_UNIT:New(CargoUnit, Type, Name, Weight, ReportRadius, NearRadius)</a></td>
 		<td class="summary">
-<p>CARGO_UNIT Constructor.</p>
+<p>AI<em>CARGO</em>UNIT Constructor.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).OnUnLoadedCallBack">CARGO_UNIT.OnUnLoadedCallBack</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).OnUnLoadedCallBack">AI_CARGO_UNIT.OnUnLoadedCallBack</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onafterBoard">CARGO_UNIT:onafterBoard(Event, From, To, CargoCarrier)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onafterBoard">AI_CARGO_UNIT:onafterBoard(Event, From, To, CargoCarrier)</a></td>
 		<td class="summary">
 <p>Board Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onafterUnBoarding">CARGO_UNIT:onafterUnBoarding(ToPointVec2, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onafterUnBoarding">AI_CARGO_UNIT:onafterUnBoarding(Event, From, To, ToPointVec2)</a></td>
 		<td class="summary">
 <p>UnBoard Event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onenterBoarding">CARGO_UNIT:onenterBoarding(CargoCarrier, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onenterBoarding">AI_CARGO_UNIT:onenterBoarding(Event, From, To, CargoCarrier)</a></td>
 		<td class="summary">
 <p>Enter Boarding State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onenterLoaded">CARGO_UNIT:onenterLoaded(CargoCarrier, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onenterLoaded">AI_CARGO_UNIT:onenterLoaded(Event, From, To, CargoCarrier)</a></td>
 		<td class="summary">
 <p>Loaded State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onenterUnBoarding">CARGO_UNIT:onenterUnBoarding(ToPointVec2, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onenterUnBoarding">AI_CARGO_UNIT:onenterUnBoarding(Event, From, To, ToPointVec2)</a></td>
 		<td class="summary">
 <p>Enter UnBoarding State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onenterUnLoaded">CARGO_UNIT:onenterUnLoaded(Point, Event, From, To, ToPointVec2)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onenterUnLoaded">AI_CARGO_UNIT:onenterUnLoaded(Event, From, To, Core, ToPointVec2)</a></td>
 		<td class="summary">
 <p>Enter UnLoaded State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onleaveBoarding">CARGO_UNIT:onleaveBoarding(CargoCarrier, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onleaveBoarding">AI_CARGO_UNIT:onleaveBoarding(Event, From, To, CargoCarrier)</a></td>
 		<td class="summary">
 <p>Leave Boarding State.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CARGO_UNIT).onleaveUnBoarding">CARGO_UNIT:onleaveUnBoarding(ToPointVec2, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_CARGO_UNIT).onleaveUnBoarding">AI_CARGO_UNIT:onleaveUnBoarding(Event, From, To, ToPointVec2)</a></td>
 		<td class="summary">
 <p>Leave UnBoarding State.</p>
 </td>
@@ -672,9 +662,79 @@ Use the event functions as described above to Load, UnLoad, Board, UnBoard the C
 		<dl class="function">
 <dt>
 
-		<em><a href="##(CARBO_BASE)">#CARBO_BASE</a></em>
-<a id="CARBO_BASE" >
-<strong>CARBO_BASE</strong>
+		<em><a href="##(AI_CARGO)">#AI_CARGO</a></em>
+<a id="AI_CARGO" >
+<strong>AI_CARGO</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AI_CARGO_GROUP)">#AI_CARGO_GROUP</a></em>
+<a id="AI_CARGO_GROUP" >
+<strong>AI_CARGO_GROUP</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AI_CARGO_GROUPED)">#AI_CARGO_GROUPED</a></em>
+<a id="AI_CARGO_GROUPED" >
+<strong>AI_CARGO_GROUPED</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AI_CARGO_PACKAGE)">#AI_CARGO_PACKAGE</a></em>
+<a id="AI_CARGO_PACKAGE" >
+<strong>AI_CARGO_PACKAGE</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AI_CARGO_REPRESENTABLE)">#AI_CARGO_REPRESENTABLE</a></em>
+<a id="AI_CARGO_REPRESENTABLE" >
+<strong>AI_CARGO_REPRESENTABLE</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(AI_CARGO_UNIT)">#AI_CARGO_UNIT</a></em>
+<a id="AI_CARGO_UNIT" >
+<strong>AI_CARGO_UNIT</strong>
 </a>
 </dt>
 <dd>
@@ -695,101 +755,17 @@ Use the event functions as described above to Load, UnLoad, Board, UnBoard the C
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(CARGO_GROUP)">#CARGO_GROUP</a></em>
-<a id="CARGO_GROUP" >
-<strong>CARGO_GROUP</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(CARGO_GROUPED)">#CARGO_GROUPED</a></em>
-<a id="CARGO_GROUPED" >
-<strong>CARGO_GROUPED</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(CARGO_PACKAGE)">#CARGO_PACKAGE</a></em>
-<a id="CARGO_PACKAGE" >
-<strong>CARGO_PACKAGE</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(CARGO_REPRESENTABLE)">#CARGO_REPRESENTABLE</a></em>
-<a id="CARGO_REPRESENTABLE" >
-<strong>CARGO_REPRESENTABLE</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(CARGO_UNIT)">#CARGO_UNIT</a></em>
-<a id="CARGO_UNIT" >
-<strong>CARGO_UNIT</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="FSMT" >
-<strong>FSMT</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 	<h2><a id="#(Cargo)" >Type <code>Cargo</code></a></h2>
 	
-			<h2><a id="#(CARBO_BASE)" >Type <code>CARBO_BASE</code></a></h2>
+			<h2><a id="#(AI_CARGO)" >Type <code>AI_CARGO</code></a></h2>
 				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).Board" >
-<strong>CARBO_BASE:Board(ToCarrier)</strong>
+<a id="#(AI_CARGO).Board" >
+<strong>AI_CARGO:Board(ToCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -804,7 +780,7 @@ The cargo must be in the <strong>UnLoaded</strong> state.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
 The Carrier that will hold the cargo.</p>
 
 				</li>
@@ -814,9 +790,9 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a></em>
-<a id="#(CARBO_BASE).CargoCarrier" >
-<strong>CARBO_BASE.CargoCarrier</strong>
+		<em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a></em>
+<a id="#(AI_CARGO).CargoCarrier" >
+<strong>AI_CARGO.CargoCarrier</strong>
 </a>
 </dt>
 <dd>
@@ -828,37 +804,23 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a></em>
-<a id="#(CARBO_BASE).CargoObject" >
-<strong>CARBO_BASE.CargoObject</strong>
+		<em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a></em>
+<a id="#(AI_CARGO).CargoObject" >
+<strong>AI_CARGO.CargoObject</strong>
 </a>
 </dt>
 <dd>
 	
 <p>The alive DCS object representing the cargo. This value can be nil, meaning, that the cargo is not represented anywhere...</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(CARBO_BASE).CargoScheduler" >
-<strong>CARBO_BASE.CargoScheduler</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(CARBO_BASE).ClassName" >
-<strong>CARBO_BASE.ClassName</strong>
+<a id="#(AI_CARGO).ClassName" >
+<strong>AI_CARGO.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -871,8 +833,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#boolean</em>
-<a id="#(CARBO_BASE).Containable" >
-<strong>CARBO_BASE.Containable</strong>
+<a id="#(AI_CARGO).Containable" >
+<strong>AI_CARGO.Containable</strong>
 </a>
 </dt>
 <dd>
@@ -884,8 +846,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).IsNear" >
-<strong>CARBO_BASE:IsNear(PointVec2)</strong>
+<a id="#(AI_CARGO).IsNear" >
+<strong>AI_CARGO:IsNear(PointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -896,7 +858,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> PointVec2 </em></code>: </p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> PointVec2 </em></code>: </p>
 
 				</li>
 		</ul>
@@ -910,8 +872,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).Load" >
-<strong>CARBO_BASE:Load(ToCarrier)</strong>
+<a id="#(AI_CARGO).Load" >
+<strong>AI_CARGO:Load(ToCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -926,7 +888,7 @@ The cargo must be in the <strong>UnLoaded</strong> state.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
 The Carrier that will hold the cargo.</p>
 
 				</li>
@@ -937,8 +899,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#boolean</em>
-<a id="#(CARBO_BASE).Moveable" >
-<strong>CARBO_BASE.Moveable</strong>
+<a id="#(AI_CARGO).Moveable" >
+<strong>AI_CARGO.Moveable</strong>
 </a>
 </dt>
 <dd>
@@ -951,8 +913,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#string</em>
-<a id="#(CARBO_BASE).Name" >
-<strong>CARBO_BASE.Name</strong>
+<a id="#(AI_CARGO).Name" >
+<strong>AI_CARGO.Name</strong>
 </a>
 </dt>
 <dd>
@@ -965,8 +927,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#number</em>
-<a id="#(CARBO_BASE).NearRadius" >
-<strong>CARBO_BASE.NearRadius</strong>
+<a id="#(AI_CARGO).NearRadius" >
+<strong>AI_CARGO.NearRadius</strong>
 </a>
 </dt>
 <dd>
@@ -978,13 +940,13 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).New" >
-<strong>CARBO_BASE:New(Type, Name, Weight, ReportRadius, NearRadius)</strong>
+<a id="#(AI_CARGO).New" >
+<strong>AI_CARGO:New(Type, Name, Weight, ReportRadius, NearRadius)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>CARBO_BASE Constructor.</p>
+<p>AI_CARGO Constructor.</p>
 
 	
 <p>This class is an abstract class and should not be instantiated.</p>
@@ -1021,7 +983,7 @@ The Carrier that will hold the cargo.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARBO_BASE)">#CARBO_BASE</a>:</em></p>
+<p><em><a href="##(AI_CARGO)">#AI_CARGO</a>:</em></p>
 
 
 </dd>
@@ -1029,8 +991,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnAfterBoarding" >
-<strong>CARBO_BASE:OnAfterBoarding(Controllable)</strong>
+<a id="#(AI_CARGO).OnAfterBoarding" >
+<strong>AI_CARGO:OnAfterBoarding(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1041,7 +1003,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1050,8 +1012,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnAfterLoaded" >
-<strong>CARBO_BASE:OnAfterLoaded(Controllable)</strong>
+<a id="#(AI_CARGO).OnAfterLoaded" >
+<strong>AI_CARGO:OnAfterLoaded(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1062,7 +1024,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1071,8 +1033,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnAfterUnBoarding" >
-<strong>CARBO_BASE:OnAfterUnBoarding(Controllable)</strong>
+<a id="#(AI_CARGO).OnAfterUnBoarding" >
+<strong>AI_CARGO:OnAfterUnBoarding(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1083,7 +1045,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1092,8 +1054,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnAfterUnLoaded" >
-<strong>CARBO_BASE:OnAfterUnLoaded(Controllable)</strong>
+<a id="#(AI_CARGO).OnAfterUnLoaded" >
+<strong>AI_CARGO:OnAfterUnLoaded(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1104,7 +1066,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1113,8 +1075,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnBeforeBoarding" >
-<strong>CARBO_BASE:OnBeforeBoarding(Controllable)</strong>
+<a id="#(AI_CARGO).OnBeforeBoarding" >
+<strong>AI_CARGO:OnBeforeBoarding(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1125,7 +1087,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1139,8 +1101,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnBeforeLoaded" >
-<strong>CARBO_BASE:OnBeforeLoaded(Controllable)</strong>
+<a id="#(AI_CARGO).OnBeforeLoaded" >
+<strong>AI_CARGO:OnBeforeLoaded(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1151,7 +1113,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1165,8 +1127,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnBeforeUnBoarding" >
-<strong>CARBO_BASE:OnBeforeUnBoarding(Controllable)</strong>
+<a id="#(AI_CARGO).OnBeforeUnBoarding" >
+<strong>AI_CARGO:OnBeforeUnBoarding(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1177,7 +1139,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1191,8 +1153,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).OnBeforeUnLoaded" >
-<strong>CARBO_BASE:OnBeforeUnLoaded(Controllable)</strong>
+<a id="#(AI_CARGO).OnBeforeUnLoaded" >
+<strong>AI_CARGO:OnBeforeUnLoaded(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -1203,7 +1165,7 @@ The Carrier that will hold the cargo.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1218,8 +1180,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#number</em>
-<a id="#(CARBO_BASE).ReportRadius" >
-<strong>CARBO_BASE.ReportRadius</strong>
+<a id="#(AI_CARGO).ReportRadius" >
+<strong>AI_CARGO.ReportRadius</strong>
 </a>
 </dt>
 <dd>
@@ -1232,8 +1194,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#boolean</em>
-<a id="#(CARBO_BASE).Representable" >
-<strong>CARBO_BASE.Representable</strong>
+<a id="#(AI_CARGO).Representable" >
+<strong>AI_CARGO.Representable</strong>
 </a>
 </dt>
 <dd>
@@ -1246,8 +1208,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#boolean</em>
-<a id="#(CARBO_BASE).Slingloadable" >
-<strong>CARBO_BASE.Slingloadable</strong>
+<a id="#(AI_CARGO).Slingloadable" >
+<strong>AI_CARGO.Slingloadable</strong>
 </a>
 </dt>
 <dd>
@@ -1259,13 +1221,13 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).Spawn" >
-<strong>CARBO_BASE:Spawn(PointVec2)</strong>
+<a id="#(AI_CARGO).Spawn" >
+<strong>AI_CARGO:Spawn(PointVec2)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Template method to spawn a new representation of the CARBO_BASE in the simulator.</p>
+<p>Template method to spawn a new representation of the AI_CARGO in the simulator.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -1277,7 +1239,7 @@ The Carrier that will hold the cargo.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARBO_BASE)">#CARBO_BASE</a>:</em></p>
+<p><em><a href="##(AI_CARGO)">#AI_CARGO</a>:</em></p>
 
 
 </dd>
@@ -1286,8 +1248,8 @@ The Carrier that will hold the cargo.</p>
 <dt>
 
 		<em>#string</em>
-<a id="#(CARBO_BASE).Type" >
-<strong>CARBO_BASE.Type</strong>
+<a id="#(AI_CARGO).Type" >
+<strong>AI_CARGO.Type</strong>
 </a>
 </dt>
 <dd>
@@ -1299,8 +1261,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).UnBoard" >
-<strong>CARBO_BASE:UnBoard(ToPointVec2)</strong>
+<a id="#(AI_CARGO).UnBoard" >
+<strong>AI_CARGO:UnBoard(ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -1315,8 +1277,8 @@ The cargo must be in the <strong>Loaded</strong> state.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
-(optional) @{Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.</p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
+(optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.</p>
 
 				</li>
 		</ul>
@@ -1325,8 +1287,8 @@ The cargo must be in the <strong>Loaded</strong> state.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).UnLoad" >
-<strong>CARBO_BASE:UnLoad(ToPointVec2)</strong>
+<a id="#(AI_CARGO).UnLoad" >
+<strong>AI_CARGO:UnLoad(ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -1341,8 +1303,8 @@ The cargo must be in the <strong>Loaded</strong> state.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
-(optional) @{Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.</p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
+(optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.</p>
 
 				</li>
 		</ul>
@@ -1352,8 +1314,8 @@ The cargo must be in the <strong>Loaded</strong> state.</p>
 <dt>
 
 		<em>#number</em>
-<a id="#(CARBO_BASE).Weight" >
-<strong>CARBO_BASE.Weight</strong>
+<a id="#(AI_CARGO).Weight" >
+<strong>AI_CARGO.Weight</strong>
 </a>
 </dt>
 <dd>
@@ -1365,8 +1327,8 @@ The cargo must be in the <strong>Loaded</strong> state.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).__Board" >
-<strong>CARBO_BASE:__Board(DelaySeconds, ToCarrier)</strong>
+<a id="#(AI_CARGO).__Board" >
+<strong>AI_CARGO:__Board(DelaySeconds, ToCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -1387,7 +1349,7 @@ The amount of seconds to delay the action.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
 The Carrier that will hold the cargo.</p>
 
 				</li>
@@ -1397,8 +1359,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).__Load" >
-<strong>CARBO_BASE:__Load(DelaySeconds, ToCarrier)</strong>
+<a id="#(AI_CARGO).__Load" >
+<strong>AI_CARGO:__Load(DelaySeconds, ToCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -1419,7 +1381,7 @@ The amount of seconds to delay the action.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ToCarrier </em></code>: 
 The Carrier that will hold the cargo.</p>
 
 				</li>
@@ -1429,8 +1391,8 @@ The Carrier that will hold the cargo.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).__UnBoard" >
-<strong>CARBO_BASE:__UnBoard(DelaySeconds, ToPointVec2)</strong>
+<a id="#(AI_CARGO).__UnBoard" >
+<strong>AI_CARGO:__UnBoard(DelaySeconds, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -1451,8 +1413,8 @@ The amount of seconds to delay the action.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
-(optional) @{Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.</p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
+(optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.</p>
 
 				</li>
 		</ul>
@@ -1461,8 +1423,8 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARBO_BASE).__UnLoad" >
-<strong>CARBO_BASE:__UnLoad(DelaySeconds, ToPointVec2)</strong>
+<a id="#(AI_CARGO).__UnLoad" >
+<strong>AI_CARGO:__UnLoad(DelaySeconds, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -1483,24 +1445,24 @@ The amount of seconds to delay the action.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
-(optional) @{Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.</p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: 
+(optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.</p>
 
 				</li>
 		</ul>
 </dd>
 </dl>
 
-			<h2><a id="#(CARBO_BASE.CargoObjects)" >Type <code>CARBO_BASE.CargoObjects</code></a></h2>
+			<h2><a id="#(AI_CARGO.CargoObjects)" >Type <code>AI_CARGO.CargoObjects</code></a></h2>
 			
-			<h2><a id="#(CARGO_GROUP)" >Type <code>CARGO_GROUP</code></a></h2>
+			<h2><a id="#(AI_CARGO_GROUP)" >Type <code>AI_CARGO_GROUP</code></a></h2>
 				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em><a href="Set.html##(SET_BASE)">Set#SET_BASE</a></em>
-<a id="#(CARGO_GROUP).CargoSet" >
-<strong>CARGO_GROUP.CargoSet</strong>
+<a id="#(AI_CARGO_GROUP).CargoSet" >
+<strong>AI_CARGO_GROUP.CargoSet</strong>
 </a>
 </dt>
 <dd>
@@ -1513,8 +1475,8 @@ The amount of seconds to delay the action.</p>
 <dt>
 
 		<em>#string</em>
-<a id="#(CARGO_GROUP).ClassName" >
-<strong>CARGO_GROUP.ClassName</strong>
+<a id="#(AI_CARGO_GROUP).ClassName" >
+<strong>AI_CARGO_GROUP.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -1527,8 +1489,8 @@ The amount of seconds to delay the action.</p>
 <dt>
 
 		<em>#string</em>
-<a id="#(CARGO_GROUP).Name" >
-<strong>CARGO_GROUP.Name</strong>
+<a id="#(AI_CARGO_GROUP).Name" >
+<strong>AI_CARGO_GROUP.Name</strong>
 </a>
 </dt>
 <dd>
@@ -1540,19 +1502,19 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUP).New" >
-<strong>CARGO_GROUP:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</strong>
+<a id="#(AI_CARGO_GROUP).New" >
+<strong>AI_CARGO_GROUP:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>CARGO_GROUP constructor.</p>
+<p>AI<em>CARGO</em>GROUP constructor.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Set.html##(Set_BASE)">Set#Set_BASE</a> CargoSet </em></code>: </p>
+<p><code><em><a href="Core.Set.html##(Set_BASE)">Core.Set#Set_BASE</a> CargoSet </em></code>: </p>
 
 				</li>
 				<li>
@@ -1585,20 +1547,20 @@ The amount of seconds to delay the action.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARGO_GROUP)">#CARGO_GROUP</a>:</em></p>
+<p><em><a href="##(AI_CARGO_GROUP)">#AI<em>CARGO</em>GROUP</a>:</em></p>
 
 
 </dd>
 </dl>
 
-			<h2><a id="#(CARGO_GROUPED)" >Type <code>CARGO_GROUPED</code></a></h2>
+			<h2><a id="#(AI_CARGO_GROUPED)" >Type <code>AI_CARGO_GROUPED</code></a></h2>
 				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(CARGO_GROUPED).ClassName" >
-<strong>CARGO_GROUPED.ClassName</strong>
+<a id="#(AI_CARGO_GROUPED).ClassName" >
+<strong>AI_CARGO_GROUPED.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -1610,19 +1572,19 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).New" >
-<strong>CARGO_GROUPED:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</strong>
+<a id="#(AI_CARGO_GROUPED).New" >
+<strong>AI_CARGO_GROUPED:New(CargoSet, Type, Name, Weight, ReportRadius, NearRadius)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>CARGO_GROUPED constructor.</p>
+<p>AI<em>CARGO</em>GROUPED constructor.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Set.html##(Set_BASE)">Set#Set_BASE</a> CargoSet </em></code>: </p>
+<p><code><em><a href="Core.Set.html##(Set_BASE)">Core.Set#Set_BASE</a> CargoSet </em></code>: </p>
 
 				</li>
 				<li>
@@ -1655,7 +1617,7 @@ The amount of seconds to delay the action.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARGO_GROUPED)">#CARGO_GROUPED</a>:</em></p>
+<p><em><a href="##(AI_CARGO_GROUPED)">#AI<em>CARGO</em>GROUPED</a>:</em></p>
 
 
 </dd>
@@ -1663,8 +1625,8 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onafterUnBoarding" >
-<strong>CARGO_GROUPED:onafterUnBoarding(ToPointVec2, Event, From, To)</strong>
+<a id="#(AI_CARGO_GROUPED).onafterUnBoarding" >
+<strong>AI_CARGO_GROUPED:onafterUnBoarding(ToPointVec2, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -1675,7 +1637,7 @@ The amount of seconds to delay the action.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
 
 				</li>
 				<li>
@@ -1699,8 +1661,8 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onenterBoarding" >
-<strong>CARGO_GROUPED:onenterBoarding(CargoCarrier, Event, From, To)</strong>
+<a id="#(AI_CARGO_GROUPED).onenterBoarding" >
+<strong>AI_CARGO_GROUPED:onenterBoarding(CargoCarrier, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -1711,7 +1673,7 @@ The amount of seconds to delay the action.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -1735,8 +1697,8 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onenterLoaded" >
-<strong>CARGO_GROUPED:onenterLoaded(CargoCarrier, Event, From, To)</strong>
+<a id="#(AI_CARGO_GROUPED).onenterLoaded" >
+<strong>AI_CARGO_GROUPED:onenterLoaded(CargoCarrier, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -1747,7 +1709,7 @@ The amount of seconds to delay the action.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -1771,8 +1733,8 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onenterUnBoarding" >
-<strong>CARGO_GROUPED:onenterUnBoarding(ToPointVec2, Event, From, To)</strong>
+<a id="#(AI_CARGO_GROUPED).onenterUnBoarding" >
+<strong>AI_CARGO_GROUPED:onenterUnBoarding(ToPointVec2, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -1783,7 +1745,7 @@ The amount of seconds to delay the action.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
 
 				</li>
 				<li>
@@ -1807,8 +1769,8 @@ The amount of seconds to delay the action.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onenterUnLoaded" >
-<strong>CARGO_GROUPED:onenterUnLoaded(Point, Event, From, To, ToPointVec2)</strong>
+<a id="#(AI_CARGO_GROUPED).onenterUnLoaded" >
+<strong>AI_CARGO_GROUPED:onenterUnLoaded(Core, Event, From, To, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -1819,8 +1781,8 @@ The amount of seconds to delay the action.</p>
 		<ul>
 				<li>
 				
-<p><code><em> Point </em></code>: 
-POINT_VEC2</p>
+<p><code><em> Core </em></code>: 
+Point#POINT_VEC2</p>
 
 				</li>
 				<li>
@@ -1849,8 +1811,8 @@ POINT_VEC2</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onleaveBoarding" >
-<strong>CARGO_GROUPED:onleaveBoarding(CargoCarrier, Event, From, To)</strong>
+<a id="#(AI_CARGO_GROUPED).onleaveBoarding" >
+<strong>AI_CARGO_GROUPED:onleaveBoarding(CargoCarrier, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -1861,7 +1823,7 @@ POINT_VEC2</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -1885,8 +1847,8 @@ POINT_VEC2</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_GROUPED).onleaveUnBoarding" >
-<strong>CARGO_GROUPED:onleaveUnBoarding(ToPointVec2, Event, From, To)</strong>
+<a id="#(AI_CARGO_GROUPED).onleaveUnBoarding" >
+<strong>AI_CARGO_GROUPED:onleaveUnBoarding(ToPointVec2, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -1897,7 +1859,7 @@ POINT_VEC2</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
 
 				</li>
 				<li>
@@ -1919,14 +1881,14 @@ POINT_VEC2</p>
 </dd>
 </dl>
 
-			<h2><a id="#(CARGO_PACKAGE)" >Type <code>CARGO_PACKAGE</code></a></h2>
+			<h2><a id="#(AI_CARGO_PACKAGE)" >Type <code>AI_CARGO_PACKAGE</code></a></h2>
 				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em></em>
-<a id="#(CARGO_PACKAGE).CargoCarrier" >
-<strong>CARGO_PACKAGE.CargoCarrier</strong>
+<a id="#(AI_CARGO_PACKAGE).CargoCarrier" >
+<strong>AI_CARGO_PACKAGE.CargoCarrier</strong>
 </a>
 </dt>
 <dd>
@@ -1939,8 +1901,8 @@ POINT_VEC2</p>
 <dt>
 
 		<em></em>
-<a id="#(CARGO_PACKAGE).CargoInAir" >
-<strong>CARGO_PACKAGE.CargoInAir</strong>
+<a id="#(AI_CARGO_PACKAGE).CargoInAir" >
+<strong>AI_CARGO_PACKAGE.CargoInAir</strong>
 </a>
 </dt>
 <dd>
@@ -1953,8 +1915,8 @@ POINT_VEC2</p>
 <dt>
 
 		<em>#string</em>
-<a id="#(CARGO_PACKAGE).ClassName" >
-<strong>CARGO_PACKAGE.ClassName</strong>
+<a id="#(AI_CARGO_PACKAGE).ClassName" >
+<strong>AI_CARGO_PACKAGE.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -1966,8 +1928,8 @@ POINT_VEC2</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).IsNear" >
-<strong>CARGO_PACKAGE:IsNear(CargoCarrier)</strong>
+<a id="#(AI_CARGO_PACKAGE).IsNear" >
+<strong>AI_CARGO_PACKAGE:IsNear(CargoCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -1978,7 +1940,7 @@ POINT_VEC2</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1992,19 +1954,19 @@ POINT_VEC2</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).New" >
-<strong>CARGO_PACKAGE:New(CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius)</strong>
+<a id="#(AI_CARGO_PACKAGE).New" >
+<strong>AI_CARGO_PACKAGE:New(CargoCarrier, Type, Name, Weight, ReportRadius, NearRadius)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>CARGO_PACKAGE Constructor.</p>
+<p>AI<em>CARGO</em>PACKAGE Constructor.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: 
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: 
 The UNIT carrying the package.</p>
 
 				</li>
@@ -2038,7 +2000,7 @@ The UNIT carrying the package.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARGO_PACKAGE)">#CARGO_PACKAGE</a>:</em></p>
+<p><em><a href="##(AI_CARGO_PACKAGE)">#AI<em>CARGO</em>PACKAGE</a>:</em></p>
 
 
 </dd>
@@ -2046,8 +2008,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).onafterLoad" >
-<strong>CARGO_PACKAGE:onafterLoad(FsmP, Event, From, To, CargoCarrier, Speed, LoadDistance, Angle)</strong>
+<a id="#(AI_CARGO_PACKAGE).onafterLoad" >
+<strong>AI_CARGO_PACKAGE:onafterLoad(Event, From, To, CargoCarrier, Speed, LoadDistance, Angle)</strong>
 </a>
 </dt>
 <dd>
@@ -2058,11 +2020,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> FsmP </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2078,7 +2035,7 @@ The UNIT carrying the package.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -2102,8 +2059,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).onafterOnBoard" >
-<strong>CARGO_PACKAGE:onafterOnBoard(FsmP, Event, From, To, CargoCarrier, Speed, BoardDistance, Angle, LoadDistance)</strong>
+<a id="#(AI_CARGO_PACKAGE).onafterOnBoard" >
+<strong>AI_CARGO_PACKAGE:onafterOnBoard(Event, From, To, CargoCarrier, Speed, BoardDistance, Angle, LoadDistance)</strong>
 </a>
 </dt>
 <dd>
@@ -2114,11 +2071,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> FsmP </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2134,7 +2086,7 @@ The UNIT carrying the package.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -2163,8 +2115,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).onafterOnBoarded" >
-<strong>CARGO_PACKAGE:onafterOnBoarded(FsmP, Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle)</strong>
+<a id="#(AI_CARGO_PACKAGE).onafterOnBoarded" >
+<strong>AI_CARGO_PACKAGE:onafterOnBoarded(Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle)</strong>
 </a>
 </dt>
 <dd>
@@ -2175,11 +2127,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> FsmP </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2195,7 +2142,7 @@ The UNIT carrying the package.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -2224,8 +2171,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).onafterUnBoard" >
-<strong>CARGO_PACKAGE:onafterUnBoard(FsmP, Event, From, To, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle, CargoCarrier)</strong>
+<a id="#(AI_CARGO_PACKAGE).onafterUnBoard" >
+<strong>AI_CARGO_PACKAGE:onafterUnBoard(Event, From, To, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle, CargoCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -2236,11 +2183,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> FsmP </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2290,8 +2232,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).onafterUnBoarded" >
-<strong>CARGO_PACKAGE:onafterUnBoarded(FsmP, Event, From, To, CargoCarrier, Speed)</strong>
+<a id="#(AI_CARGO_PACKAGE).onafterUnBoarded" >
+<strong>AI_CARGO_PACKAGE:onafterUnBoarded(Event, From, To, CargoCarrier, Speed)</strong>
 </a>
 </dt>
 <dd>
@@ -2302,11 +2244,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> FsmP </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2322,7 +2259,7 @@ The UNIT carrying the package.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
 
 				</li>
 				<li>
@@ -2336,8 +2273,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_PACKAGE).onafterUnLoad" >
-<strong>CARGO_PACKAGE:onafterUnLoad(FsmP, Event, From, To, Distance, Angle, CargoCarrier, Speed)</strong>
+<a id="#(AI_CARGO_PACKAGE).onafterUnLoad" >
+<strong>AI_CARGO_PACKAGE:onafterUnLoad(Event, From, To, Distance, Angle, CargoCarrier, Speed)</strong>
 </a>
 </dt>
 <dd>
@@ -2348,11 +2285,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> FsmP </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2390,14 +2322,14 @@ The UNIT carrying the package.</p>
 </dd>
 </dl>
 
-			<h2><a id="#(CARGO_REPRESENTABLE)" >Type <code>CARGO_REPRESENTABLE</code></a></h2>
+			<h2><a id="#(AI_CARGO_REPRESENTABLE)" >Type <code>AI_CARGO_REPRESENTABLE</code></a></h2>
 				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(CARGO_REPRESENTABLE).ClassName" >
-<strong>CARGO_REPRESENTABLE.ClassName</strong>
+<a id="#(AI_CARGO_REPRESENTABLE).ClassName" >
+<strong>AI_CARGO_REPRESENTABLE.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -2409,19 +2341,19 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_REPRESENTABLE).New" >
-<strong>CARGO_REPRESENTABLE:New(CargoObject, Type, Name, Weight, ReportRadius, NearRadius)</strong>
+<a id="#(AI_CARGO_REPRESENTABLE).New" >
+<strong>AI_CARGO_REPRESENTABLE:New(CargoObject, Type, Name, Weight, ReportRadius, NearRadius)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>CARGO_REPRESENTABLE Constructor.</p>
+<p>AI<em>CARGO</em>REPRESENTABLE Constructor.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(Controllable)">Controllable#Controllable</a> CargoObject </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(Controllable)">Wrapper.Controllable#Controllable</a> CargoObject </em></code>: </p>
 
 				</li>
 				<li>
@@ -2454,7 +2386,7 @@ The UNIT carrying the package.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARGO_REPRESENTABLE)">#CARGO_REPRESENTABLE</a>:</em></p>
+<p><em><a href="##(AI_CARGO_REPRESENTABLE)">#AI<em>CARGO</em>REPRESENTABLE</a>:</em></p>
 
 
 </dd>
@@ -2462,8 +2394,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_REPRESENTABLE).RouteTo" >
-<strong>CARGO_REPRESENTABLE:RouteTo(ToPointVec2, Speed)</strong>
+<a id="#(AI_CARGO_REPRESENTABLE).RouteTo" >
+<strong>AI_CARGO_REPRESENTABLE:RouteTo(ToPointVec2, Speed)</strong>
 </a>
 </dt>
 <dd>
@@ -2474,7 +2406,7 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
 
 				</li>
 				<li>
@@ -2485,19 +2417,20 @@ The UNIT carrying the package.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARGO_REPRESENTABLE)">#CARGO_REPRESENTABLE</a>:</em></p>
+<p><em><a href="##(AI_CARGO_REPRESENTABLE)">#AI<em>CARGO</em>REPRESENTABLE</a>:</em></p>
 
 
 </dd>
 </dl>
 
-			<h2><a id="#(CARGO_UNIT)" >Type <code>CARGO_UNIT</code></a></h2>
+			<h2><a id="#(AI_CARGO_UNIT)" >Type <code>AI_CARGO_UNIT</code></a></h2>
 				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).CargoCarrier" >
-<strong>CARGO_UNIT.CargoCarrier</strong>
+		<em></em>
+<a id="#(AI_CARGO_UNIT).CargoCarrier" >
+<strong>AI_CARGO_UNIT.CargoCarrier</strong>
 </a>
 </dt>
 <dd>
@@ -2510,8 +2443,8 @@ The UNIT carrying the package.</p>
 <dt>
 
 		<em></em>
-<a id="#(CARGO_UNIT).CargoInAir" >
-<strong>CARGO_UNIT.CargoInAir</strong>
+<a id="#(AI_CARGO_UNIT).CargoInAir" >
+<strong>AI_CARGO_UNIT.CargoInAir</strong>
 </a>
 </dt>
 <dd>
@@ -2524,8 +2457,8 @@ The UNIT carrying the package.</p>
 <dt>
 
 		<em></em>
-<a id="#(CARGO_UNIT).CargoObject" >
-<strong>CARGO_UNIT.CargoObject</strong>
+<a id="#(AI_CARGO_UNIT).CargoObject" >
+<strong>AI_CARGO_UNIT.CargoObject</strong>
 </a>
 </dt>
 <dd>
@@ -2538,8 +2471,8 @@ The UNIT carrying the package.</p>
 <dt>
 
 		<em>#string</em>
-<a id="#(CARGO_UNIT).ClassName" >
-<strong>CARGO_UNIT.ClassName</strong>
+<a id="#(AI_CARGO_UNIT).ClassName" >
+<strong>AI_CARGO_UNIT.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -2551,19 +2484,19 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).New" >
-<strong>CARGO_UNIT:New(CargoUnit, Type, Name, Weight, ReportRadius, NearRadius)</strong>
+<a id="#(AI_CARGO_UNIT).New" >
+<strong>AI_CARGO_UNIT:New(CargoUnit, Type, Name, Weight, ReportRadius, NearRadius)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>CARGO_UNIT Constructor.</p>
+<p>AI<em>CARGO</em>UNIT Constructor.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -2596,7 +2529,7 @@ The UNIT carrying the package.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(CARGO_UNIT)">#CARGO_UNIT</a>:</em></p>
+<p><em><a href="##(AI_CARGO_UNIT)">#AI<em>CARGO</em>UNIT</a>:</em></p>
 
 
 </dd>
@@ -2604,8 +2537,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).OnUnLoadedCallBack" >
-<strong>CARGO_UNIT.OnUnLoadedCallBack</strong>
+<a id="#(AI_CARGO_UNIT).OnUnLoadedCallBack" >
+<strong>AI_CARGO_UNIT.OnUnLoadedCallBack</strong>
 </a>
 </dt>
 <dd>
@@ -2617,8 +2550,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onafterBoard" >
-<strong>CARGO_UNIT:onafterBoard(Event, From, To, CargoCarrier)</strong>
+<a id="#(AI_CARGO_UNIT).onafterBoard" >
+<strong>AI_CARGO_UNIT:onafterBoard(Event, From, To, CargoCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -2653,8 +2586,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onafterUnBoarding" >
-<strong>CARGO_UNIT:onafterUnBoarding(ToPointVec2, Event, From, To)</strong>
+<a id="#(AI_CARGO_UNIT).onafterUnBoarding" >
+<strong>AI_CARGO_UNIT:onafterUnBoarding(Event, From, To, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -2665,11 +2598,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2682,6 +2610,11 @@ The UNIT carrying the package.</p>
 				
 <p><code><em>#string To </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+
 				</li>
 		</ul>
 </dd>
@@ -2689,8 +2622,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onenterBoarding" >
-<strong>CARGO_UNIT:onenterBoarding(CargoCarrier, Event, From, To)</strong>
+<a id="#(AI_CARGO_UNIT).onenterBoarding" >
+<strong>AI_CARGO_UNIT:onenterBoarding(Event, From, To, CargoCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -2701,11 +2634,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2718,6 +2646,11 @@ The UNIT carrying the package.</p>
 				
 <p><code><em>#string To </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
+
 				</li>
 		</ul>
 </dd>
@@ -2725,8 +2658,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onenterLoaded" >
-<strong>CARGO_UNIT:onenterLoaded(CargoCarrier, Event, From, To)</strong>
+<a id="#(AI_CARGO_UNIT).onenterLoaded" >
+<strong>AI_CARGO_UNIT:onenterLoaded(Event, From, To, CargoCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -2737,11 +2670,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2754,6 +2682,11 @@ The UNIT carrying the package.</p>
 				
 <p><code><em>#string To </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
+
 				</li>
 		</ul>
 </dd>
@@ -2761,8 +2694,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onenterUnBoarding" >
-<strong>CARGO_UNIT:onenterUnBoarding(ToPointVec2, Event, From, To)</strong>
+<a id="#(AI_CARGO_UNIT).onenterUnBoarding" >
+<strong>AI_CARGO_UNIT:onenterUnBoarding(Event, From, To, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -2773,11 +2706,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2790,6 +2718,11 @@ The UNIT carrying the package.</p>
 				
 <p><code><em>#string To </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+
 				</li>
 		</ul>
 </dd>
@@ -2797,8 +2730,8 @@ The UNIT carrying the package.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onenterUnLoaded" >
-<strong>CARGO_UNIT:onenterUnLoaded(Point, Event, From, To, ToPointVec2)</strong>
+<a id="#(AI_CARGO_UNIT).onenterUnLoaded" >
+<strong>AI_CARGO_UNIT:onenterUnLoaded(Event, From, To, Core, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -2809,12 +2742,6 @@ The UNIT carrying the package.</p>
 		<ul>
 				<li>
 				
-<p><code><em> Point </em></code>: 
-POINT_VEC2</p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2830,6 +2757,12 @@ POINT_VEC2</p>
 				</li>
 				<li>
 				
+<p><code><em> Core </em></code>: 
+Point#POINT_VEC2</p>
+
+				</li>
+				<li>
+				
 <p><code><em> ToPointVec2 </em></code>: </p>
 
 				</li>
@@ -2839,8 +2772,8 @@ POINT_VEC2</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onleaveBoarding" >
-<strong>CARGO_UNIT:onleaveBoarding(CargoCarrier, Event, From, To)</strong>
+<a id="#(AI_CARGO_UNIT).onleaveBoarding" >
+<strong>AI_CARGO_UNIT:onleaveBoarding(Event, From, To, CargoCarrier)</strong>
 </a>
 </dt>
 <dd>
@@ -2851,11 +2784,6 @@ POINT_VEC2</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> CargoCarrier </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2868,6 +2796,11 @@ POINT_VEC2</p>
 				
 <p><code><em>#string To </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> CargoCarrier </em></code>: </p>
+
 				</li>
 		</ul>
 </dd>
@@ -2875,8 +2808,8 @@ POINT_VEC2</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CARGO_UNIT).onleaveUnBoarding" >
-<strong>CARGO_UNIT:onleaveUnBoarding(ToPointVec2, Event, From, To)</strong>
+<a id="#(AI_CARGO_UNIT).onleaveUnBoarding" >
+<strong>AI_CARGO_UNIT:onleaveUnBoarding(Event, From, To, ToPointVec2)</strong>
 </a>
 </dt>
 <dd>
@@ -2887,11 +2820,6 @@ POINT_VEC2</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
-
-				</li>
-				<li>
-				
 <p><code><em>#string Event </em></code>: </p>
 
 				</li>
@@ -2904,6 +2832,11 @@ POINT_VEC2</p>
 				
 <p><code><em>#string To </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> ToPointVec2 </em></code>: </p>
+
 				</li>
 		</ul>
 </dd>
diff --git a/Moose Training/Documentation/CleanUp.html b/Moose Training/Documentation/CleanUp.html
index 02d619cea..ae98a5943 100644
--- a/Moose Training/Documentation/CleanUp.html	
+++ b/Moose Training/Documentation/CleanUp.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<li><a href="Cargo.html">Cargo</a></li>
 					<li>CleanUp</li>
 					<li><a href="Client.html">Client</a></li>
+					<li><a href="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -132,7 +134,7 @@
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CLEANUP)._AddForCleanUp">CLEANUP:_AddForCleanUp(CleanUpUnit, CleanUpUnitName)</a></td>
 		<td class="summary">
-<p>Add the <a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> to the CleanUpList for CleanUp.</p>
+<p>Add the <a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> to the CleanUpList for CleanUp.</p>
 </td>
 		</tr>
 		<tr>
@@ -156,7 +158,7 @@
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CLEANUP)._DestroyUnit">CLEANUP:_DestroyUnit(CleanUpUnit, CleanUpUnitName)</a></td>
 		<td class="summary">
-<p>Destroys a <a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> from the simulator, but checks first if it is still existing!</p>
+<p>Destroys a <a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> from the simulator, but checks first if it is still existing!</p>
 </td>
 		</tr>
 		<tr>
@@ -304,7 +306,7 @@
 </dt>
 <dd>
 	
-<p>Add the <a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> to the CleanUpList for CleanUp.</p>
+<p>Add the <a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> to the CleanUpList for CleanUp.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -349,7 +351,7 @@
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a> GroupObject </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Group.html##(Group)">Dcs.DCSWrapper.Group#Group</a> GroupObject </em></code>: 
 The object to be destroyed.</p>
 
 				</li>
@@ -374,10 +376,10 @@ The groupname...</p>
 
 
 	
-<p> TODO check DCSTypes#Weapon
+<p> TODO check Dcs.DCSTypes#Weapon
 - Destroys a missile from the simulator, but checks first if it is still existing!
  @param #CLEANUP self
- @param DCSTypes#Weapon MissileObject</p>
+ @param Dcs.DCSTypes#Weapon MissileObject</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -398,13 +400,13 @@ The groupname...</p>
 </dt>
 <dd>
 	
-<p>Destroys a <a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> from the simulator, but checks first if it is still existing!</p>
+<p>Destroys a <a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> from the simulator, but checks first if it is still existing!</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> CleanUpUnit </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> CleanUpUnit </em></code>: 
 The object to be destroyed.</p>
 
 				</li>
@@ -435,7 +437,7 @@ The Unit name ...</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Event)">DCSTypes#Event</a> event </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Event)">Dcs.DCSTypes#Event</a> event </em></code>: </p>
 
 				</li>
 				<li>
@@ -464,7 +466,7 @@ The Unit name ...</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Event)">DCSTypes#Event</a> event </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Event)">Dcs.DCSTypes#Event</a> event </em></code>: </p>
 
 				</li>
 				<li>
@@ -493,7 +495,7 @@ The Unit name ...</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Event)">DCSTypes#Event</a> event </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Event)">Dcs.DCSTypes#Event</a> event </em></code>: </p>
 
 				</li>
 				<li>
@@ -522,7 +524,7 @@ The Unit name ...</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Event)">DCSTypes#Event</a> event </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Event)">Dcs.DCSTypes#Event</a> event </em></code>: </p>
 
 				</li>
 				<li>
diff --git a/Moose Training/Documentation/Client.html b/Moose Training/Documentation/Client.html
index de5906425..3723140d2 100644
--- a/Moose Training/Documentation/Client.html	
+++ b/Moose Training/Documentation/Client.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<li><a href="Cargo.html">Cargo</a></li>
 					<li><a href="CleanUp.html">CleanUp</a></li>
 					<li>Client</li>
+					<li><a href="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,10 +89,10 @@
 
    
 
-<h1>1) <a href="Client.html##(CLIENT)">Client#CLIENT</a> class, extends <a href="Unit.html##(UNIT)">Unit#UNIT</a></h1>
+<h1>1) <a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> class, extends <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></h1>
 <p>Clients are those <strong>Units</strong> defined within the Mission Editor that have the skillset defined as <strong>Client</strong> or <strong>Player</strong>.
 Note that clients are NOT the same as Units, they are NOT necessarily alive.
-The <a href="Client.html##(CLIENT)">Client#CLIENT</a> class is a wrapper class to handle the DCS Unit objects that have the skillset defined as <strong>Client</strong> or <strong>Player</strong>:</p>
+The <a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> class is a wrapper class to handle the DCS Unit objects that have the skillset defined as <strong>Client</strong> or <strong>Player</strong>:</p>
 
 <ul>
     <li>Wraps the DCS Unit objects with skill level set to Player or Client.</li>
@@ -226,7 +228,7 @@ If the DCS Unit object does not exist or is nil, the CLIENT methods will return
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CLIENT).FindByName">CLIENT:FindByName(ClientName, ClientBriefing)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(CLIENT).FindByName">CLIENT:FindByName(ClientName, ClientBriefing, Error)</a></td>
 		<td class="summary">
 <p>Finds a CLIENT from the _DATABASE using the relevant Client Unit Name.</p>
 </td>
@@ -312,7 +314,7 @@ 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).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>
+<p>Shows the <a href="AI.AI_Cargo.html##(CARGO)">AI.AI_Cargo#CARGO</a> contained within the CLIENT to the player as a message.</p>
 </td>
 		</tr>
 		<tr>
@@ -657,7 +659,7 @@ Text that describes the briefing of the mission when a Player logs into the Clie
 <dt>
 
 <a id="#(CLIENT).FindByName" >
-<strong>CLIENT:FindByName(ClientName, ClientBriefing)</strong>
+<strong>CLIENT:FindByName(ClientName, ClientBriefing, Error)</strong>
 </a>
 </dt>
 <dd>
@@ -680,6 +682,12 @@ Name of the DCS <strong>Unit</strong> as defined within the Mission Editor.</p>
 <p><code><em>#string ClientBriefing </em></code>: 
 Text that describes the briefing of the mission when a Player logs into the Client.</p>
 
+				</li>
+				<li>
+				
+<p><code><em>#boolean Error </em></code>: 
+A flag that indicates whether an error should be raised if the CLIENT cannot be found. By default an error will be raised.</p>
+
 				</li>
 		</ul>
 		<h3>Return value</h3>
@@ -712,7 +720,7 @@ Text that describes the briefing of the mission when a Player logs into the Clie
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Unit)">DCSTypes#Unit</a>:</em></p>
+<p><em><a href="Dcs.DCSTypes.html##(Unit)">Dcs.DCSTypes#Unit</a>:</em></p>
 
 
 </dd>
@@ -729,10 +737,10 @@ Text that describes the briefing of the mission when a Player logs into the Clie
 
 
 	
-<p> TODO: Check DCSTypes#Group.ID
+<p> TODO: Check Dcs.DCSTypes#Group.ID
 - Get the group ID of the client.
  @param #CLIENT self
- @return DCSTypes#Group.ID</p>
+ @return Dcs.DCSTypes#Group.ID</p>
 
 </dd>
 </dl>
@@ -767,7 +775,7 @@ Text that describes the briefing of the mission when a Player logs into the Clie
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em></p>
+<p><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>:</em></p>
 
 
 </dd>
@@ -788,7 +796,7 @@ Text that describes the briefing of the mission when a Player logs into the Clie
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a>:</em></p>
+<p><em><a href="Dcs.DCSWrapper.Group.html##(Group)">Dcs.DCSWrapper.Group#Group</a>:</em></p>
 
 
 </dd>
@@ -866,7 +874,7 @@ is the category of the message (the title).</p>
 				<li>
 				
 <p><code><em>#number MessageInterval </em></code>: 
-is the interval in seconds between the display of the <a href="Message.html##(MESSAGE)">Message#MESSAGE</a> when the CLIENT is in the air.</p>
+is the interval in seconds between the display of the <a href="Core.Message.html##(MESSAGE)">Core.Message#MESSAGE</a> when the CLIENT is in the air.</p>
 
 				</li>
 				<li>
@@ -976,10 +984,10 @@ self</p>
 </dt>
 <dd>
 	
-<p>Shows the <a href="Cargo.html##(CARGO)">Cargo#CARGO</a> contained within the CLIENT to the player as a message.</p>
+<p>Shows the <a href="AI.AI_Cargo.html##(CARGO)">AI.AI_Cargo#CARGO</a> contained within the CLIENT to the player as a message.</p>
 
 	
-<p>The <a href="Cargo.html##(CARGO)">Cargo#CARGO</a> is shown using the <a href="Message.html##(MESSAGE)">Message#MESSAGE</a> distribution system.</p>
+<p>The <a href="AI.AI_Cargo.html##(CARGO)">AI.AI_Cargo#CARGO</a> is shown using the <a href="Core.Message.html##(MESSAGE)">Core.Message#MESSAGE</a> distribution system.</p>
 
 </dd>
 </dl>
diff --git a/Moose Training/Documentation/CommandCenter.html b/Moose Training/Documentation/CommandCenter.html
new file mode 100644
index 000000000..90d69a35b
--- /dev/null
+++ b/Moose Training/Documentation/CommandCenter.html	
@@ -0,0 +1,765 @@
+<!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="AI_Balancer.html">AI_Balancer</a></li>
+					<li><a href="Account.html">Account</a></li>
+					<li><a href="Airbase.html">Airbase</a></li>
+					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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>CommandCenter</li>
+					<li><a href="Controllable.html">Controllable</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="DCScountry.html">DCScountry</a></li>
+					<li><a href="DCStimer.html">DCStimer</a></li>
+					<li><a href="DCStrigger.html">DCStrigger</a></li>
+					<li><a href="Database.html">Database</a></li>
+					<li><a href="Detection.html">Detection</a></li>
+					<li><a href="Escort.html">Escort</a></li>
+					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
+					<li><a href="Group.html">Group</a></li>
+					<li><a href="Identifiable.html">Identifiable</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="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
+					<li><a href="Point.html">Point</a></li>
+					<li><a href="Positionable.html">Positionable</a></li>
+					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
+					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
+					<li><a href="Spawn.html">Spawn</a></li>
+					<li><a href="Static.html">Static</a></li>
+					<li><a href="StaticObject.html">StaticObject</a></li>
+					<li><a href="Task.html">Task</a></li>
+					<li><a href="Task_A2G.html">Task_A2G</a></li>
+					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
+					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
+					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>CommandCenter</code></h1>
+   
+<p>A COMMANDCENTER is the owner of multiple missions within MOOSE.</p>
+
+   
+<p>A COMMANDCENTER governs multiple missions, the tasking and the reporting.</p>
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#COMMANDCENTER">COMMANDCENTER</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#REPORT">REPORT</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(COMMANDCENTER)">Type <code>COMMANDCENTER</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).AddMission">COMMANDCENTER:AddMission(Mission)</a></td>
+		<td class="summary">
+<p>Add a MISSION to be governed by the HQ command center.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).ClassName">COMMANDCENTER.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).CommandCenterCoalition">COMMANDCENTER.CommandCenterCoalition</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).CommandCenterMenu">COMMANDCENTER.CommandCenterMenu</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).CommandCenterName">COMMANDCENTER.CommandCenterName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).CommandCenterPositionable">COMMANDCENTER.CommandCenterPositionable</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).GetMissions">COMMANDCENTER:GetMissions()</a></td>
+		<td class="summary">
+<p>Get the Missions governed by the HQ command center.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).GetName">COMMANDCENTER:GetName()</a></td>
+		<td class="summary">
+<p>Gets the name of the HQ command center.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).GetPositionable">COMMANDCENTER:GetPositionable()</a></td>
+		<td class="summary">
+<p>Gets the POSITIONABLE of the HQ command center.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).HQ">COMMANDCENTER.HQ</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).HasGroup">COMMANDCENTER:HasGroup(Wrapper, MissionGroup)</a></td>
+		<td class="summary">
+<p>Checks of the COMMANDCENTER has a GROUP.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).MessageToCoalition">COMMANDCENTER:MessageToCoalition(Message)</a></td>
+		<td class="summary">
+<p>Send a CC message to the coalition of the CC.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).MessageToGroup">COMMANDCENTER:MessageToGroup(Message, TaskGroup)</a></td>
+		<td class="summary">
+<p>Send a CC message to a GROUP.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).Name">COMMANDCENTER.Name</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).New">COMMANDCENTER:New(CommandCenterPositionable, CommandCenterName)</a></td>
+		<td class="summary">
+<p>The constructor takes an IDENTIFIABLE as the HQ command center.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).RemoveMission">COMMANDCENTER:RemoveMission(Mission)</a></td>
+		<td class="summary">
+<p>Removes a MISSION to be governed by the HQ command center.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).ReportDetails">COMMANDCENTER:ReportDetails(ReportGroup, Task)</a></td>
+		<td class="summary">
+<p>Report the status of a Task to a Group.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).ReportSummary">COMMANDCENTER:ReportSummary(ReportGroup)</a></td>
+		<td class="summary">
+<p>Report the status of all MISSIONs to a GROUP.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(COMMANDCENTER).SetMenu">COMMANDCENTER:SetMenu()</a></td>
+		<td class="summary">
+<p>Sets the menu structure of the Missions governed by the HQ command center.</p>
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(REPORT)">Type <code>REPORT</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(REPORT).Add">REPORT:Add(Text)</a></td>
+		<td class="summary">
+<p>Add a new line to a REPORT.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(REPORT).ClassName">REPORT.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(REPORT).New">REPORT:New(Title)</a></td>
+		<td class="summary">
+<p>Create a new REPORT.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(REPORT).Text">REPORT:Text()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(COMMANDCENTER)">#COMMANDCENTER</a></em>
+<a id="COMMANDCENTER" >
+<strong>COMMANDCENTER</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(REPORT)">#REPORT</a></em>
+<a id="REPORT" >
+<strong>REPORT</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(CommandCenter)" >Type <code>CommandCenter</code></a></h2>
+	
+			<h2><a id="#(COMMANDCENTER)" >Type <code>COMMANDCENTER</code></a></h2>
+				
+<p>The COMMANDCENTER class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).AddMission" >
+<strong>COMMANDCENTER:AddMission(Mission)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add a MISSION to be governed by the HQ command center.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(COMMANDCENTER).ClassName" >
+<strong>COMMANDCENTER.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Dcs.DCSCoalitionWrapper.Object.html##(coalition)">Dcs.DCSCoalitionWrapper.Object#coalition</a></em>
+<a id="#(COMMANDCENTER).CommandCenterCoalition" >
+<strong>COMMANDCENTER.CommandCenterCoalition</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).CommandCenterMenu" >
+<strong>COMMANDCENTER.CommandCenterMenu</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(COMMANDCENTER).CommandCenterName" >
+<strong>COMMANDCENTER.CommandCenterName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).CommandCenterPositionable" >
+<strong>COMMANDCENTER.CommandCenterPositionable</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).GetMissions" >
+<strong>COMMANDCENTER:GetMissions()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Get the Missions governed by the HQ command center.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(list)">#list</a>:</em>
+Tasking.Mission#MISSION></p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).GetName" >
+<strong>COMMANDCENTER:GetName()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the name of the HQ command center.</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#string:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).GetPositionable" >
+<strong>COMMANDCENTER:GetPositionable()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the POSITIONABLE of the HQ command center.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a></em>
+<a id="#(COMMANDCENTER).HQ" >
+<strong>COMMANDCENTER.HQ</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).HasGroup" >
+<strong>COMMANDCENTER:HasGroup(Wrapper, MissionGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Checks of the COMMANDCENTER has a GROUP.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Wrapper </em></code>: 
+Group#GROUP</p>
+
+				</li>
+				<li>
+				
+<p><code><em> MissionGroup </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).MessageToCoalition" >
+<strong>COMMANDCENTER:MessageToCoalition(Message)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a CC message to the coalition of the CC.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Message </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).MessageToGroup" >
+<strong>COMMANDCENTER:MessageToGroup(Message, TaskGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a CC message to a GROUP.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Message </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> TaskGroup </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(COMMANDCENTER).Name" >
+<strong>COMMANDCENTER.Name</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).New" >
+<strong>COMMANDCENTER:New(CommandCenterPositionable, CommandCenterName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>The constructor takes an IDENTIFIABLE as the HQ command center.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a> CommandCenterPositionable </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string CommandCenterName </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(COMMANDCENTER)">#COMMANDCENTER</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).RemoveMission" >
+<strong>COMMANDCENTER:RemoveMission(Mission)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Removes a MISSION to be governed by the HQ command center.</p>
+
+	
+<p>The given Mission is not nilified.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).ReportDetails" >
+<strong>COMMANDCENTER:ReportDetails(ReportGroup, Task)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Report the status of a Task to a Group.</p>
+
+	
+<p>Report the details of a Mission, listing the Mission, and all the Task details.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ReportGroup </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Task </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).ReportSummary" >
+<strong>COMMANDCENTER:ReportSummary(ReportGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Report the status of all MISSIONs to a GROUP.</p>
+
+	
+<p>Each Mission is listed, with an indication how many Tasks are still to be completed.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ReportGroup </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(COMMANDCENTER).SetMenu" >
+<strong>COMMANDCENTER:SetMenu()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Sets the menu structure of the Missions governed by the HQ command center.</p>
+
+</dd>
+</dl>
+
+			<h2><a id="#(REPORT)" >Type <code>REPORT</code></a></h2>
+				
+<p>The REPORT class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(REPORT).Add" >
+<strong>REPORT:Add(Text)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add a new line to a REPORT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Text </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(REPORT)">#REPORT</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(REPORT).ClassName" >
+<strong>REPORT.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(REPORT).New" >
+<strong>REPORT:New(Title)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a new REPORT.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Title </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(REPORT)">#REPORT</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(REPORT).Text" >
+<strong>REPORT:Text()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+
+			<h2><a id="#(TASK)" >Type <code>TASK</code></a></h2>
+			
+			<h2><a id="#(list)" >Type <code>list</code></a></h2>
+			
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Controllable.html b/Moose Training/Documentation/Controllable.html
index 191cf6290..3d98f7051 100644
--- a/Moose Training/Documentation/Controllable.html	
+++ b/Moose Training/Documentation/Controllable.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li>Controllable</li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> class, extends <a href="Positionable.html##(POSITIONABLE)">Positionable#POSITIONABLE</a></h1>
-<p>The <a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> class is a wrapper class to handle the DCS Controllable objects:</p>
+<h1>1) <a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> class, extends <a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a></h1>
+<p>The <a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> class is a wrapper class to handle the DCS Controllable objects:</p>
 
 <ul>
     <li>Support all DCS Controllable APIs.</li>
@@ -106,7 +108,7 @@
 
 <h2>1.2) CONTROLLABLE task methods</h2>
 <p>Several controllable task methods are available that help you to prepare tasks. 
-These methods return a string consisting of the task description, which can then be given to either a <a href="Controllable.html##(CONTROLLABLE).PushTask">Controllable#CONTROLLABLE.PushTask</a> or <a href="Controllable.html##(SetTask)">Controllable#SetTask</a> method to assign the task to the CONTROLLABLE.
+These methods return a string consisting of the task description, which can then be given to either a <a href="Wrapper.Controllable.html##(CONTROLLABLE).PushTask">Wrapper.Controllable#CONTROLLABLE.PushTask</a> or <a href="Wrapper.Controllable.html##(SetTask)">Wrapper.Controllable#SetTask</a> method to assign the task to the CONTROLLABLE.
 Tasks are specific for the category of the CONTROLLABLE, more specific, for AIR, GROUND or AIR and GROUND. 
 Each task description where applicable indicates for which controllable category the task is valid.
 There are 2 main subdivisions of tasks: Assigned tasks and EnRoute tasks.</p>
@@ -270,7 +272,7 @@ This is different from the EnRoute tasks, where the targets of the task need to
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).CopyRoute">CONTROLLABLE:CopyRoute(Begin, End, Randomize, Radius)</a></td>
 		<td class="summary">
-<p>Return the route of a controllable by using the <a href="Database.html##(DATABASE)">Database#DATABASE</a> class.</p>
+<p>Return the route of a controllable by using the <a href="Core.Database.html##(DATABASE)">Core.Database#DATABASE</a> class.</p>
 </td>
 		</tr>
 		<tr>
@@ -331,12 +333,6 @@ This is different from the EnRoute tasks, where the targets of the task need to
 		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).GetDetectedTargets">CONTROLLABLE:GetDetectedTargets(DetectVisual, DetectOptical, DetectRadar, DetectIRST, DetectRWR, DetectDLINK)</a></td>
 		<td class="summary">
 <p>Return the detected targets of the controllable.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).GetMessage">CONTROLLABLE:GetMessage(Message, Duration)</a></td>
-		<td class="summary">
-<p>Returns a message with the callsign embedded (if there is one).</p>
 </td>
 		</tr>
 		<tr>
@@ -355,42 +351,6 @@ This is different from the EnRoute tasks, where the targets of the task need to
 		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).IsTargetDetected">CONTROLLABLE:IsTargetDetected(DCSObject)</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).Message">CONTROLLABLE:Message(Message, Duration)</a></td>
-		<td class="summary">
-<p>Send a message to the players in the <a href="Group.html">Group</a>.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).MessageToAll">CONTROLLABLE:MessageToAll(Message, Duration)</a></td>
-		<td class="summary">
-<p>Send a message to all coalitions.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).MessageToBlue">CONTROLLABLE:MessageToBlue(Message, Duration)</a></td>
-		<td class="summary">
-<p>Send a message to the blue coalition.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).MessageToClient">CONTROLLABLE:MessageToClient(Message, Duration, Client)</a></td>
-		<td class="summary">
-<p>Send a message to a client.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).MessageToGroup">CONTROLLABLE:MessageToGroup(Message, Duration, MessageGroup)</a></td>
-		<td class="summary">
-<p>Send a message to a <a href="Group.html">Group</a>.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).MessageToRed">CONTROLLABLE:MessageToRed(Message, Duration)</a></td>
-		<td class="summary">
-<p>Send a message to the red coalition.</p>
 </td>
 		</tr>
 		<tr>
@@ -516,7 +476,7 @@ This is different from the EnRoute tasks, where the targets of the task need to
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).RouteReturnToAirbase">CONTROLLABLE:RouteReturnToAirbase(ReturnAirbase, Speed)</a></td>
 		<td class="summary">
-<p>(AIR) Return the Controllable to an <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>
+<p>(AIR) Return the Controllable to an <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>
 A speed can be given in km/h.</p>
 </td>
 		</tr>
@@ -643,7 +603,7 @@ A speed can be given in km/h.</p>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(CONTROLLABLE).TaskLandAtZone">CONTROLLABLE:TaskLandAtZone(Zone, Duration, RandomPoint)</a></td>
 		<td class="summary">
-<p>(AIR) Land the controllable at a @{Zone#ZONE_RADIUS).</p>
+<p>(AIR) Land the controllable at a @{Core.Zone#ZONE_RADIUS).</p>
 </td>
 		</tr>
 		<tr>
@@ -826,7 +786,7 @@ A speed can be given in km/h.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 </dd>
@@ -857,7 +817,7 @@ A speed can be given in km/h.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 			<h3>Usage:</h3>
@@ -898,7 +858,7 @@ SCHEDULER:New( nil,
 </dt>
 <dd>
 	
-<p>Return the route of a controllable by using the <a href="Database.html##(DATABASE)">Database#DATABASE</a> class.</p>
+<p>Return the route of a controllable by using the <a href="Core.Database.html##(DATABASE)">Core.Database#DATABASE</a> class.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -932,7 +892,7 @@ When randomization is on, the randomization is within the radius.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSControllable.html##(Controllable)">DCSControllable#Controllable</a></em>
+		<em><a href="Dcs.DCSWrapper.Controllable.html##(Controllable)">Dcs.DCSWrapper.Controllable#Controllable</a></em>
 <a id="#(CONTROLLABLE).DCSControllable" >
 <strong>CONTROLLABLE.DCSControllable</strong>
 </a>
@@ -959,7 +919,7 @@ When randomization is on, the randomization is within the radius.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -980,7 +940,7 @@ The DCS task structure.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1003,7 +963,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
 The Controllable to be attacked.</p>
 
 				</li>
@@ -1021,7 +981,7 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -1033,13 +993,13 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Altitude </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Altitude </em></code>: 
 (optional) Desired attack start altitude. Controllable/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/controllable will choose closest altitude to the desired attack start altitude. If the desired altitude is defined controllable/aircraft will not attack from safe altitude.</p>
 
 				</li>
@@ -1052,7 +1012,7 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1072,13 +1032,13 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Distance </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.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="DCSTypes.html##(AttributeNameArray)">DCSTypes#AttributeNameArray</a> TargetTypes </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AttributeNameArray)">Dcs.DCSTypes#AttributeNameArray</a> TargetTypes </em></code>: 
 Array of target categories allowed to engage. </p>
 
 				</li>
@@ -1091,7 +1051,7 @@ All enroute tasks have the priority parameter. This is a number (less value - hi
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1111,7 +1071,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> AttackUnit </em></code>: 
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> AttackUnit </em></code>: 
 The UNIT.</p>
 
 				</li>
@@ -1129,7 +1089,7 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -1141,7 +1101,7 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
@@ -1160,7 +1120,7 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1184,7 +1144,7 @@ If the task is assigned to the controllable lead unit will be a FAC. </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Radius </em></code>: 
  The maximal distance from the FAC to a target.</p>
 
 				</li>
@@ -1197,7 +1157,7 @@ All en-route tasks have the priority parameter. This is a number (less value - h
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1221,7 +1181,7 @@ If the task is assigned to the controllable lead unit will be a FAC. </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
 Target CONTROLLABLE.</p>
 
 				</li>
@@ -1239,7 +1199,7 @@ Bitmask of weapon types those allowed to use. If parameter is not defined that m
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.Designation)">DCSTypes#AI.Task.Designation</a> Designation </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.Designation)">Dcs.DCSTypes#AI.Task.Designation</a> Designation </em></code>: 
 (optional) Designation type.</p>
 
 				</li>
@@ -1252,7 +1212,7 @@ Bitmask of weapon types those allowed to use. If parameter is not defined that m
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1273,7 +1233,7 @@ The DCS task structure.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -1337,39 +1297,6 @@ If no detection method is given, the detection will use all the available method
 <p><em>#table:</em>
 DetectedTargets</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(CONTROLLABLE).GetMessage" >
-<strong>CONTROLLABLE:GetMessage(Message, Duration)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Returns a message with the callsign embedded (if there is one).</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTypes.html##(Duration)">DCSTypes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="Message.html##(MESSAGE)">Message#MESSAGE</a>:</em></p>
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1433,204 +1360,6 @@ The mission route defined by points.</p>
 		<dl class="function">
 <dt>
 
-<a id="#(CONTROLLABLE).Message" >
-<strong>CONTROLLABLE:Message(Message, Duration)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Send a message to the players in the <a href="Group.html">Group</a>.</p>
-
-	
-<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTypes.html##(Duration)">DCSTypes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(CONTROLLABLE).MessageToAll" >
-<strong>CONTROLLABLE:MessageToAll(Message, Duration)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Send a message to all coalitions.</p>
-
-	
-<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTypes.html##(Duration)">DCSTypes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(CONTROLLABLE).MessageToBlue" >
-<strong>CONTROLLABLE:MessageToBlue(Message, Duration)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Send a message to the blue coalition.</p>
-
-	
-<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTypes.html##(Duration)">DCSTypes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(CONTROLLABLE).MessageToClient" >
-<strong>CONTROLLABLE:MessageToClient(Message, Duration, Client)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Send a message to a client.</p>
-
-	
-<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTypes.html##(Duration)">DCSTypes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> Client </em></code>: 
-The client object receiving the message.</p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(CONTROLLABLE).MessageToGroup" >
-<strong>CONTROLLABLE:MessageToGroup(Message, Duration, MessageGroup)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Send a message to a <a href="Group.html">Group</a>.</p>
-
-	
-<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTypes.html##(Duration)">DCSTypes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> MessageGroup </em></code>: 
-The GROUP object receiving the message.</p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(CONTROLLABLE).MessageToRed" >
-<strong>CONTROLLABLE:MessageToRed(Message, Duration)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Send a message to the red coalition.</p>
-
-	
-<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string Message </em></code>: 
-The message text</p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="DCSTYpes.html##(Duration)">DCSTYpes#Duration</a> Duration </em></code>: 
-The duration of the message.</p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
 <a id="#(CONTROLLABLE).New" >
 <strong>CONTROLLABLE:New(ControllableName)</strong>
 </a>
@@ -1643,7 +1372,7 @@ The duration of the message.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSControllable.html##(Controllable)">DCSControllable#Controllable</a> ControllableName </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Controllable.html##(Controllable)">Dcs.DCSWrapper.Controllable#Controllable</a> ControllableName </em></code>: 
 The DCS Controllable name</p>
 
 				</li>
@@ -1668,7 +1397,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a>:</em>
+<p><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a>:</em>
 self</p>
 
 </dd>
@@ -1956,7 +1685,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a>:</em>
+<p><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a>:</em>
 self</p>
 
 </dd>
@@ -1987,7 +1716,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a>:</em>
+<p><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a>:</em>
 self</p>
 
 </dd>
@@ -2028,7 +1757,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>(AIR) Return the Controllable to an <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>
+<p>(AIR) Return the Controllable to an <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>
 A speed can be given in km/h.</p>
 
 	
@@ -2038,8 +1767,8 @@ A speed can be given in km/h.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> ReturnAirbase </em></code>: 
-The <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> to return to.</p>
+<p><code><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> ReturnAirbase </em></code>: 
+The <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> to return to.</p>
 
 				</li>
 				<li>
@@ -2071,7 +1800,7 @@ The route</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSCommand.html##(Command)">DCSCommand#Command</a> DCSCommand </em></code>: </p>
+<p><code><em><a href="Dcs.DCSCommand.html##(Command)">Dcs.DCSCommand#Command</a> DCSCommand </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2108,7 +1837,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a>:</em>
+<p><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a>:</em>
 self</p>
 
 </dd>
@@ -2128,7 +1857,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
 The Controllable to be attacked.</p>
 
 				</li>
@@ -2140,7 +1869,7 @@ The Controllable to be attacked.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -2152,13 +1881,13 @@ The Controllable to be attacked.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Altitude </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Altitude </em></code>: 
 (optional) Desired attack start altitude. Controllable/aircraft will make its attacks from the altitude. If the altitude is too low or too high to use weapon aircraft/controllable will choose closest altitude to the desired attack start altitude. If the desired altitude is defined controllable/aircraft will not attack from safe altitude.</p>
 
 				</li>
@@ -2171,7 +1900,7 @@ The Controllable to be attacked.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2191,7 +1920,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </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>
@@ -2203,7 +1932,7 @@ The DCS task structure.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -2215,7 +1944,7 @@ The DCS task structure.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
@@ -2228,7 +1957,7 @@ The DCS task structure.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2248,7 +1977,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> AttackUnit </em></code>: 
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> AttackUnit </em></code>: 
 The unit.</p>
 
 				</li>
@@ -2260,7 +1989,7 @@ The unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -2272,7 +2001,7 @@ The unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
@@ -2291,7 +2020,7 @@ The unit.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2311,7 +2040,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 2D-coordinates of the point to deliver weapon at.</p>
 
 				</li>
@@ -2323,7 +2052,7 @@ The DCS task structure.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -2335,7 +2064,7 @@ The DCS task structure.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
@@ -2348,7 +2077,7 @@ The DCS task structure.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2368,7 +2097,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> Airbase </em></code>: 
+<p><code><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> Airbase </em></code>: 
 Airbase to attack.</p>
 
 				</li>
@@ -2380,7 +2109,7 @@ Airbase to attack.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.WeaponExpend)">DCSTypes#AI.Task.WeaponExpend</a> WeaponExpend </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.WeaponExpend)">Dcs.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 / controllable will choose expend on its own discretion.</p>
 
 				</li>
@@ -2392,7 +2121,7 @@ Airbase to attack.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Direction </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Direction </em></code>: 
 (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction.</p>
 
 				</li>
@@ -2405,7 +2134,7 @@ Airbase to attack.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2425,14 +2154,14 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTask.html##(TaskArray)">DCSTask#TaskArray</a> DCSTasks </em></code>: 
-Array of <a href="DCSTask.html##(Task)">DCSTask#Task</a></p>
+<p><code><em><a href="Dcs.DCSTasking.Task.html##(TaskArray)">Dcs.DCSTasking.Task#TaskArray</a> DCSTasks </em></code>: 
+Array of <a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a></p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 </dd>
@@ -2452,7 +2181,7 @@ Array of <a href="DCSTask.html##(Task)">DCSTask#Task</a></p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTime.html##(Time)">DCSTime#Time</a> time </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTime.html##(Time)">Dcs.DCSTime#Time</a> time </em></code>: </p>
 
 				</li>
 				<li>
@@ -2472,13 +2201,13 @@ Array of <a href="DCSTask.html##(Task)">DCSTask#Task</a></p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTime.html##(Time)">DCSTime#Time</a> duration </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTime.html##(Time)">Dcs.DCSTime#Time</a> duration </em></code>: </p>
 
 				</li>
 				<li>
 				
 <p><code><em>#number lastWayPoint </em></code>: 
-return DCSTask#Task</p>
+return Dcs.DCSTasking.Task#Task</p>
 
 				</li>
 		</ul>
@@ -2499,7 +2228,7 @@ return DCSTask#Task</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTask.html##(Task)">DCSTask#Task</a> DCSTask </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a> DCSTask </em></code>: </p>
 
 				</li>
 				<li>
@@ -2510,7 +2239,7 @@ return DCSTask#Task</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 </dd>
@@ -2530,7 +2259,7 @@ return DCSTask#Task</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Point </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Point </em></code>: 
 The point where to wait.</p>
 
 				</li>
@@ -2543,7 +2272,7 @@ The radius of the embarking zone around the Point.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2563,7 +2292,7 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Point </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Point </em></code>: 
 The point where to wait.</p>
 
 				</li>
@@ -2582,7 +2311,7 @@ The controllable to be embarked.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure</p>
 
 </dd>
@@ -2606,13 +2335,13 @@ The unit / controllable will also protect that controllable from threats of spec
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> EscortControllable </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> EscortControllable </em></code>: 
 The controllable to be escorted.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 Position of the unit / lead unit of the controllable relative lead unit of another controllable in frame reference oriented by course of lead unit of another controllable. If another controllable is on land the unit / controllable will orbit around.</p>
 
 				</li>
@@ -2630,7 +2359,7 @@ Maximal distance from escorted controllable to threat. If the threat is already
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AttributeNameArray)">DCSTypes#AttributeNameArray</a> TargetTypes </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AttributeNameArray)">Dcs.DCSTypes#AttributeNameArray</a> TargetTypes </em></code>: 
 Array of AttributeName that is contains threat categories allowed to engage. </p>
 
 				</li>
@@ -2647,7 +2376,7 @@ Array of AttributeName that is contains threat categories allowed to engage. </p
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2671,7 +2400,7 @@ If the task is assigned to the controllable lead unit will be a FAC. </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> AttackGroup </em></code>: 
 Target CONTROLLABLE.</p>
 
 				</li>
@@ -2683,7 +2412,7 @@ Bitmask of weapon types those allowed to use. If parameter is not defined that m
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(AI.Task.Designation)">DCSTypes#AI.Task.Designation</a> Designation </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(AI.Task.Designation)">Dcs.DCSTypes#AI.Task.Designation</a> Designation </em></code>: 
 (optional) Designation type.</p>
 
 				</li>
@@ -2696,7 +2425,7 @@ Bitmask of weapon types those allowed to use. If parameter is not defined that m
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2716,20 +2445,20 @@ The DCS task structure.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The point to fire at.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Radius </em></code>: 
 The radius of the zone to deploy the fire at.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2753,13 +2482,13 @@ If another controllable is on land the unit / controllable will orbit around. </
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> FollowControllable </em></code>: 
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> FollowControllable </em></code>: 
 The controllable to be followed.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 Position of the unit / lead unit of the controllable relative lead unit of another controllable in frame reference oriented by course of lead unit of another controllable. If another controllable is on land the unit / controllable will orbit around.</p>
 
 				</li>
@@ -2772,7 +2501,7 @@ Detach waypoint of another controllable. Once reached the unit / controllable Fo
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2826,7 +2555,7 @@ The DCS task structure.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -2876,7 +2605,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Point </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Point </em></code>: 
 The point where to land.</p>
 
 				</li>
@@ -2903,13 +2632,13 @@ self</p>
 </dt>
 <dd>
 	
-<p>(AIR) Land the controllable at a @{Zone#ZONE_RADIUS).</p>
+<p>(AIR) Land the controllable at a @{Core.Zone#ZONE_RADIUS).</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> Zone </em></code>: 
 The zone where to land.</p>
 
 				</li>
@@ -2954,7 +2683,7 @@ A table containing the mission task.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 </dd>
@@ -3007,7 +2736,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Point </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Point </em></code>: 
 The point to hold the position.</p>
 
 				</li>
@@ -3047,7 +2776,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em>
 The DCS task structure.</p>
 
 </dd>
@@ -3074,7 +2803,7 @@ A table of route points.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 </dd>
@@ -3094,7 +2823,7 @@ A table of route points.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Point </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Point </em></code>: 
 The destination point in Vec3 format.</p>
 
 				</li>
@@ -3127,7 +2856,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Point </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Point </em></code>: 
 The destination point in Vec3 format.</p>
 
 				</li>
@@ -3165,7 +2894,7 @@ A given formation can be given.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> Zone </em></code>: 
 The zone where to route to.</p>
 
 				</li>
@@ -3205,7 +2934,7 @@ The formation string.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSCommand.html##(Command)">DCSCommand#Command</a> DCSCommand </em></code>: </p>
+<p><code><em><a href="Dcs.DCSCommand.html##(Command)">Dcs.DCSCommand#Command</a> DCSCommand </em></code>: </p>
 
 				</li>
 				<li>
@@ -3216,7 +2945,7 @@ The formation string.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTask.html##(Task)">DCSTask#Task</a>:</em></p>
+<p><em><a href="Dcs.DCSTasking.Task.html##(Task)">Dcs.DCSTasking.Task#Task</a>:</em></p>
 
 
 </dd>
@@ -3328,7 +3057,7 @@ The waypoint function to be called when the controllable moves over the waypoint
 <p> Retrieve the controllable mission and allow to place function hooks within the mission waypoint plan.</p>
 
 	
-<p> Use the method <a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> to define the hook functions for specific waypoints.
+<p> Use the method <a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> to define the hook functions for specific waypoints.
  Use the method @{Controllable@CONTROLLABLE:WayPointExecute) to start the execution of the new mission plan.
  Note that when WayPointInitialize is called, the Mission of the controllable is RESTARTED!</p>
 
@@ -3375,7 +3104,7 @@ If WayPoints is given, then use the route.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSController.html##(Controller)">DCSController#Controller</a>:</em></p>
+<p><em><a href="Dcs.DCSController.html##(Controller)">Dcs.DCSController#Controller</a>:</em></p>
 
 
 </dd>
diff --git a/Moose Training/Documentation/DCSAirbase.html b/Moose Training/Documentation/DCSAirbase.html
index d775cc55e..64f947428 100644
--- a/Moose Training/Documentation/DCSAirbase.html	
+++ b/Moose Training/Documentation/DCSAirbase.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li>DCSAirbase</li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -380,7 +382,7 @@ Airbase type name.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(Unit)">Unit#Unit</a>:</em></p>
+<p><em><a href="Wrapper.Unit.html##(Unit)">Wrapper.Unit#Unit</a>:</em></p>
 
 
 </dd>
diff --git a/Moose Training/Documentation/DCSCoalitionObject.html b/Moose Training/Documentation/DCSCoalitionObject.html
index 144926d49..1b5de15ff 100644
--- a/Moose Training/Documentation/DCSCoalitionObject.html	
+++ b/Moose Training/Documentation/DCSCoalitionObject.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li>DCSCoalitionObject</li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -194,7 +196,7 @@
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(coalition.side)">DCSTypes#coalition.side</a>:</em></p>
+<p><em><a href="Dcs.DCSTypes.html##(coalition.side)">Dcs.DCSTypes#coalition.side</a>:</em></p>
 
 
 </dd>
diff --git a/Moose Training/Documentation/DCSCommand.html b/Moose Training/Documentation/DCSCommand.html
index 295c9acaa..4cbd74065 100644
--- a/Moose Training/Documentation/DCSCommand.html	
+++ b/Moose Training/Documentation/DCSCommand.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCSController.html b/Moose Training/Documentation/DCSController.html
index 9eb61abd0..a5eeb2d71 100644
--- a/Moose Training/Documentation/DCSController.html	
+++ b/Moose Training/Documentation/DCSController.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -344,7 +346,7 @@ Controller.Detection detection1, Controller.Detection detection2, ... Controller
 		<ul>
 				<li>
 				
-<p><code><em><a href="Object.html##(Object)">Object#Object</a> target </em></code>: 
+<p><code><em><a href="Wrapper.Object.html##(Object)">Wrapper.Object#Object</a> target </em></code>: 
 Target to check</p>
 
 				</li>
@@ -417,7 +419,7 @@ lastVel Has effect only if visible is false. Last velocity of the target when it
 		<ul>
 				<li>
 				
-<p><code><em><a href="Object.html##(Object)">Object#Object</a> object </em></code>: 
+<p><code><em><a href="Wrapper.Object.html##(Object)">Wrapper.Object#Object</a> object </em></code>: 
 The target.</p>
 
 				</li>
@@ -681,7 +683,7 @@ Value of the option.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Object.html##(Object)">Object#Object</a></em>
+		<em><a href="Wrapper.Object.html##(Object)">Wrapper.Object#Object</a></em>
 <a id="#(DetectedTarget).object" >
 <strong>DetectedTarget.object</strong>
 </a>
diff --git a/Moose Training/Documentation/DCSGroup.html b/Moose Training/Documentation/DCSGroup.html
index 018a45fd2..67e0d6d8d 100644
--- a/Moose Training/Documentation/DCSGroup.html	
+++ b/Moose Training/Documentation/DCSGroup.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -330,7 +332,7 @@
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSCoalitionObject.html##(coalition.side)">DCSCoalitionObject#coalition.side</a>:</em></p>
+<p><em><a href="Dcs.DCSCoalitionWrapper.Object.html##(coalition.side)">Dcs.DCSCoalitionWrapper.Object#coalition.side</a>:</em></p>
 
 
 </dd>
@@ -458,7 +460,7 @@
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a>:</em></p>
+<p><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a>:</em></p>
 
 
 </dd>
@@ -480,7 +482,7 @@
 		<h3>Return value</h3>
 				
 <p><em><a href="##(list)">#list</a>:</em>
-DCSUnit#Unit> array of Units</p>
+Dcs.DCSWrapper.Unit#Unit> array of Units</p>
 
 </dd>
 </dl>
diff --git a/Moose Training/Documentation/DCSObject.html b/Moose Training/Documentation/DCSObject.html
index 36223acce..72238f7e0 100644
--- a/Moose Training/Documentation/DCSObject.html	
+++ b/Moose Training/Documentation/DCSObject.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCSTask.html b/Moose Training/Documentation/DCSTask.html
index ebdfa69ff..6180e672b 100644
--- a/Moose Training/Documentation/DCSTask.html	
+++ b/Moose Training/Documentation/DCSTask.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCSTypes.html b/Moose Training/Documentation/DCSTypes.html
index 13fa58122..99b096eb3 100644
--- a/Moose Training/Documentation/DCSTypes.html	
+++ b/Moose Training/Documentation/DCSTypes.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCSUnit.html b/Moose Training/Documentation/DCSUnit.html
index dd27fefef..f6fb63392 100644
--- a/Moose Training/Documentation/DCSUnit.html	
+++ b/Moose Training/Documentation/DCSUnit.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -202,24 +204,6 @@
 		<td class="name" nowrap="nowrap"><a href="##(Unit).SensorType">Unit.SensorType</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(Unit).detectionDistanceAfterburner">Unit.detectionDistanceAfterburner</a></td>
-		<td class="summary">
-<p>..., engines are in afterburner mode</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(Unit).detectionDistanceIdle">Unit.detectionDistanceIdle</a></td>
-		<td class="summary">
-<p>detection of tail-on target with heat signature = 1 in upper hemisphere, engines are in idle</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(Unit).detectionDistanceMaximal">Unit.detectionDistanceMaximal</a></td>
-		<td class="summary">
-<p>..., engines are in maximal mode</p>
 </td>
 		</tr>
 		<tr>
@@ -655,6 +639,28 @@ First value indicates if at least one of the unit's radar(s) is on.</p>
 		<td class="name" nowrap="nowrap"><a href="##(Unit.SensorType).RWR">Unit.SensorType.RWR</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(Wrapper.Unit)">Type <code>Wrapper.Unit</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(Wrapper.Unit).detectionDistanceAfterburner">Wrapper.Unit.detectionDistanceAfterburner</a></td>
+		<td class="summary">
+<p>..., engines are in afterburner mode</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(Wrapper.Unit).detectionDistanceIdle">Wrapper.Unit.detectionDistanceIdle</a></td>
+		<td class="summary">
+<p>detection of tail-on target with heat signature = 1 in upper hemisphere, engines are in idle</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(Wrapper.Unit).detectionDistanceMaximal">Wrapper.Unit.detectionDistanceMaximal</a></td>
+		<td class="summary">
+<p>..., engines are in maximal mode</p>
 </td>
 		</tr>
 	</table>
@@ -687,10 +693,7 @@ First value indicates if at least one of the unit's radar(s) is on.</p>
 			<h2><a id="#(TypeName)" >Type <code>TypeName</code></a></h2>
 			
 			<h2><a id="#(Unit)" >Type <code>Unit</code></a></h2>
-				
-<p>An IRST.</p>
-
-	<h3>Field(s)</h3>
+				<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
@@ -940,48 +943,6 @@ First value indicates if at least one of the unit's radar(s) is on.</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(Distance)">#Distance</a></em>
-<a id="#(Unit).detectionDistanceAfterburner" >
-<strong>Unit.detectionDistanceAfterburner</strong>
-</a>
-</dt>
-<dd>
-	
-<p>..., engines are in afterburner mode</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(Distance)">#Distance</a></em>
-<a id="#(Unit).detectionDistanceIdle" >
-<strong>Unit.detectionDistanceIdle</strong>
-</a>
-</dt>
-<dd>
-	
-<p>detection of tail-on target with heat signature = 1 in upper hemisphere, engines are in idle</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(Distance)">#Distance</a></em>
-<a id="#(Unit).detectionDistanceMaximal" >
-<strong>Unit.detectionDistanceMaximal</strong>
-</a>
-</dt>
-<dd>
-	
-<p>..., engines are in maximal mode</p>
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1122,7 +1083,7 @@ First value indicates if at least one of the unit's radar(s) is on.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a>:</em></p>
+<p><em><a href="Dcs.DCSWrapper.Group.html##(Group)">Dcs.DCSWrapper.Group#Group</a>:</em></p>
 
 
 </dd>
@@ -1240,7 +1201,7 @@ First value indicates if at least one of the unit's radar(s) is on.</p>
 
 		<h3>Return value</h3>
 				
-<p><em>#boolean, <a href="Object.html##(Object)">Object#Object</a>:</em></p>
+<p><em>#boolean, <a href="Wrapper.Object.html##(Object)">Wrapper.Object#Object</a>:</em></p>
 
 
 </dd>
@@ -2054,6 +2015,54 @@ If sensor type is not specified the function returns true if the unit has at lea
 			
 			<h2><a id="#(Weapon.Desc)" >Type <code>Weapon.Desc</code></a></h2>
 			
+			<h2><a id="#(Wrapper.Unit)" >Type <code>Wrapper.Unit</code></a></h2>
+				
+<p>An IRST.</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(Distance)">#Distance</a></em>
+<a id="#(Wrapper.Unit).detectionDistanceAfterburner" >
+<strong>Wrapper.Unit.detectionDistanceAfterburner</strong>
+</a>
+</dt>
+<dd>
+	
+<p>..., engines are in afterburner mode</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(Distance)">#Distance</a></em>
+<a id="#(Wrapper.Unit).detectionDistanceIdle" >
+<strong>Wrapper.Unit.detectionDistanceIdle</strong>
+</a>
+</dt>
+<dd>
+	
+<p>detection of tail-on target with heat signature = 1 in upper hemisphere, engines are in idle</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(Distance)">#Distance</a></em>
+<a id="#(Wrapper.Unit).detectionDistanceMaximal" >
+<strong>Wrapper.Unit.detectionDistanceMaximal</strong>
+</a>
+</dt>
+<dd>
+	
+<p>..., engines are in maximal mode</p>
+
+</dd>
+</dl>
+
 			<h2><a id="#(list)" >Type <code>list</code></a></h2>
 			
 </div>
diff --git a/Moose Training/Documentation/DCSWorld.html b/Moose Training/Documentation/DCSWorld.html
index 82e4b474a..b5410c686 100644
--- a/Moose Training/Documentation/DCSWorld.html	
+++ b/Moose Training/Documentation/DCSWorld.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCScountry.html b/Moose Training/Documentation/DCScountry.html
index d593b5183..030327afe 100644
--- a/Moose Training/Documentation/DCScountry.html	
+++ b/Moose Training/Documentation/DCScountry.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCStimer.html b/Moose Training/Documentation/DCStimer.html
index 9fe22609a..2a22ff28a 100644
--- a/Moose Training/Documentation/DCStimer.html	
+++ b/Moose Training/Documentation/DCStimer.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/DCStrigger.html b/Moose Training/Documentation/DCStrigger.html
index 1fcec8753..9ffca8c0d 100644
--- a/Moose Training/Documentation/DCStrigger.html	
+++ b/Moose Training/Documentation/DCStrigger.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li>DCStrigger</li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/Database.html b/Moose Training/Documentation/Database.html
index 1180bccad..68a700372 100644
--- a/Moose Training/Documentation/Database.html	
+++ b/Moose Training/Documentation/Database.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li>Database</li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,7 +91,7 @@
 
 <hr/>
 
-<h1>1) <a href="Database.html##(DATABASE)">Database#DATABASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
+<h1>1) <a href="Core.Database.html##(DATABASE)">Core.Database#DATABASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
 <p>Mission designers can use the DATABASE class to refer to:</p>
 
 <ul>
@@ -760,7 +762,7 @@ The following iterator methods are currently available within the DATABASE:</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em>
+<p><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>:</em>
 The found AIRBASE.</p>
 
 </dd>
@@ -786,7 +788,7 @@ The found AIRBASE.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Client.html##(CLIENT)">Client#CLIENT</a>:</em>
+<p><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a>:</em>
 The found CLIENT.</p>
 
 </dd>
@@ -812,7 +814,7 @@ The found CLIENT.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The found GROUP.</p>
 
 </dd>
@@ -838,7 +840,7 @@ The found GROUP.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Static.html##(STATIC)">Static#STATIC</a>:</em>
+<p><em><a href="Wrapper.Static.html##(STATIC)">Wrapper.Static#STATIC</a>:</em>
 The found STATIC.</p>
 
 </dd>
@@ -864,7 +866,7 @@ The found STATIC.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+<p><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>:</em>
 The found Unit.</p>
 
 </dd>
@@ -1457,7 +1459,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1478,7 +1480,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1499,7 +1501,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1520,7 +1522,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
diff --git a/Moose Training/Documentation/Detection.html b/Moose Training/Documentation/Detection.html
index ea14ce2b2..43c5617c1 100644
--- a/Moose Training/Documentation/Detection.html	
+++ b/Moose Training/Documentation/Detection.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li>Detection</li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -88,12 +90,12 @@
    
 <h1> </h1>
 
-<h1> 1) <a href="Detection.html##(DETECTION_BASE)">Detection#DETECTION_BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<p> The <a href="Detection.html##(DETECTION_BASE)">Detection#DETECTION_BASE</a> class defines the core functions to administer detected objects.
- The <a href="Detection.html##(DETECTION_BASE)">Detection#DETECTION_BASE</a> class will detect objects within the battle zone for a list of <a href="Group.html">Group</a>s detecting targets following (a) detection method(s).</p>
+<h1> 1) <a href="Functional.Detection.html##(DETECTION_BASE)">Functional.Detection#DETECTION_BASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+<p> The <a href="Functional.Detection.html##(DETECTION_BASE)">Functional.Detection#DETECTION_BASE</a> class defines the core functions to administer detected objects.
+ The <a href="Functional.Detection.html##(DETECTION_BASE)">Functional.Detection#DETECTION_BASE</a> class will detect objects within the battle zone for a list of <a href="Group.html">Group</a>s detecting targets following (a) detection method(s).</p>
 
 <h2> 1.1) DETECTION_BASE constructor</h2>
-<p> Construct a new DETECTION_BASE instance using the <a href="Detection.html##(DETECTION_BASE).New">Detection#DETECTION_BASE.New</a>() method.</p>
+<p> Construct a new DETECTION_BASE instance using the <a href="Functional.Detection.html##(DETECTION_BASE).New">Functional.Detection#DETECTION_BASE.New</a>() method.</p>
 
 <h2> 1.2) DETECTION_BASE initialization</h2>
 <p> By default, detection will return detected objects with all the detection sensors available.
@@ -104,42 +106,42 @@
 <p> Use the following functions to report the objects it detected using the methods Visual, Optical, Radar, IRST, RWR, DLINK:</p>
 
 <ul>
-    <li><a href="Detection.html##(DETECTION_BASE).InitDetectVisual">Detection#DETECTION_BASE.InitDetectVisual</a>(): Detected using Visual.</li>
-    <li><a href="Detection.html##(DETECTION_BASE).InitDetectOptical">Detection#DETECTION_BASE.InitDetectOptical</a>(): Detected using Optical.</li>
-    <li><a href="Detection.html##(DETECTION_BASE).InitDetectRadar">Detection#DETECTION_BASE.InitDetectRadar</a>(): Detected using Radar.</li>
-    <li><a href="Detection.html##(DETECTION_BASE).InitDetectIRST">Detection#DETECTION_BASE.InitDetectIRST</a>(): Detected using IRST.</li>
-    <li><a href="Detection.html##(DETECTION_BASE).InitDetectRWR">Detection#DETECTION_BASE.InitDetectRWR</a>(): Detected using RWR.</li>
-    <li><a href="Detection.html##(DETECTION_BASE).InitDetectDLINK">Detection#DETECTION_BASE.InitDetectDLINK</a>(): Detected using DLINK.</li>
+    <li><a href="Functional.Detection.html##(DETECTION_BASE).InitDetectVisual">Functional.Detection#DETECTION_BASE.InitDetectVisual</a>(): Detected using Visual.</li>
+    <li><a href="Functional.Detection.html##(DETECTION_BASE).InitDetectOptical">Functional.Detection#DETECTION_BASE.InitDetectOptical</a>(): Detected using Optical.</li>
+    <li><a href="Functional.Detection.html##(DETECTION_BASE).InitDetectRadar">Functional.Detection#DETECTION_BASE.InitDetectRadar</a>(): Detected using Radar.</li>
+    <li><a href="Functional.Detection.html##(DETECTION_BASE).InitDetectIRST">Functional.Detection#DETECTION_BASE.InitDetectIRST</a>(): Detected using IRST.</li>
+    <li><a href="Functional.Detection.html##(DETECTION_BASE).InitDetectRWR">Functional.Detection#DETECTION_BASE.InitDetectRWR</a>(): Detected using RWR.</li>
+    <li><a href="Functional.Detection.html##(DETECTION_BASE).InitDetectDLINK">Functional.Detection#DETECTION_BASE.InitDetectDLINK</a>(): Detected using DLINK.</li>
 </ul>
 
 <h2> 1.3) Obtain objects detected by DETECTION_BASE</h2>
-<p> DETECTION_BASE builds <a href="Set.html">Set</a>s of objects detected. These <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>s can be retrieved using the method <a href="Detection.html##(DETECTION_BASE).GetDetectedSets">Detection#DETECTION_BASE.GetDetectedSets</a>().
- The method will return a list (table) of <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> objects.</p>
+<p> DETECTION_BASE builds <a href="Set.html">Set</a>s of objects detected. These <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>s can be retrieved using the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectedSets">Functional.Detection#DETECTION_BASE.GetDetectedSets</a>().
+ The method will return a list (table) of <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> objects.</p>
 
 <hr/>
 
-<h1> 2) <a href="Detection.html##(DETECTION_AREAS)">Detection#DETECTION_AREAS</a> class, extends <a href="Detection.html##(DETECTION_BASE)">Detection#DETECTION_BASE</a></h1>
-<p> The <a href="Detection.html##(DETECTION_AREAS)">Detection#DETECTION_AREAS</a> class will detect units within the battle zone for a list of <a href="Group.html">Group</a>s detecting targets following (a) detection method(s), 
- and will build a list (table) of <a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a>s containing the <a href="Unit.html##(UNIT)">Unit#UNIT</a>s detected.
+<h1> 2) <a href="Functional.Detection.html##(DETECTION_AREAS)">Functional.Detection#DETECTION_AREAS</a> class, extends <a href="Functional.Detection.html##(DETECTION_BASE)">Functional.Detection#DETECTION_BASE</a></h1>
+<p> The <a href="Functional.Detection.html##(DETECTION_AREAS)">Functional.Detection#DETECTION_AREAS</a> class will detect units within the battle zone for a list of <a href="Group.html">Group</a>s detecting targets following (a) detection method(s), 
+ and will build a list (table) of <a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a>s containing the <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>s detected.
  The class is group the detected units within zones given a DetectedZoneRange parameter.
  A set with multiple detected zones will be created as there are groups of units detected.</p>
 
 <h2> 2.1) Retrieve the Detected Unit sets and Detected Zones</h2>
-<p> The DetectedUnitSets methods are implemented in <a href="Detection.html##(DECTECTION_BASE)">Detection#DECTECTION_BASE</a> and the DetectedZones methods is implemented in <a href="Detection.html##(DETECTION_AREAS)">Detection#DETECTION_AREAS</a>.</p>
+<p> The DetectedUnitSets methods are implemented in <a href="Functional.Detection.html##(DECTECTION_BASE)">Functional.Detection#DECTECTION_BASE</a> and the DetectedZones methods is implemented in <a href="Functional.Detection.html##(DETECTION_AREAS)">Functional.Detection#DETECTION_AREAS</a>.</p>
 
-<p> Retrieve the DetectedUnitSets with the method <a href="Detection.html##(DETECTION_BASE).GetDetectedSets">Detection#DETECTION_BASE.GetDetectedSets</a>(). A table will be return of <a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a>s.
- To understand the amount of sets created, use the method <a href="Detection.html##(DETECTION_BASE).GetDetectedSetCount">Detection#DETECTION_BASE.GetDetectedSetCount</a>(). 
- If you want to obtain a specific set from the DetectedSets, use the method <a href="Detection.html##(DETECTION_BASE).GetDetectedSet">Detection#DETECTION_BASE.GetDetectedSet</a>() with a given index.</p>
+<p> Retrieve the DetectedUnitSets with the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectedSets">Functional.Detection#DETECTION_BASE.GetDetectedSets</a>(). A table will be return of <a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a>s.
+ To understand the amount of sets created, use the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectedSetCount">Functional.Detection#DETECTION_BASE.GetDetectedSetCount</a>(). 
+ If you want to obtain a specific set from the DetectedSets, use the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectedSet">Functional.Detection#DETECTION_BASE.GetDetectedSet</a>() with a given index.</p>
 
-<p> Retrieve the formed <a href="Zone.html">Zone</a>s as a result of the grouping the detected units within the DetectionZoneRange, use the method <a href="Detection.html##(DETECTION_BASE).GetDetectionZones">Detection#DETECTION_BASE.GetDetectionZones</a>().
- To understand the amount of zones created, use the method <a href="Detection.html##(DETECTION_BASE).GetDetectionZoneCount">Detection#DETECTION_BASE.GetDetectionZoneCount</a>(). 
- If you want to obtain a specific zone from the DetectedZones, use the method <a href="Detection.html##(DETECTION_BASE).GetDetectionZone">Detection#DETECTION_BASE.GetDetectionZone</a>() with a given index.</p>
+<p> Retrieve the formed <a href="Zone.html">Zone</a>s as a result of the grouping the detected units within the DetectionZoneRange, use the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectionZones">Functional.Detection#DETECTION_BASE.GetDetectionZones</a>().
+ To understand the amount of zones created, use the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectionZoneCount">Functional.Detection#DETECTION_BASE.GetDetectionZoneCount</a>(). 
+ If you want to obtain a specific zone from the DetectedZones, use the method <a href="Functional.Detection.html##(DETECTION_BASE).GetDetectionZone">Functional.Detection#DETECTION_BASE.GetDetectionZone</a>() with a given index.</p>
 
 <h2> 1.4) Flare or Smoke detected units</h2>
-<p> Use the methods <a href="Detection.html##(DETECTION_AREAS).FlareDetectedUnits">Detection#DETECTION_AREAS.FlareDetectedUnits</a>() or <a href="Detection.html##(DETECTION_AREAS).SmokeDetectedUnits">Detection#DETECTION_AREAS.SmokeDetectedUnits</a>() to flare or smoke the detected units when a new detection has taken place.</p>
+<p> Use the methods <a href="Functional.Detection.html##(DETECTION_AREAS).FlareDetectedUnits">Functional.Detection#DETECTION_AREAS.FlareDetectedUnits</a>() or <a href="Functional.Detection.html##(DETECTION_AREAS).SmokeDetectedUnits">Functional.Detection#DETECTION_AREAS.SmokeDetectedUnits</a>() to flare or smoke the detected units when a new detection has taken place.</p>
 
 <h2> 1.5) Flare or Smoke detected zones</h2>
-<p> Use the methods <a href="Detection.html##(DETECTION_AREAS).FlareDetectedZones">Detection#DETECTION_AREAS.FlareDetectedZones</a>() or <a href="Detection.html##(DETECTION_AREAS).SmokeDetectedZones">Detection#DETECTION_AREAS.SmokeDetectedZones</a>() to flare or smoke the detected zones when a new detection has taken place.</p>
+<p> Use the methods <a href="Functional.Detection.html##(DETECTION_AREAS).FlareDetectedZones">Functional.Detection#DETECTION_AREAS.FlareDetectedZones</a>() or <a href="Functional.Detection.html##(DETECTION_AREAS).SmokeDetectedZones">Functional.Detection#DETECTION_AREAS.SmokeDetectedZones</a>() to flare or smoke the detected zones when a new detection has taken place.</p>
 
 <hr/>
 
@@ -260,13 +262,13 @@
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DETECTION_AREAS).GetDetectedSet">DETECTION_AREAS:GetDetectedSet(Index)</a></td>
 		<td class="summary">
-<p>Get the <a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> of a detecttion area using a given numeric index.</p>
+<p>Get the <a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> of a detecttion area using a given numeric index.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DETECTION_AREAS).GetDetectedZone">DETECTION_AREAS:GetDetectedZone(Index)</a></td>
 		<td class="summary">
-<p>Get the <a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a> of a detection area using a given numeric index.</p>
+<p>Get the <a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a> of a detection area using a given numeric index.</p>
 </td>
 		</tr>
 		<tr>
@@ -502,7 +504,7 @@
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DETECTION_BASE).GetDetectedSets">DETECTION_BASE:GetDetectedSets()</a></td>
 		<td class="summary">
-<p>Get the detected <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>s.</p>
+<p>Get the detected <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>s.</p>
 </td>
 		</tr>
 		<tr>
@@ -598,7 +600,7 @@
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(DETECTION_BASE)._DetectionScheduler">DETECTION_BASE:_DetectionScheduler(SchedulerName)</a></td>
 		<td class="summary">
-<p>Form <a href="Set.html">Set</a>s of detected <a href="Unit.html##(UNIT)">Unit#UNIT</a>s in an array of <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>s.</p>
+<p>Form <a href="Set.html">Set</a>s of detected <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>s in an array of <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>s.</p>
 </td>
 		</tr>
 	</table>
@@ -786,13 +788,13 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> Set </em></code>: 
+<p><code><em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> Set </em></code>: 
 -- The Set of Units in the detected area.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a> Zone </em></code>: 
 -- The Zone of the detected area.</p>
 
 				</li>
@@ -882,7 +884,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(DETECTION_AREAS).DetectionZoneRange" >
 <strong>DETECTION_AREAS.DetectionZoneRange</strong>
 </a>
@@ -1000,7 +1002,7 @@ DetectedAreas</p>
 </dt>
 <dd>
 	
-<p>Get the <a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> of a detecttion area using a given numeric index.</p>
+<p>Get the <a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> of a detecttion area using a given numeric index.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -1012,7 +1014,7 @@ DetectedAreas</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a>:</em>
+<p><em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a>:</em>
 DetectedSet</p>
 
 </dd>
@@ -1026,7 +1028,7 @@ DetectedSet</p>
 </dt>
 <dd>
 	
-<p>Get the <a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a> of a detection area using a given numeric index.</p>
+<p>Get the <a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a> of a detection area using a given numeric index.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -1038,7 +1040,7 @@ DetectedSet</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a>:</em>
+<p><em><a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a>:</em>
 DetectedZone</p>
 
 </dd>
@@ -1116,7 +1118,7 @@ trhe if there are friendlies nearby </p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+<p><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>:</em>
 The nearest FAC unit</p>
 
 </dd>
@@ -1136,26 +1138,26 @@ The nearest FAC unit</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a> DetectionSetGroup </em></code>: 
+<p><code><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> DetectionSetGroup </em></code>: 
 The <a href="Set.html">Set</a> of GROUPs in the Forward Air Controller role.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> DetectionRange </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> DetectionRange </em></code>: 
 The range till which targets are accepted to be detected.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> DetectionZoneRange </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> DetectionZoneRange </em></code>: 
 The range till which targets are grouped upon the first detected target.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Detection.html##(DETECTION_AREAS)">Detection#DETECTION_AREAS</a>:</em>
+<p><em><a href="Functional.Detection.html##(DETECTION_AREAS)">Functional.Detection#DETECTION_AREAS</a>:</em>
 self</p>
 
 </dd>
@@ -1202,7 +1204,7 @@ The Index of the detection are to be removed.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ReportUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ReportUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -1381,7 +1383,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(DETECTION_AREAS.DetectedArea).NearestFAC" >
 <strong>DETECTION_AREAS.DetectedArea.NearestFAC</strong>
 </a>
@@ -1395,7 +1397,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
+		<em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a></em>
 <a id="#(DETECTION_AREAS.DetectedArea).Set" >
 <strong>DETECTION_AREAS.DetectedArea.Set</strong>
 </a>
@@ -1409,7 +1411,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a></em>
+		<em><a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a></em>
 <a id="#(DETECTION_AREAS.DetectedArea).Zone" >
 <strong>DETECTION_AREAS.DetectedArea.Zone</strong>
 </a>
@@ -1578,7 +1580,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(DETECTION_BASE).DetectionRange" >
 <strong>DETECTION_BASE.DetectionRange</strong>
 </a>
@@ -1620,7 +1622,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a></em>
+		<em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a></em>
 <a id="#(DETECTION_BASE).DetectionSetGroup" >
 <strong>DETECTION_BASE.DetectionSetGroup</strong>
 </a>
@@ -1678,7 +1680,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Set.html##(SET_BASE)">Set#SET_BASE</a>:</em></p>
+<p><em><a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>:</em></p>
 
 
 </dd>
@@ -1710,7 +1712,7 @@ Count</p>
 </dt>
 <dd>
 	
-<p>Get the detected <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>s.</p>
+<p>Get the detected <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>s.</p>
 
 		<h3>Return value</h3>
 				
@@ -1732,7 +1734,7 @@ DetectedSets</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em></p>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em></p>
 
 
 </dd>
@@ -1955,13 +1957,13 @@ true if already identified.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a> DetectionSetGroup </em></code>: 
+<p><code><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> DetectionSetGroup </em></code>: 
 The <a href="Set.html">Set</a> of GROUPs in the Forward Air Controller role.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> DetectionRange </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> DetectionRange </em></code>: 
 The range till which targets are accepted to be detected.</p>
 
 				</li>
@@ -2077,7 +2079,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Form <a href="Set.html">Set</a>s of detected <a href="Unit.html##(UNIT)">Unit#UNIT</a>s in an array of <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>s.</p>
+<p>Form <a href="Set.html">Set</a>s of detected <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>s in an array of <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>s.</p>
 
 		<h3>Parameter</h3>
 		<ul>
diff --git a/Moose Training/Documentation/Escort.html b/Moose Training/Documentation/Escort.html
index dd03c1027..e1bb39110 100644
--- a/Moose Training/Documentation/Escort.html	
+++ b/Moose Training/Documentation/Escort.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li>Escort</li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -168,7 +170,7 @@ Note that this is really fantastic, as you now have the dynamic of taking contro
 <p>Create a new SPAWN object with the <a href="##(ESCORT).New">ESCORT.New</a> method:</p>
 
 <ul>
-    <li><a href="##(ESCORT).New">ESCORT.New</a>: Creates a new ESCORT object from a <a href="Group.html##(GROUP)">Group#GROUP</a> for a <a href="Client.html##(CLIENT)">Client#CLIENT</a>, with an optional briefing text.</li>
+    <li><a href="##(ESCORT).New">ESCORT.New</a>: Creates a new ESCORT object from a <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> for a <a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a>, with an optional briefing text.</li>
 </ul>
 
 <h1>ESCORT initialization methods.</h1>
@@ -774,7 +776,7 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EscortGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> EscortGroup </em></code>: </p>
 
 				</li>
 		</ul>
@@ -806,7 +808,7 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<dl class="function">
 <dt>
 
-		<em><a href="Client.html##(CLIENT)">Client#CLIENT</a></em>
+		<em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a></em>
 <a id="#(ESCORT).EscortClient" >
 <strong>ESCORT.EscortClient</strong>
 </a>
@@ -820,7 +822,7 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<dl class="function">
 <dt>
 
-		<em><a href="Group.html##(GROUP)">Group#GROUP</a></em>
+		<em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a></em>
 <a id="#(ESCORT).EscortGroup" >
 <strong>ESCORT.EscortGroup</strong>
 </a>
@@ -1196,7 +1198,7 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<dl class="function">
 <dt>
 
-		<em><a href="Menu.html##(MENU_CLIENT)">Menu#MENU_CLIENT</a></em>
+		<em><a href="Core.Menu.html##(MENU_CLIENT)">Core.Menu#MENU_CLIENT</a></em>
 <a id="#(ESCORT).EscortMenuResumeMission" >
 <strong>ESCORT.EscortMenuResumeMission</strong>
 </a>
@@ -1382,7 +1384,7 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<dl class="function">
 <dt>
 
-		<em><a href="Scheduler.html##(SCHEDULER)">Scheduler#SCHEDULER</a></em>
+		<em><a href="Core.Scheduler.html##(SCHEDULER)">Core.Scheduler#SCHEDULER</a></em>
 <a id="#(ESCORT).FollowScheduler" >
 <strong>ESCORT.FollowScheduler</strong>
 </a>
@@ -1408,17 +1410,17 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EscortGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> EscortGroup </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> EscortClient </em></code>: </p>
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> EscortClient </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Distance </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Distance </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1538,7 +1540,7 @@ Optional parameter that shows the menu option text. If no text is given, the def
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Distance </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Distance </em></code>: 
 The distance in meters that the escort needs to follow the client.</p>
 
 				</li>
@@ -1568,13 +1570,13 @@ The distance in meters that the escort needs to follow the client.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Height </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Height </em></code>: 
 Optional parameter that sets the height in meters to let the escort orbit at the current location. The default value is 30 meters.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Time)">DCSTypes#Time</a> Seconds </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Time)">Dcs.DCSTypes#Time</a> Seconds </em></code>: 
 Optional parameter that lets the escort orbit at the current position for a specified time. (not implemented yet). The default value is 0 seconds, meaning, that the escort will orbit forever until a sequent command is given.</p>
 
 				</li>
@@ -1610,13 +1612,13 @@ TODO: Implement Seconds parameter. Challenge is to first develop the "continue f
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Height </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Height </em></code>: 
 Optional parameter that sets the height in meters to let the escort orbit at the current location. The default value is 30 meters.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Time)">DCSTypes#Time</a> Seconds </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Time)">Dcs.DCSTypes#Time</a> Seconds </em></code>: 
 Optional parameter that lets the escort orbit at the current position for a specified time. (not implemented yet). The default value is 0 seconds, meaning, that the escort will orbit forever until a sequent command is given.</p>
 
 				</li>
@@ -1682,7 +1684,7 @@ Note that if a report targets menu is not specified, no targets will be detected
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Time)">DCSTypes#Time</a> Seconds </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Time)">Dcs.DCSTypes#Time</a> Seconds </em></code>: 
 Optional parameter that lets the escort report their current detected targets after specified time interval in seconds. The default time is 30 seconds.</p>
 
 				</li>
@@ -1733,13 +1735,13 @@ Optional parameter that lets the escort report their current detected targets af
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Height </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Height </em></code>: 
 Optional parameter that sets the height in meters to let the escort orbit at the current location. The default value is 30 meters.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Time)">DCSTypes#Time</a> Seconds </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Time)">Dcs.DCSTypes#Time</a> Seconds </em></code>: 
 Optional parameter that lets the escort orbit at the current position for a specified time. (not implemented yet). The default value is 0 seconds, meaning, that the escort will orbit forever until a sequent command is given.</p>
 
 				</li>
@@ -1822,13 +1824,13 @@ Optional parameter that shows the menu option text. If no text is given, the def
 		<ul>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> EscortClient </em></code>: 
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> EscortClient </em></code>: 
 The client escorted by the EscortGroup.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EscortGroup </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> EscortGroup </em></code>: 
 The group AI escorting the EscortClient.</p>
 
 				</li>
@@ -1879,7 +1881,7 @@ EscortPlanes = ESCORT:New( EscortClient, EscortGroup, "Desert", "Welcome to the
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(AI.Option.Air.val.REACTION_ON_THREAT)">DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT</a></em>
+		<em><a href="Dcs.DCSTypes.html##(AI.Option.Air.val.REACTION_ON_THREAT)">Dcs.DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT</a></em>
 <a id="#(ESCORT).OptionReactionOnThreat" >
 <strong>ESCORT.OptionReactionOnThreat</strong>
 </a>
diff --git a/Moose Training/Documentation/Event.html b/Moose Training/Documentation/Event.html
index b16fbdffa..9ef6db666 100644
--- a/Moose Training/Documentation/Event.html	
+++ b/Moose Training/Documentation/Event.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li>Event</li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,15 +75,33 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>Event</code></h1>
    
-<p>The EVENT class models an efficient event handling process between other classes and its units, weapons.</p>
+<p>This module contains the EVENT class.</p>
+
+   
+
+<hr/>
+
+<p>Takes care of EVENT dispatching between DCS events and event handling functions defined in MOOSE classes.</p>
+
+<hr/>
+
+<p>The above menus classes <strong>are derived</strong> from 2 main <strong>abstract</strong> classes defined within the MOOSE framework (so don't use these):</p>
+
+<hr/>
+
+<h3>Contributions: -</h3>
+<h3>Authors: FlightControl : Design &amp; Programming</h3>
+
 
 	<h2>Global(s)</h2>
 	<table class="function_list">
@@ -133,243 +151,249 @@
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirth">EVENT:OnBirth(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirth">EVENT:OnBirth(EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>BIRTH event, and registers the unit born.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirthForTemplate">EVENT:OnBirthForTemplate(EventGroup, EventFunction, EventSelf, EventTemplate)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirthForTemplate">EVENT:OnBirthForTemplate(EventGroup, EventFunction, EventClass, EventTemplate)</a></td>
 		<td class="summary">
 <p>Create an OnBirth event handler for a group</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirthForUnit">EVENT:OnBirthForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirthForUnit">EVENT:OnBirthForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>BIRTH event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirthRemove">EVENT:OnBirthRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnBirthRemove">EVENT:OnBirthRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>BIRTH event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrash">EVENT:OnCrash(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrash">EVENT:OnCrash(EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>CRASH event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrashForTemplate">EVENT:OnCrashForTemplate(EventGroup, EventFunction, EventSelf, EventTemplate)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrashForTemplate">EVENT:OnCrashForTemplate(EventGroup, EventFunction, EventClass, EventTemplate)</a></td>
 		<td class="summary">
 <p>Create an OnCrash event handler for a group</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrashForUnit">EVENT:OnCrashForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrashForUnit">EVENT:OnCrashForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>CRASH event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrashRemove">EVENT:OnCrashRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnCrashRemove">EVENT:OnCrashRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>CRASH event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDead">EVENT:OnDead(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDead">EVENT:OnDead(EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>DEAD event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDeadForTemplate">EVENT:OnDeadForTemplate(EventGroup, EventFunction, EventSelf, EventTemplate)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDeadForTemplate">EVENT:OnDeadForTemplate(EventGroup, EventFunction, EventClass, EventTemplate)</a></td>
 		<td class="summary">
 <p>Create an OnDead event handler for a group</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDeadForUnit">EVENT:OnDeadForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDeadForUnit">EVENT:OnDeadForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>DEAD event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDeadRemove">EVENT:OnDeadRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnDeadRemove">EVENT:OnDeadRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>DEAD event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineShutDownForTemplate">EVENT:OnEngineShutDownForTemplate(EventTemplate, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineShutDownForTemplate">EVENT:OnEngineShutDownForTemplate(EventTemplate, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Create an OnDead event handler for a group</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineShutDownForUnit">EVENT:OnEngineShutDownForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineShutDownForUnit">EVENT:OnEngineShutDownForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>ENGINE_SHUTDOWN event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineShutDownRemove">EVENT:OnEngineShutDownRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineShutDownRemove">EVENT:OnEngineShutDownRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>ENGINE_SHUTDOWN event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineStartUpForUnit">EVENT:OnEngineStartUpForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineStartUpForUnit">EVENT:OnEngineStartUpForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>ENGINE_STARTUP event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineStartUpRemove">EVENT:OnEngineStartUpRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEngineStartUpRemove">EVENT:OnEngineStartUpRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>ENGINE_STARTUP event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEventForTemplate">EVENT:OnEventForTemplate(EventTemplate, EventFunction, EventSelf, OnEventFunction)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEventForTemplate">EVENT:OnEventForTemplate(EventTemplate, EventFunction, EventClass, OnEventFunction)</a></td>
 		<td class="summary">
 <p>Create an OnDead event handler for a group</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEventForUnit">EVENT:OnEventForUnit(EventDCSUnitName, EventFunction, EventSelf, EventID)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEventForUnit">EVENT:OnEventForUnit(EventDCSUnitName, EventFunction, EventClass, EventID)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>X event</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEventGeneric">EVENT:OnEventGeneric(EventFunction, EventSelf, EventID)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnEventGeneric">EVENT:OnEventGeneric(EventFunction, EventClass, EventID)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>X event independent from a unit or a weapon.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnHit">EVENT:OnHit(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnHit">EVENT:OnHit(EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>HIT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnHitForUnit">EVENT:OnHitForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnHitForUnit">EVENT:OnHitForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>HIT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnHitRemove">EVENT:OnHitRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnHitRemove">EVENT:OnHitRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>HIT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnLandForTemplate">EVENT:OnLandForTemplate(EventTemplate, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnLandForTemplate">EVENT:OnLandForTemplate(EventTemplate, EventFunction, EventClass)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnLandForUnit">EVENT:OnLandForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnLandForUnit">EVENT:OnLandForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>LAND event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnLandRemove">EVENT:OnLandRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnLandRemove">EVENT:OnLandRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>LAND event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPilotDead">EVENT:OnPilotDead(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPilotDead">EVENT:OnPilotDead(EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>PILOT_DEAD event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPilotDeadForUnit">EVENT:OnPilotDeadForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPilotDeadForUnit">EVENT:OnPilotDeadForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>PILOT_DEAD event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPilotDeadRemove">EVENT:OnPilotDeadRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPilotDeadRemove">EVENT:OnPilotDeadRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>PILOT_DEAD event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerEnterRemove">EVENT:OnPlayerEnterRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerEnterRemove">EVENT:OnPlayerEnterRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>PLAYER<em>ENTER</em>UNIT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerEnterUnit">EVENT:OnPlayerEnterUnit(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerEnterUnit">EVENT:OnPlayerEnterUnit(EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>PLAYER<em>ENTER</em>UNIT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerLeaveRemove">EVENT:OnPlayerLeaveRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerLeaveRemove">EVENT:OnPlayerLeaveRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>PLAYER<em>LEAVE</em>UNIT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerLeaveUnit">EVENT:OnPlayerLeaveUnit(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnPlayerLeaveUnit">EVENT:OnPlayerLeaveUnit(EventFunction, EventClass)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnShot">EVENT:OnShot(EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnShot">EVENT:OnShot(EventFunction, EventClass)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnShotForUnit">EVENT:OnShotForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnShotForUnit">EVENT:OnShotForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>SHOT event for a unit.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnShotRemove">EVENT:OnShotRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnShotRemove">EVENT:OnShotRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>SHOT event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnTakeOffForTemplate">EVENT:OnTakeOffForTemplate(EventTemplate, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnTakeOffForTemplate">EVENT:OnTakeOffForTemplate(EventTemplate, EventFunction, EventClass)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnTakeOffForUnit">EVENT:OnTakeOffForUnit(EventDCSUnitName, EventFunction, EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnTakeOffForUnit">EVENT:OnTakeOffForUnit(EventDCSUnitName, EventFunction, EventClass)</a></td>
 		<td class="summary">
 <p>Set a new listener for an S<em>EVENT</em>TAKEOFF event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnTakeOffRemove">EVENT:OnTakeOffRemove(EventSelf)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).OnTakeOffRemove">EVENT:OnTakeOffRemove(EventClass)</a></td>
 		<td class="summary">
 <p>Stop listening to S<em>EVENT</em>TAKEOFF event.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(EVENT).Remove">EVENT:Remove(EventSelf, EventID)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).Remove">EVENT:Remove(EventClass, EventID)</a></td>
 		<td class="summary">
 <p>Removes an Events entry</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(EVENT).RemoveAll">EVENT:RemoveAll(EventObject)</a></td>
+		<td class="summary">
+<p>Clears all event subscriptions for a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> derived object.</p>
 </td>
 		</tr>
 		<tr>
@@ -608,12 +632,12 @@
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSWorld.html##(world.event)">DCSWorld#world.event</a> EventID </em></code>: </p>
+<p><code><em><a href="Dcs.DCSWorld.html##(world.event)">Dcs.DCSWorld#world.event</a> EventID </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em>#string EventClass </em></code>: </p>
+<p><code><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -641,7 +665,7 @@
 <dt>
 
 <a id="#(EVENT).OnBirth" >
-<strong>EVENT:OnBirth(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnBirth(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -658,7 +682,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -673,7 +697,7 @@ The function to be called when the event occurs for the unit.</p>
 <dt>
 
 <a id="#(EVENT).OnBirthForTemplate" >
-<strong>EVENT:OnBirthForTemplate(EventGroup, EventFunction, EventSelf, EventTemplate)</strong>
+<strong>EVENT:OnBirthForTemplate(EventGroup, EventFunction, EventClass, EventTemplate)</strong>
 </a>
 </dt>
 <dd>
@@ -684,7 +708,7 @@ The function to be called when the event occurs for the unit.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EventGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> EventGroup </em></code>: </p>
 
 				</li>
 				<li>
@@ -695,7 +719,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: 
+<p><code><em> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -716,7 +740,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnBirthForUnit" >
-<strong>EVENT:OnBirthForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnBirthForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -739,7 +763,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -754,7 +778,7 @@ The function to be called when the event occurs for the unit.</p>
 <dt>
 
 <a id="#(EVENT).OnBirthRemove" >
-<strong>EVENT:OnBirthRemove(EventSelf)</strong>
+<strong>EVENT:OnBirthRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -765,7 +789,7 @@ The function to be called when the event occurs for the unit.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -780,7 +804,7 @@ The function to be called when the event occurs for the unit.</p>
 <dt>
 
 <a id="#(EVENT).OnCrash" >
-<strong>EVENT:OnCrash(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnCrash(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -797,7 +821,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -812,7 +836,7 @@ The function to be called when the event occurs for the unit.</p>
 <dt>
 
 <a id="#(EVENT).OnCrashForTemplate" >
-<strong>EVENT:OnCrashForTemplate(EventGroup, EventFunction, EventSelf, EventTemplate)</strong>
+<strong>EVENT:OnCrashForTemplate(EventGroup, EventFunction, EventClass, EventTemplate)</strong>
 </a>
 </dt>
 <dd>
@@ -823,7 +847,7 @@ The function to be called when the event occurs for the unit.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EventGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> EventGroup </em></code>: </p>
 
 				</li>
 				<li>
@@ -834,7 +858,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: 
+<p><code><em> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -855,7 +879,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnCrashForUnit" >
-<strong>EVENT:OnCrashForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnCrashForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -877,7 +901,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -893,7 +917,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnCrashRemove" >
-<strong>EVENT:OnCrashRemove(EventSelf)</strong>
+<strong>EVENT:OnCrashRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -904,7 +928,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -919,7 +943,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnDead" >
-<strong>EVENT:OnDead(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnDead(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -936,7 +960,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -951,7 +975,7 @@ The function to be called when the event occurs for the unit.</p>
 <dt>
 
 <a id="#(EVENT).OnDeadForTemplate" >
-<strong>EVENT:OnDeadForTemplate(EventGroup, EventFunction, EventSelf, EventTemplate)</strong>
+<strong>EVENT:OnDeadForTemplate(EventGroup, EventFunction, EventClass, EventTemplate)</strong>
 </a>
 </dt>
 <dd>
@@ -962,7 +986,7 @@ The function to be called when the event occurs for the unit.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> EventGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> EventGroup </em></code>: </p>
 
 				</li>
 				<li>
@@ -973,7 +997,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: 
+<p><code><em> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -994,7 +1018,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnDeadForUnit" >
-<strong>EVENT:OnDeadForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnDeadForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1016,7 +1040,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1032,7 +1056,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnDeadRemove" >
-<strong>EVENT:OnDeadRemove(EventSelf)</strong>
+<strong>EVENT:OnDeadRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1043,7 +1067,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1058,7 +1082,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEngineShutDownForTemplate" >
-<strong>EVENT:OnEngineShutDownForTemplate(EventTemplate, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnEngineShutDownForTemplate(EventTemplate, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1080,7 +1104,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: 
+<p><code><em> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1096,7 +1120,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEngineShutDownForUnit" >
-<strong>EVENT:OnEngineShutDownForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnEngineShutDownForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1118,7 +1142,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1134,7 +1158,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEngineShutDownRemove" >
-<strong>EVENT:OnEngineShutDownRemove(EventSelf)</strong>
+<strong>EVENT:OnEngineShutDownRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1145,7 +1169,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1160,7 +1184,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEngineStartUpForUnit" >
-<strong>EVENT:OnEngineStartUpForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnEngineStartUpForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1182,7 +1206,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1198,7 +1222,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEngineStartUpRemove" >
-<strong>EVENT:OnEngineStartUpRemove(EventSelf)</strong>
+<strong>EVENT:OnEngineStartUpRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1209,7 +1233,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1224,7 +1248,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEventForTemplate" >
-<strong>EVENT:OnEventForTemplate(EventTemplate, EventFunction, EventSelf, OnEventFunction)</strong>
+<strong>EVENT:OnEventForTemplate(EventTemplate, EventFunction, EventClass, OnEventFunction)</strong>
 </a>
 </dt>
 <dd>
@@ -1246,8 +1270,8 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: 
-The self instance of the class for which the event is.</p>
+<p><code><em> EventClass </em></code>: 
+The instance of the class for which the event is.</p>
 
 				</li>
 				<li>
@@ -1267,7 +1291,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEventForUnit" >
-<strong>EVENT:OnEventForUnit(EventDCSUnitName, EventFunction, EventSelf, EventID)</strong>
+<strong>EVENT:OnEventForUnit(EventDCSUnitName, EventFunction, EventClass, EventID)</strong>
 </a>
 </dt>
 <dd>
@@ -1289,7 +1313,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1310,7 +1334,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnEventGeneric" >
-<strong>EVENT:OnEventGeneric(EventFunction, EventSelf, EventID)</strong>
+<strong>EVENT:OnEventGeneric(EventFunction, EventClass, EventID)</strong>
 </a>
 </dt>
 <dd>
@@ -1327,8 +1351,8 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
-The self instance of the class for which the event is.</p>
+<p><code><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a> EventClass </em></code>: 
+The self instance of the class for which the event is captured. When the event happens, the event process will be called in this class provided.</p>
 
 				</li>
 				<li>
@@ -1348,7 +1372,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnHit" >
-<strong>EVENT:OnHit(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnHit(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1365,7 +1389,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1381,7 +1405,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnHitForUnit" >
-<strong>EVENT:OnHitForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnHitForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1403,7 +1427,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1419,7 +1443,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnHitRemove" >
-<strong>EVENT:OnHitRemove(EventSelf)</strong>
+<strong>EVENT:OnHitRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1430,7 +1454,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1445,7 +1469,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnLandForTemplate" >
-<strong>EVENT:OnLandForTemplate(EventTemplate, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnLandForTemplate(EventTemplate, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1466,7 +1490,7 @@ The self instance of the class for which the event is.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: </p>
+<p><code><em> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1476,7 +1500,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnLandForUnit" >
-<strong>EVENT:OnLandForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnLandForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1498,7 +1522,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1514,7 +1538,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnLandRemove" >
-<strong>EVENT:OnLandRemove(EventSelf)</strong>
+<strong>EVENT:OnLandRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1525,7 +1549,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1540,7 +1564,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnPilotDead" >
-<strong>EVENT:OnPilotDead(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnPilotDead(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1557,7 +1581,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1572,7 +1596,7 @@ The function to be called when the event occurs for the unit.</p>
 <dt>
 
 <a id="#(EVENT).OnPilotDeadForUnit" >
-<strong>EVENT:OnPilotDeadForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnPilotDeadForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1594,7 +1618,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1610,7 +1634,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnPilotDeadRemove" >
-<strong>EVENT:OnPilotDeadRemove(EventSelf)</strong>
+<strong>EVENT:OnPilotDeadRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1621,7 +1645,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1636,7 +1660,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnPlayerEnterRemove" >
-<strong>EVENT:OnPlayerEnterRemove(EventSelf)</strong>
+<strong>EVENT:OnPlayerEnterRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1647,7 +1671,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1662,7 +1686,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnPlayerEnterUnit" >
-<strong>EVENT:OnPlayerEnterUnit(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnPlayerEnterUnit(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1679,7 +1703,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1695,7 +1719,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnPlayerLeaveRemove" >
-<strong>EVENT:OnPlayerLeaveRemove(EventSelf)</strong>
+<strong>EVENT:OnPlayerLeaveRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1706,7 +1730,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1721,7 +1745,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnPlayerLeaveUnit" >
-<strong>EVENT:OnPlayerLeaveUnit(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnPlayerLeaveUnit(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1737,7 +1761,7 @@ The self instance of the class for which the event is.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: </p>
+<p><code><em> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1747,7 +1771,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnShot" >
-<strong>EVENT:OnShot(EventFunction, EventSelf)</strong>
+<strong>EVENT:OnShot(EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1763,7 +1787,7 @@ The self instance of the class for which the event is.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: </p>
+<p><code><em> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1773,7 +1797,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnShotForUnit" >
-<strong>EVENT:OnShotForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnShotForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1795,7 +1819,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1811,7 +1835,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnShotRemove" >
-<strong>EVENT:OnShotRemove(EventSelf)</strong>
+<strong>EVENT:OnShotRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1822,7 +1846,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1837,7 +1861,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnTakeOffForTemplate" >
-<strong>EVENT:OnTakeOffForTemplate(EventTemplate, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnTakeOffForTemplate(EventTemplate, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1858,7 +1882,7 @@ The self instance of the class for which the event is.</p>
 				</li>
 				<li>
 				
-<p><code><em> EventSelf </em></code>: </p>
+<p><code><em> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1868,7 +1892,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnTakeOffForUnit" >
-<strong>EVENT:OnTakeOffForUnit(EventDCSUnitName, EventFunction, EventSelf)</strong>
+<strong>EVENT:OnTakeOffForUnit(EventDCSUnitName, EventFunction, EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1890,7 +1914,7 @@ The function to be called when the event occurs for the unit.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
@@ -1906,7 +1930,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).OnTakeOffRemove" >
-<strong>EVENT:OnTakeOffRemove(EventSelf)</strong>
+<strong>EVENT:OnTakeOffRemove(EventClass)</strong>
 </a>
 </dt>
 <dd>
@@ -1917,7 +1941,7 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: </p>
+<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventClass </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1932,7 +1956,7 @@ The self instance of the class for which the event is.</p>
 <dt>
 
 <a id="#(EVENT).Remove" >
-<strong>EVENT:Remove(EventSelf, EventID)</strong>
+<strong>EVENT:Remove(EventClass, EventID)</strong>
 </a>
 </dt>
 <dd>
@@ -1943,13 +1967,13 @@ The self instance of the class for which the event is.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> EventSelf </em></code>: 
+<p><code><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a> EventClass </em></code>: 
 The self instance of the class for which the event is.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSWorld.html##(world.event)">DCSWorld#world.event</a> EventID </em></code>: </p>
+<p><code><em><a href="Dcs.DCSWorld.html##(world.event)">Dcs.DCSWorld#world.event</a> EventID </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1963,6 +1987,27 @@ The self instance of the class for which the event is.</p>
 		<dl class="function">
 <dt>
 
+<a id="#(EVENT).RemoveAll" >
+<strong>EVENT:RemoveAll(EventObject)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Clears all event subscriptions for a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> derived object.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a> EventObject </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(EVENT).onEvent" >
 <strong>EVENT:onEvent(Event)</strong>
 </a>
@@ -2062,7 +2107,7 @@ The self instance of the class for which the event is.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(EVENTDATA).IniUnit" >
 <strong>EVENTDATA.IniUnit</strong>
 </a>
@@ -2142,7 +2187,7 @@ The self instance of the class for which the event is.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(EVENTDATA).TgtUnit" >
 <strong>EVENTDATA.TgtUnit</strong>
 </a>
diff --git a/Moose Training/Documentation/Fsm.html b/Moose Training/Documentation/Fsm.html
new file mode 100644
index 000000000..42fe68623
--- /dev/null
+++ b/Moose Training/Documentation/Fsm.html	
@@ -0,0 +1,2036 @@
+<!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="AI_Balancer.html">AI_Balancer</a></li>
+					<li><a href="Account.html">Account</a></li>
+					<li><a href="Airbase.html">Airbase</a></li>
+					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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="CommandCenter.html">CommandCenter</a></li>
+					<li><a href="Controllable.html">Controllable</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="DCScountry.html">DCScountry</a></li>
+					<li><a href="DCStimer.html">DCStimer</a></li>
+					<li><a href="DCStrigger.html">DCStrigger</a></li>
+					<li><a href="Database.html">Database</a></li>
+					<li><a href="Detection.html">Detection</a></li>
+					<li><a href="Escort.html">Escort</a></li>
+					<li><a href="Event.html">Event</a></li>
+					<li>Fsm</li>
+					<li><a href="Group.html">Group</a></li>
+					<li><a href="Identifiable.html">Identifiable</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="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
+					<li><a href="Point.html">Point</a></li>
+					<li><a href="Positionable.html">Positionable</a></li>
+					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
+					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
+					<li><a href="Spawn.html">Spawn</a></li>
+					<li><a href="Static.html">Static</a></li>
+					<li><a href="StaticObject.html">StaticObject</a></li>
+					<li><a href="Task.html">Task</a></li>
+					<li><a href="Task_A2G.html">Task_A2G</a></li>
+					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
+					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
+					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>Fsm</code></h1>
+   
+<p>This module contains the FSM class.</p>
+
+   
+<p>This development is based on a state machine implementation made by Conroy Kyle.
+The state machine can be found here: https://github.com/kyleconroy/lua-state-machine</p>
+
+<p>I've taken the development and enhanced it to make the state machine hierarchical...
+It is a fantastic development, this module.</p>
+
+<hr/>
+
+<h1>1) <a href="Workflow.html##(FSM)">Workflow#FSM</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+
+<h2>1.1) Add or remove objects from the FSM</h2>
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#FSM">FSM</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#FSM_CONTROLLABLE">FSM_CONTROLLABLE</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#FSM_PROCESS">FSM_PROCESS</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#FSM_SET">FSM_SET</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#FSM_TASK">FSM_TASK</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(FSM)">Type <code>FSM</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).AddEndState">FSM:AddEndState(State)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).AddProcess">FSM:AddProcess(From, Event, Process, ReturnEvents)</a></td>
+		<td class="summary">
+<p>Set the default <a href="Process.html">Process</a> template with key ProcessName providing the ProcessClass and the process object when it is assigned to a <a href="Controllable.html">Controllable</a> by the task.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).AddScore">FSM:AddScore(State, ScoreText, Score)</a></td>
+		<td class="summary">
+<p>Adds a score for the FSM to be achieved.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).AddScoreProcess">FSM:AddScoreProcess(From, Event, State, ScoreText, Score)</a></td>
+		<td class="summary">
+<p>Adds a score for the FSM_PROCESS to be achieved.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).AddTransition">FSM:AddTransition(From, Event, To)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).ClassName">FSM.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetEndStates">FSM:GetEndStates()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetProcess">FSM:GetProcess(From, Event)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetProcesses">FSM:GetProcesses()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetScores">FSM:GetScores()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetStartState">FSM:GetStartState()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetState">FSM:GetState()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetSubs">FSM:GetSubs()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).GetTransitions">FSM:GetTransitions()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).Is">FSM:Is(State)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).LoadCallBacks">FSM:LoadCallBacks(CallBackTable)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).New">FSM:New(FsmT)</a></td>
+		<td class="summary">
+<p>Creates a new FSM object.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).SetStartState">FSM:SetStartState(State)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._add_to_map">FSM:_add_to_map(Map, Event)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._call_handler">FSM:_call_handler(handler, params)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._create_transition">FSM:_create_transition(EventName)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._delayed_transition">FSM:_delayed_transition(EventName)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._eventmap">FSM:_eventmap(Events, EventStructure)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._gosub">FSM:_gosub(ParentFrom, ParentEvent)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._handler">FSM:_handler(EventName, ...)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._isendstate">FSM:_isendstate(Current)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM)._submap">FSM:_submap(subs, sub, name)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).can">FSM:can(e)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).cannot">FSM:cannot(e)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM).is">FSM:is(state)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(FSM_CONTROLLABLE)">Type <code>FSM_CONTROLLABLE</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_CONTROLLABLE).ClassName">FSM_CONTROLLABLE.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_CONTROLLABLE).Controllable">FSM_CONTROLLABLE.Controllable</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_CONTROLLABLE).GetControllable">FSM_CONTROLLABLE:GetControllable()</a></td>
+		<td class="summary">
+<p>Gets the CONTROLLABLE object that the FSM_CONTROLLABLE governs.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_CONTROLLABLE).New">FSM_CONTROLLABLE:New(FSMT, Controllable)</a></td>
+		<td class="summary">
+<p>Creates a new FSM_CONTROLLABLE object.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_CONTROLLABLE).SetControllable">FSM_CONTROLLABLE:SetControllable(FSMControllable)</a></td>
+		<td class="summary">
+<p>Sets the CONTROLLABLE object that the FSM_CONTROLLABLE governs.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_CONTROLLABLE)._call_handler">FSM_CONTROLLABLE:_call_handler(handler, params)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(FSM_PROCESS)">Type <code>FSM_PROCESS</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).AddScore">FSM_PROCESS:AddScore(State, ScoreText, Score)</a></td>
+		<td class="summary">
+<p>Adds a score for the FSM_PROCESS to be achieved.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).Assign">FSM_PROCESS:Assign(Task, ProcessUnit)</a></td>
+		<td class="summary">
+<p>Assign the process to a <a href="Unit.html">Unit</a> and activate the process.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).ClassName">FSM_PROCESS.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).Copy">FSM_PROCESS:Copy(Controllable, Task)</a></td>
+		<td class="summary">
+<p>Creates a new FSM<em>PROCESS object based on this FSM</em>PROCESS.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).GetCommandCenter">FSM_PROCESS:GetCommandCenter()</a></td>
+		<td class="summary">
+<p>Gets the mission of the process.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).GetMission">FSM_PROCESS:GetMission()</a></td>
+		<td class="summary">
+<p>Gets the mission of the process.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).GetTask">FSM_PROCESS:GetTask()</a></td>
+		<td class="summary">
+<p>Gets the task of the process.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).Init">FSM_PROCESS:Init(FsmProcess)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).Message">FSM_PROCESS:Message(Message)</a></td>
+		<td class="summary">
+<p>Send a message of the <a href="Task.html">Task</a> to the Group of the Unit.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).New">FSM_PROCESS:New(Controllable, Task)</a></td>
+		<td class="summary">
+<p>Creates a new FSM_PROCESS object.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).SetTask">FSM_PROCESS:SetTask(Task)</a></td>
+		<td class="summary">
+<p>Sets the task of the process.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).Task">FSM_PROCESS.Task</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).onenterAssigned">FSM_PROCESS:onenterAssigned(ProcessUnit)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).onenterFailed">FSM_PROCESS:onenterFailed(ProcessUnit)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).onenterSuccess">FSM_PROCESS:onenterSuccess(ProcessUnit)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_PROCESS).onstatechange">FSM_PROCESS:onstatechange(ProcessUnit, Event, From, To, Dummy)</a></td>
+		<td class="summary">
+<p>StateMachine callback function for a FSM_PROCESS</p>
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(FSM_SET)">Type <code>FSM_SET</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_SET).ClassName">FSM_SET.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_SET).Get">FSM_SET:Get()</a></td>
+		<td class="summary">
+<p>Gets the SET<em>BASE object that the FSM</em>SET governs.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_SET).New">FSM_SET:New(FSMT, Set_SET_BASE, FSMSet)</a></td>
+		<td class="summary">
+<p>Creates a new FSM_SET object.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_SET).Set">FSM_SET.Set</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_SET)._call_handler">FSM_SET:_call_handler(handler, params)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(FSM_TASK)">Type <code>FSM_TASK</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_TASK).ClassName">FSM_TASK.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_TASK).New">FSM_TASK:New(FSMT, Task, TaskUnit)</a></td>
+		<td class="summary">
+<p>Creates a new FSM_TASK object.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_TASK).Task">FSM_TASK.Task</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(FSM_TASK)._call_handler">FSM_TASK:_call_handler(handler, params)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(FSM)">#FSM</a></em>
+<a id="FSM" >
+<strong>FSM</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(FSM_CONTROLLABLE)">#FSM_CONTROLLABLE</a></em>
+<a id="FSM_CONTROLLABLE" >
+<strong>FSM_CONTROLLABLE</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(FSM_PROCESS)">#FSM_PROCESS</a></em>
+<a id="FSM_PROCESS" >
+<strong>FSM_PROCESS</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(FSM_SET)">#FSM_SET</a></em>
+<a id="FSM_SET" >
+<strong>FSM_SET</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(FSM_TASK)">#FSM_TASK</a></em>
+<a id="FSM_TASK" >
+<strong>FSM_TASK</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(Fsm)" >Type <code>Fsm</code></a></h2>
+	
+			<h2><a id="#(FSM)" >Type <code>FSM</code></a></h2>
+				
+<p>FSM class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).AddEndState" >
+<strong>FSM:AddEndState(State)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> State </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).AddProcess" >
+<strong>FSM:AddProcess(From, Event, Process, ReturnEvents)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Set the default <a href="Process.html">Process</a> template with key ProcessName providing the ProcessClass and the process object when it is assigned to a <a href="Controllable.html">Controllable</a> by the task.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Process </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> ReturnEvents </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).AddScore" >
+<strong>FSM:AddScore(State, ScoreText, Score)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Adds a score for the FSM to be achieved.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string State </em></code>: 
+is the state of the process when the score needs to be given. (See the relevant state descriptions of the process).</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string ScoreText </em></code>: 
+is a text describing the score that is given according the status.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Score </em></code>: 
+is a number providing the score of the status.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM)">#FSM</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).AddScoreProcess" >
+<strong>FSM:AddScoreProcess(From, Event, State, ScoreText, Score)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Adds a score for the FSM_PROCESS to be achieved.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string From </em></code>: 
+is the From State of the main process.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: 
+is the Event of the main process.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string State </em></code>: 
+is the state of the process when the score needs to be given. (See the relevant state descriptions of the process).</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string ScoreText </em></code>: 
+is a text describing the score that is given according the status.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Score </em></code>: 
+is a number providing the score of the status.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM)">#FSM</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).AddTransition" >
+<strong>FSM:AddTransition(From, Event, To)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(FSM).ClassName" >
+<strong>FSM.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetEndStates" >
+<strong>FSM:GetEndStates()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetProcess" >
+<strong>FSM:GetProcess(From, Event)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetProcesses" >
+<strong>FSM:GetProcesses()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetScores" >
+<strong>FSM:GetScores()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetStartState" >
+<strong>FSM:GetStartState()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetState" >
+<strong>FSM:GetState()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetSubs" >
+<strong>FSM:GetSubs()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).GetTransitions" >
+<strong>FSM:GetTransitions()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).Is" >
+<strong>FSM:Is(State)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> State </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).LoadCallBacks" >
+<strong>FSM:LoadCallBacks(CallBackTable)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> CallBackTable </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).New" >
+<strong>FSM:New(FsmT)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new FSM object.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> FsmT </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM)">#FSM</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).SetStartState" >
+<strong>FSM:SetStartState(State)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> State </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._add_to_map" >
+<strong>FSM:_add_to_map(Map, Event)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Map </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Event </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._call_handler" >
+<strong>FSM:_call_handler(handler, params)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> handler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> params </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._create_transition" >
+<strong>FSM:_create_transition(EventName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> EventName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._delayed_transition" >
+<strong>FSM:_delayed_transition(EventName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> EventName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._eventmap" >
+<strong>FSM:_eventmap(Events, EventStructure)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Events </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> EventStructure </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._gosub" >
+<strong>FSM:_gosub(ParentFrom, ParentEvent)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ParentFrom </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> ParentEvent </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._handler" >
+<strong>FSM:_handler(EventName, ...)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> EventName </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> ... </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._isendstate" >
+<strong>FSM:_isendstate(Current)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Current </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM)._submap" >
+<strong>FSM:_submap(subs, sub, name)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> subs </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> sub </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> name </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).can" >
+<strong>FSM:can(e)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> e </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).cannot" >
+<strong>FSM:cannot(e)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> e </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM).is" >
+<strong>FSM:is(state)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> state </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(FSM_CONTROLLABLE)" >Type <code>FSM_CONTROLLABLE</code></a></h2>
+				
+<p>FSM_CONTROLLABLE class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(FSM_CONTROLLABLE).ClassName" >
+<strong>FSM_CONTROLLABLE.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a></em>
+<a id="#(FSM_CONTROLLABLE).Controllable" >
+<strong>FSM_CONTROLLABLE.Controllable</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_CONTROLLABLE).GetControllable" >
+<strong>FSM_CONTROLLABLE:GetControllable()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the CONTROLLABLE object that the FSM_CONTROLLABLE governs.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_CONTROLLABLE).New" >
+<strong>FSM_CONTROLLABLE:New(FSMT, Controllable)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new FSM_CONTROLLABLE object.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#table FSMT </em></code>: 
+Finite State Machine Table</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: 
+(optional) The CONTROLLABLE object that the FSM_CONTROLLABLE governs.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_CONTROLLABLE)">#FSM_CONTROLLABLE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_CONTROLLABLE).SetControllable" >
+<strong>FSM_CONTROLLABLE:SetControllable(FSMControllable)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Sets the CONTROLLABLE object that the FSM_CONTROLLABLE governs.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> FSMControllable </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_CONTROLLABLE)">#FSM_CONTROLLABLE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_CONTROLLABLE)._call_handler" >
+<strong>FSM_CONTROLLABLE:_call_handler(handler, params)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> handler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> params </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(FSM_PROCESS)" >Type <code>FSM_PROCESS</code></a></h2>
+				
+<p>FSM_PROCESS class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).AddScore" >
+<strong>FSM_PROCESS:AddScore(State, ScoreText, Score)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Adds a score for the FSM_PROCESS to be achieved.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string State </em></code>: 
+is the state of the process when the score needs to be given. (See the relevant state descriptions of the process).</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string ScoreText </em></code>: 
+is a text describing the score that is given according the status.</p>
+
+				</li>
+				<li>
+				
+<p><code><em>#number Score </em></code>: 
+is a number providing the score of the status.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_PROCESS)">#FSM_PROCESS</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).Assign" >
+<strong>FSM_PROCESS:Assign(Task, ProcessUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Assign the process to a <a href="Unit.html">Unit</a> and activate the process.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Task.Tasking.html##(TASK)">Task.Tasking#TASK</a> Task </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ProcessUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_PROCESS)">#FSM_PROCESS</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(FSM_PROCESS).ClassName" >
+<strong>FSM_PROCESS.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).Copy" >
+<strong>FSM_PROCESS:Copy(Controllable, Task)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new FSM<em>PROCESS object based on this FSM</em>PROCESS.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Controllable </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Task </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_PROCESS)">#FSM_PROCESS</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).GetCommandCenter" >
+<strong>FSM_PROCESS:GetCommandCenter()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the mission of the process.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.CommandCenter.html##(COMMANDCENTER)">Tasking.CommandCenter#COMMANDCENTER</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).GetMission" >
+<strong>FSM_PROCESS:GetMission()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the mission of the process.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).GetTask" >
+<strong>FSM_PROCESS:GetTask()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the task of the process.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).Init" >
+<strong>FSM_PROCESS:Init(FsmProcess)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> FsmProcess </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).Message" >
+<strong>FSM_PROCESS:Message(Message)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message of the <a href="Task.html">Task</a> to the Group of the Unit.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Message </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).New" >
+<strong>FSM_PROCESS:New(Controllable, Task)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new FSM_PROCESS object.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Controllable </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Task </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_PROCESS)">#FSM_PROCESS</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).SetTask" >
+<strong>FSM_PROCESS:SetTask(Task)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Sets the task of the process.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_PROCESS)">#FSM_PROCESS</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(FSM_PROCESS).Task" >
+<strong>FSM_PROCESS.Task</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).onenterAssigned" >
+<strong>FSM_PROCESS:onenterAssigned(ProcessUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ProcessUnit </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).onenterFailed" >
+<strong>FSM_PROCESS:onenterFailed(ProcessUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ProcessUnit </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).onenterSuccess" >
+<strong>FSM_PROCESS:onenterSuccess(ProcessUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> ProcessUnit </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_PROCESS).onstatechange" >
+<strong>FSM_PROCESS:onstatechange(ProcessUnit, Event, From, To, Dummy)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function for a FSM_PROCESS</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Dummy </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(FSM_SET)" >Type <code>FSM_SET</code></a></h2>
+				
+<p>FSM_SET class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(FSM_SET).ClassName" >
+<strong>FSM_SET.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_SET).Get" >
+<strong>FSM_SET:Get()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the SET<em>BASE object that the FSM</em>SET governs.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_SET).New" >
+<strong>FSM_SET:New(FSMT, Set_SET_BASE, FSMSet)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new FSM_SET object.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#table FSMT </em></code>: 
+Finite State Machine Table</p>
+
+				</li>
+				<li>
+				
+<p><code><em> Set<em>SET</em>BASE </em></code>: 
+FSMSet (optional) The Set object that the FSM_SET governs.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> FSMSet </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_SET)">#FSM_SET</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a></em>
+<a id="#(FSM_SET).Set" >
+<strong>FSM_SET.Set</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_SET)._call_handler" >
+<strong>FSM_SET:_call_handler(handler, params)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> handler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> params </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(FSM_TASK)" >Type <code>FSM_TASK</code></a></h2>
+				
+<p>FSM_TASK class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(FSM_TASK).ClassName" >
+<strong>FSM_TASK.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_TASK).New" >
+<strong>FSM_TASK:New(FSMT, Task, TaskUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new FSM_TASK object.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#table FSMT </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(FSM_TASK)">#FSM_TASK</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(FSM_TASK).Task" >
+<strong>FSM_TASK.Task</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(FSM_TASK)._call_handler" >
+<strong>FSM_TASK:_call_handler(handler, params)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> handler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> params </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Group.html b/Moose Training/Documentation/Group.html
index 76ea1c0cf..88be1ab7b 100644
--- a/Moose Training/Documentation/Group.html	
+++ b/Moose Training/Documentation/Group.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li>Group</li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Group.html##(GROUP)">Group#GROUP</a> class, extends <a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a></h1>
-<p>The <a href="Group.html##(GROUP)">Group#GROUP</a> class is a wrapper class to handle the DCS Group objects:</p>
+<h1>1) <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> class, extends <a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a></h1>
+<p>The <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> class is a wrapper class to handle the DCS Group objects:</p>
 
 <ul>
     <li>Support all DCS Group APIs.</li>
@@ -120,7 +122,7 @@ If the DCS Group object does not exist or is nil, the GROUP methods will return
 <h2>1.2) GROUP task methods</h2>
 <p>Several group task methods are available that help you to prepare tasks. 
 These methods return a string consisting of the task description, which can then be given to either a <br/>
-<a href="Controllable.html##(CONTROLLABLE).PushTask">Controllable#CONTROLLABLE.PushTask</a> or <a href="Controllable.html##(CONTROLLABLE).SetTask">Controllable#CONTROLLABLE.SetTask</a> method to assign the task to the GROUP.
+<a href="Wrapper.Controllable.html##(CONTROLLABLE).PushTask">Wrapper.Controllable#CONTROLLABLE.PushTask</a> or <a href="Wrapper.Controllable.html##(CONTROLLABLE).SetTask">Wrapper.Controllable#CONTROLLABLE.SetTask</a> method to assign the task to the GROUP.
 Tasks are specific for the category of the GROUP, more specific, for AIR, GROUND or AIR and GROUND. 
 Each task description where applicable indicates for which group category the task is valid.
 There are 2 main subdivisions of tasks: Assigned tasks and EnRoute tasks.</p>
@@ -133,28 +135,28 @@ This is different from the EnRoute tasks, where the targets of the task need to
 <p>Find below a list of the <strong>assigned task</strong> methods:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskAttackGroup">Controllable#CONTROLLABLE.TaskAttackGroup</a>: (AIR) Attack a Group.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskAttackMapObject">Controllable#CONTROLLABLE.TaskAttackMapObject</a>: (AIR) Attacking the map object (building, structure, e.t.c).</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskAttackUnit">Controllable#CONTROLLABLE.TaskAttackUnit</a>: (AIR) Attack the Unit.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskBombing">Controllable#CONTROLLABLE.TaskBombing</a>: (Controllable#CONTROLLABLEDelivering weapon at the point on the ground.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskBombingRunway">Controllable#CONTROLLABLE.TaskBombingRunway</a>: (AIR) Delivering weapon on the runway.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskEmbarking">Controllable#CONTROLLABLE.TaskEmbarking</a>: (AIR) Move the group to a Vec2 Point, wait for a defined duration and embark a group.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskEmbarkToTransport">Controllable#CONTROLLABLE.TaskEmbarkToTransport</a>: (GROUND) Embark to a Transport landed at a location.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskEscort">Controllable#CONTROLLABLE.TaskEscort</a>: (AIR) Escort another airborne group. </li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskFAC_AttackGroup">Controllable#CONTROLLABLE.TaskFAC_AttackGroup</a>: (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskFireAtPoint">Controllable#CONTROLLABLE.TaskFireAtPoint</a>: (GROUND) Fire at a VEC2 point until ammunition is finished.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskFollow">Controllable#CONTROLLABLE.TaskFollow</a>: (AIR) Following another airborne group.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskHold">Controllable#CONTROLLABLE.TaskHold</a>: (GROUND) Hold ground group from moving.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskHoldPosition">Controllable#CONTROLLABLE.TaskHoldPosition</a>: (AIR) Hold position at the current position of the first unit of the group.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskLand">Controllable#CONTROLLABLE.TaskLand</a>: (AIR HELICOPTER) Landing at the ground. For helicopters only.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskLandAtZone">Controllable#CONTROLLABLE.TaskLandAtZone</a>: (AIR) Land the group at a <a href="Controllable.html##(CONTROLLABLE).TaskOrbitCircle">Controllable#CONTROLLABLE.TaskOrbitCircle</a>: (AIR) Orbit at the current position of the first unit of the group at a specified alititude.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskOrbitCircleAtVec2">Controllable#CONTROLLABLE.TaskOrbitCircleAtVec2</a>: (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskRefueling">Controllable#CONTROLLABLE.TaskRefueling</a>: (AIR) Refueling from the nearest tanker. No parameters.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskRoute">Controllable#CONTROLLABLE.TaskRoute</a>: (AIR + GROUND) Return a Misson task to follow a given route defined by Points.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskRouteToVec2">Controllable#CONTROLLABLE.TaskRouteToVec2</a>: (AIR + GROUND) Make the Group move to a given point.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskRouteToVec3">Controllable#CONTROLLABLE.TaskRouteToVec3</a>: (AIR + GROUND) Make the Group move to a given point.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskRouteToZone">Controllable#CONTROLLABLE.TaskRouteToZone</a>: (AIR + GROUND) Route the group to a given zone.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskReturnToBase">Controllable#CONTROLLABLE.TaskReturnToBase</a>: (AIR) Route the group to an airbase.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskAttackGroup">Wrapper.Controllable#CONTROLLABLE.TaskAttackGroup</a>: (AIR) Attack a Group.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskAttackMapObject">Wrapper.Controllable#CONTROLLABLE.TaskAttackMapObject</a>: (AIR) Attacking the map object (building, structure, e.t.c).</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskAttackUnit">Wrapper.Controllable#CONTROLLABLE.TaskAttackUnit</a>: (AIR) Attack the Unit.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskBombing">Wrapper.Controllable#CONTROLLABLE.TaskBombing</a>: (Wrapper.Controllable#CONTROLLABLEDelivering weapon at the point on the ground.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskBombingRunway">Wrapper.Controllable#CONTROLLABLE.TaskBombingRunway</a>: (AIR) Delivering weapon on the runway.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskEmbarking">Wrapper.Controllable#CONTROLLABLE.TaskEmbarking</a>: (AIR) Move the group to a Vec2 Point, wait for a defined duration and embark a group.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskEmbarkToTransport">Wrapper.Controllable#CONTROLLABLE.TaskEmbarkToTransport</a>: (GROUND) Embark to a Transport landed at a location.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskEscort">Wrapper.Controllable#CONTROLLABLE.TaskEscort</a>: (AIR) Escort another airborne group. </li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskFAC_AttackGroup">Wrapper.Controllable#CONTROLLABLE.TaskFAC_AttackGroup</a>: (AIR + GROUND) The task makes the group/unit a FAC and orders the FAC to control the target (enemy ground group) destruction.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskFireAtPoint">Wrapper.Controllable#CONTROLLABLE.TaskFireAtPoint</a>: (GROUND) Fire at a VEC2 point until ammunition is finished.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskFollow">Wrapper.Controllable#CONTROLLABLE.TaskFollow</a>: (AIR) Following another airborne group.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskHold">Wrapper.Controllable#CONTROLLABLE.TaskHold</a>: (GROUND) Hold ground group from moving.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskHoldPosition">Wrapper.Controllable#CONTROLLABLE.TaskHoldPosition</a>: (AIR) Hold position at the current position of the first unit of the group.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskLand">Wrapper.Controllable#CONTROLLABLE.TaskLand</a>: (AIR HELICOPTER) Landing at the ground. For helicopters only.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskLandAtZone">Wrapper.Controllable#CONTROLLABLE.TaskLandAtZone</a>: (AIR) Land the group at a <a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskOrbitCircle">Wrapper.Controllable#CONTROLLABLE.TaskOrbitCircle</a>: (AIR) Orbit at the current position of the first unit of the group at a specified alititude.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskOrbitCircleAtVec2">Wrapper.Controllable#CONTROLLABLE.TaskOrbitCircleAtVec2</a>: (AIR) Orbit at a specified position at a specified alititude during a specified duration with a specified speed.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskRefueling">Wrapper.Controllable#CONTROLLABLE.TaskRefueling</a>: (AIR) Refueling from the nearest tanker. No parameters.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskRoute">Wrapper.Controllable#CONTROLLABLE.TaskRoute</a>: (AIR + GROUND) Return a Misson task to follow a given route defined by Points.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskRouteToVec2">Wrapper.Controllable#CONTROLLABLE.TaskRouteToVec2</a>: (AIR + GROUND) Make the Group move to a given point.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskRouteToVec3">Wrapper.Controllable#CONTROLLABLE.TaskRouteToVec3</a>: (AIR + GROUND) Make the Group move to a given point.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskRouteToZone">Wrapper.Controllable#CONTROLLABLE.TaskRouteToZone</a>: (AIR + GROUND) Route the group to a given zone.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskReturnToBase">Wrapper.Controllable#CONTROLLABLE.TaskReturnToBase</a>: (AIR) Route the group to an airbase.</li>
 </ul>
 
 <h3>1.2.2) EnRoute task methods</h3>
@@ -162,13 +164,13 @@ This is different from the EnRoute tasks, where the targets of the task need to
 <p>EnRoute tasks require the targets of the task need to be detected by the group (using its sensors) before the task can be executed:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskAWACS">Controllable#CONTROLLABLE.EnRouteTaskAWACS</a>: (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskEngageGroup">Controllable#CONTROLLABLE.EnRouteTaskEngageGroup</a>: (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.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskEngageTargets">Controllable#CONTROLLABLE.EnRouteTaskEngageTargets</a>: (AIR) Engaging targets of defined types.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskEWR">Controllable#CONTROLLABLE.EnRouteTaskEWR</a>: (AIR) Attack the Unit.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskFAC">Controllable#CONTROLLABLE.EnRouteTaskFAC</a>: (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.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskFAC_EngageGroup">Controllable#CONTROLLABLE.EnRouteTaskFAC_EngageGroup</a>: (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.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).EnRouteTaskTanker">Controllable#CONTROLLABLE.EnRouteTaskTanker</a>: (AIR) Aircraft will act as a tanker for friendly units. No parameters.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskAWACS">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskAWACS</a>: (AIR) Aircraft will act as an AWACS for friendly units (will provide them with information about contacts). No parameters.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskEngageGroup">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskEngageGroup</a>: (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.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskEngageTargets">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskEngageTargets</a>: (AIR) Engaging targets of defined types.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskEWR">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskEWR</a>: (AIR) Attack the Unit.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskFAC">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskFAC</a>: (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.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskFAC_EngageGroup">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskFAC_EngageGroup</a>: (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.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).EnRouteTaskTanker">Wrapper.Controllable#CONTROLLABLE.EnRouteTaskTanker</a>: (AIR) Aircraft will act as a tanker for friendly units. No parameters.</li>
 </ul>
 
 <h3>1.2.3) Preparation task methods</h3>
@@ -176,10 +178,10 @@ This is different from the EnRoute tasks, where the targets of the task need to
 <p>There are certain task methods that allow to tailor the task behaviour:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskWrappedAction">Controllable#CONTROLLABLE.TaskWrappedAction</a>: Return a WrappedAction Task taking a Command.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskCombo">Controllable#CONTROLLABLE.TaskCombo</a>: Return a Combo Task taking an array of Tasks.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskCondition">Controllable#CONTROLLABLE.TaskCondition</a>: Return a condition section for a controlled task.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskControlled">Controllable#CONTROLLABLE.TaskControlled</a>: Return a Controlled Task taking a Task and a TaskCondition.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskWrappedAction">Wrapper.Controllable#CONTROLLABLE.TaskWrappedAction</a>: Return a WrappedAction Task taking a Command.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskCombo">Wrapper.Controllable#CONTROLLABLE.TaskCombo</a>: Return a Combo Task taking an array of Tasks.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskCondition">Wrapper.Controllable#CONTROLLABLE.TaskCondition</a>: Return a condition section for a controlled task.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskControlled">Wrapper.Controllable#CONTROLLABLE.TaskControlled</a>: Return a Controlled Task taking a Task and a TaskCondition.</li>
 </ul>
 
 <h3>1.2.4) Obtain the mission from group templates</h3>
@@ -187,15 +189,15 @@ This is different from the EnRoute tasks, where the targets of the task need to
 <p>Group templates contain complete mission descriptions. Sometimes you want to copy a complete mission from a group and assign it to another:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).TaskMission">Controllable#CONTROLLABLE.TaskMission</a>: (AIR + GROUND) Return a mission task from a mission template.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).TaskMission">Wrapper.Controllable#CONTROLLABLE.TaskMission</a>: (AIR + GROUND) Return a mission task from a mission template.</li>
 </ul>
 
 <h2>1.3) GROUP Command methods</h2>
-<p>Group <strong>command methods</strong> prepare the execution of commands using the <a href="Controllable.html##(CONTROLLABLE).SetCommand">Controllable#CONTROLLABLE.SetCommand</a> method:</p>
+<p>Group <strong>command methods</strong> prepare the execution of commands using the <a href="Wrapper.Controllable.html##(CONTROLLABLE).SetCommand">Wrapper.Controllable#CONTROLLABLE.SetCommand</a> method:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).CommandDoScript">Controllable#CONTROLLABLE.CommandDoScript</a>: Do Script command.</li>
-    <li><a href="Controllable.html##(CONTROLLABLE).CommandSwitchWayPoint">Controllable#CONTROLLABLE.CommandSwitchWayPoint</a>: Perform a switch waypoint command.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).CommandDoScript">Wrapper.Controllable#CONTROLLABLE.CommandDoScript</a>: Do Script command.</li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).CommandSwitchWayPoint">Wrapper.Controllable#CONTROLLABLE.CommandSwitchWayPoint</a>: Perform a switch waypoint command.</li>
 </ul>
 
 <h2>1.4) GROUP Option methods</h2>
@@ -204,37 +206,37 @@ This is different from the EnRoute tasks, where the targets of the task need to
 <h3>1.4.1) Rule of Engagement:</h3>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEWeaponFree">Controllable#CONTROLLABLE.OptionROEWeaponFree</a> </li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEOpenFire">Controllable#CONTROLLABLE.OptionROEOpenFire</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEReturnFire">Controllable#CONTROLLABLE.OptionROEReturnFire</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEEvadeFire">Controllable#CONTROLLABLE.OptionROEEvadeFire</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEWeaponFree">Wrapper.Controllable#CONTROLLABLE.OptionROEWeaponFree</a> </li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEOpenFire">Wrapper.Controllable#CONTROLLABLE.OptionROEOpenFire</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEReturnFire">Wrapper.Controllable#CONTROLLABLE.OptionROEReturnFire</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEEvadeFire">Wrapper.Controllable#CONTROLLABLE.OptionROEEvadeFire</a></li>
 </ul>
 
 <p>To check whether an ROE option is valid for a specific group, use:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEWeaponFreePossible">Controllable#CONTROLLABLE.OptionROEWeaponFreePossible</a> </li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEOpenFirePossible">Controllable#CONTROLLABLE.OptionROEOpenFirePossible</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEReturnFirePossible">Controllable#CONTROLLABLE.OptionROEReturnFirePossible</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROEEvadeFirePossible">Controllable#CONTROLLABLE.OptionROEEvadeFirePossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEWeaponFreePossible">Wrapper.Controllable#CONTROLLABLE.OptionROEWeaponFreePossible</a> </li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEOpenFirePossible">Wrapper.Controllable#CONTROLLABLE.OptionROEOpenFirePossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEReturnFirePossible">Wrapper.Controllable#CONTROLLABLE.OptionROEReturnFirePossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROEEvadeFirePossible">Wrapper.Controllable#CONTROLLABLE.OptionROEEvadeFirePossible</a></li>
 </ul>
 
 <h3>1.4.2) Rule on thread:</h3>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTNoReaction">Controllable#CONTROLLABLE.OptionROTNoReaction</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTPassiveDefense">Controllable#CONTROLLABLE.OptionROTPassiveDefense</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTEvadeFire">Controllable#CONTROLLABLE.OptionROTEvadeFire</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTVertical">Controllable#CONTROLLABLE.OptionROTVertical</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTNoReaction">Wrapper.Controllable#CONTROLLABLE.OptionROTNoReaction</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTPassiveDefense">Wrapper.Controllable#CONTROLLABLE.OptionROTPassiveDefense</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTEvadeFire">Wrapper.Controllable#CONTROLLABLE.OptionROTEvadeFire</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTVertical">Wrapper.Controllable#CONTROLLABLE.OptionROTVertical</a></li>
 </ul>
 
 <p>To test whether an ROT option is valid for a specific group, use:</p>
 
 <ul>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTNoReactionPossible">Controllable#CONTROLLABLE.OptionROTNoReactionPossible</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTPassiveDefensePossible">Controllable#CONTROLLABLE.OptionROTPassiveDefensePossible</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTEvadeFirePossible">Controllable#CONTROLLABLE.OptionROTEvadeFirePossible</a></li>
-    <li><a href="Controllable.html##(CONTROLLABLE).OptionROTVerticalPossible">Controllable#CONTROLLABLE.OptionROTVerticalPossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTNoReactionPossible">Wrapper.Controllable#CONTROLLABLE.OptionROTNoReactionPossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTPassiveDefensePossible">Wrapper.Controllable#CONTROLLABLE.OptionROTPassiveDefensePossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTEvadeFirePossible">Wrapper.Controllable#CONTROLLABLE.OptionROTEvadeFirePossible</a></li>
+    <li><a href="Wrapper.Controllable.html##(CONTROLLABLE).OptionROTVerticalPossible">Wrapper.Controllable#CONTROLLABLE.OptionROTVerticalPossible</a></li>
 </ul>
 
 <h2>1.5) GROUP Zone validation methods</h2>
@@ -247,7 +249,7 @@ Use the following Zone validation methods on the group:</p>
     <li><a href="##(GROUP).IsNotInZone">GROUP.IsNotInZone</a>: Returns true if none of the group units of the group are within a <a href="Zone.html">Zone</a>.</li>
 </ul>
 
-<p>The zone can be of any <a href="Zone.html">Zone</a> class derived from <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>. So, these methods are polymorphic to the zones tested on.</p>
+<p>The zone can be of any <a href="Zone.html">Zone</a> class derived from <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>. So, these methods are polymorphic to the zones tested on.</p>
 
 
 	<h2>Global(s)</h2>
@@ -282,7 +284,7 @@ Use the following Zone validation methods on the group:</p>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(GROUP).CopyRoute">GROUP:CopyRoute(Begin, End, Randomize, Radius)</a></td>
 		<td class="summary">
-<p>Return the route of a group by using the <a href="Database.html##(DATABASE)">Database#DATABASE</a> class.</p>
+<p>Return the route of a group by using the <a href="Core.Database.html##(DATABASE)">Core.Database#DATABASE</a> class.</p>
 </td>
 		</tr>
 		<tr>
@@ -602,7 +604,7 @@ All units on the ground result.</p>
 </dt>
 <dd>
 	
-<p>Return the route of a group by using the <a href="Database.html##(DATABASE)">Database#DATABASE</a> class.</p>
+<p>Return the route of a group by using the <a href="Core.Database.html##(DATABASE)">Core.Database#DATABASE</a> class.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -665,7 +667,7 @@ So all event listeners will catch the destroy event of this DCS Group.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a> DCSGroup </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Group.html##(Group)">Dcs.DCSWrapper.Group#Group</a> DCSGroup </em></code>: 
 The DCS Group.</p>
 
 				</li>
@@ -735,7 +737,7 @@ The CallSign of the first DCS Unit of the DCS Group.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSGroup.html##(Group.Category)">DCSGroup#Group.Category</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Group.html##(Group.Category)">Dcs.DCSWrapper.Group#Group.Category</a>:</em>
 The category ID</p>
 
 </dd>
@@ -771,7 +773,7 @@ Category name = Helicopter, Airplane, Ground Unit, Ship</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSCoalitionObject.html##(coalition.side)">DCSCoalitionObject#coalition.side</a>:</em>
+<p><em><a href="Dcs.DCSCoalitionWrapper.Object.html##(coalition.side)">Dcs.DCSCoalitionWrapper.Object#coalition.side</a>:</em>
 The coalition side of the DCS Group.</p>
 
 </dd>
@@ -791,7 +793,7 @@ The coalition side of the DCS Group.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCScountry.html##(country.id)">DCScountry#country.id</a>:</em>
+<p><em><a href="Dcs.DCScountry.html##(country.id)">Dcs.DCScountry#country.id</a>:</em>
 The country identifier.</p>
 
 				</li>
@@ -817,7 +819,7 @@ The DCS Group is not existing or alive.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Group.html##(Group)">Dcs.DCSWrapper.Group#Group</a>:</em>
 The DCS Group.</p>
 
 </dd>
@@ -847,7 +849,7 @@ The number of the DCS Unit to be returned.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a>:</em>
 The DCS Unit.</p>
 
 </dd>
@@ -1074,7 +1076,7 @@ The number of the UNIT wrapper class to be returned.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+<p><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>:</em>
 The UNIT wrapper class.</p>
 
 </dd>
@@ -1110,7 +1112,7 @@ The UNITs wrappers.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 Current Vec2 point of the first DCS Unit of the DCS Group.</p>
 
 </dd>
@@ -1128,7 +1130,7 @@ Current Vec2 point of the first DCS Unit of the DCS Group.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 Current Vec3 of the first DCS Unit of the GROUP.</p>
 
 </dd>
@@ -1222,7 +1224,7 @@ true if the DCS Group is alive.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> Zone </em></code>: 
 The zone to test.</p>
 
 				</li>
@@ -1230,7 +1232,7 @@ The zone to test.</p>
 		<h3>Return value</h3>
 				
 <p><em>#boolean:</em>
-Returns true if the Group is completely within the <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></p>
+Returns true if the Group is completely within the <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></p>
 
 </dd>
 </dl>
@@ -1285,7 +1287,7 @@ true if DCS Group contains Helicopters.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> Zone </em></code>: 
 The zone to test.</p>
 
 				</li>
@@ -1293,7 +1295,7 @@ The zone to test.</p>
 		<h3>Return value</h3>
 				
 <p><em>#boolean:</em>
-Returns true if the Group is completely within the <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></p>
+Returns true if the Group is completely within the <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></p>
 
 </dd>
 </dl>
@@ -1312,7 +1314,7 @@ Returns true if the Group is completely within the <a href="Zone.html##(ZONE_BAS
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> Zone </em></code>: 
 The zone to test.</p>
 
 				</li>
@@ -1320,7 +1322,7 @@ The zone to test.</p>
 		<h3>Return value</h3>
 				
 <p><em>#boolean:</em>
-Returns true if the Group is completely within the <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></p>
+Returns true if the Group is completely within the <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></p>
 
 </dd>
 </dl>
@@ -1357,7 +1359,7 @@ true if DCS Group contains Ships.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSGroup.html##(Group)">DCSGroup#Group</a> GroupName </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Group.html##(Group)">Dcs.DCSWrapper.Group#Group</a> GroupName </em></code>: 
 The DCS Group name</p>
 
 				</li>
@@ -1381,7 +1383,7 @@ self</p>
 <p>Respawn the <a href="GROUP.html">GROUP</a> using a (tweaked) template of the Group.</p>
 
 	
-<p>The template must be retrieved with the <a href="Group.html##(GROUP).GetTemplate">Group#GROUP.GetTemplate</a>() function.
+<p>The template must be retrieved with the <a href="Wrapper.Group.html##(GROUP).GetTemplate">Wrapper.Group#GROUP.GetTemplate</a>() function.
 The template contains all the definitions as declared within the mission file.
 To understand templates, do the following: </p>
 
@@ -1428,7 +1430,7 @@ The template of the Group retrieved with GROUP:GetTemplate()</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSCoalitionObject.html##(coalition.side)">DCSCoalitionObject#coalition.side</a> CoalitionID </em></code>: 
+<p><code><em><a href="Dcs.DCSCoalitionWrapper.Object.html##(coalition.side)">Dcs.DCSCoalitionWrapper.Object#coalition.side</a> CoalitionID </em></code>: 
 The coalition ID.</p>
 
 				</li>
@@ -1492,7 +1494,7 @@ true is controlled, false is uncontrolled.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCScountry.html##(country.id)">DCScountry#country.id</a> CountryID </em></code>: 
+<p><code><em><a href="Dcs.DCScountry.html##(country.id)">Dcs.DCScountry#country.id</a> CountryID </em></code>: 
 The country ID.</p>
 
 				</li>
diff --git a/Moose Training/Documentation/Identifiable.html b/Moose Training/Documentation/Identifiable.html
index 8447fcaf2..9ae5d9b8c 100644
--- a/Moose Training/Documentation/Identifiable.html	
+++ b/Moose Training/Documentation/Identifiable.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li>Identifiable</li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Identifiable.html##(IDENTIFIABLE)">Identifiable#IDENTIFIABLE</a> class, extends <a href="Object.html##(OBJECT)">Object#OBJECT</a></h1>
-<p>The <a href="Identifiable.html##(IDENTIFIABLE)">Identifiable#IDENTIFIABLE</a> class is a wrapper class to handle the DCS Identifiable objects:</p>
+<h1>1) <a href="##(IDENTIFIABLE)">#IDENTIFIABLE</a> class, extends <a href="Wrapper.Object.html##(OBJECT)">Wrapper.Object#OBJECT</a></h1>
+<p>The <a href="##(IDENTIFIABLE)">#IDENTIFIABLE</a> class is a wrapper class to handle the DCS Identifiable objects:</p>
 
 <ul>
     <li>Support all DCS Identifiable APIs.</li>
@@ -100,19 +102,19 @@
 <p>The IDENTIFIABLE class provides the following functions to construct a IDENTIFIABLE instance:</p>
 
 <ul>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).New">Identifiable#IDENTIFIABLE.New</a>(): Create a IDENTIFIABLE instance.</li>
+    <li><a href="##(IDENTIFIABLE).New">IDENTIFIABLE.New</a>(): Create a IDENTIFIABLE instance.</li>
 </ul>
 
 <h2>1.2) IDENTIFIABLE methods:</h2>
 <p>The following methods can be used to identify an identifiable object:</p>
 
 <ul>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).GetName">Identifiable#IDENTIFIABLE.GetName</a>(): Returns the name of the Identifiable.</li>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).IsAlive">Identifiable#IDENTIFIABLE.IsAlive</a>(): Returns if the Identifiable is alive.</li>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).GetTypeName">Identifiable#IDENTIFIABLE.GetTypeName</a>(): Returns the type name of the Identifiable.</li>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).GetCoalition">Identifiable#IDENTIFIABLE.GetCoalition</a>(): Returns the coalition of the Identifiable.</li>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).GetCountry">Identifiable#IDENTIFIABLE.GetCountry</a>(): Returns the country of the Identifiable.</li>
-    <li><a href="Identifiable.html##(IDENTIFIABLE).GetDesc">Identifiable#IDENTIFIABLE.GetDesc</a>(): Returns the descriptor structure of the Identifiable.</li>
+    <li><a href="##(IDENTIFIABLE).GetName">IDENTIFIABLE.GetName</a>(): Returns the name of the Identifiable.</li>
+    <li><a href="##(IDENTIFIABLE).IsAlive">IDENTIFIABLE.IsAlive</a>(): Returns if the Identifiable is alive.</li>
+    <li><a href="##(IDENTIFIABLE).GetTypeName">IDENTIFIABLE.GetTypeName</a>(): Returns the type name of the Identifiable.</li>
+    <li><a href="##(IDENTIFIABLE).GetCoalition">IDENTIFIABLE.GetCoalition</a>(): Returns the coalition of the Identifiable.</li>
+    <li><a href="##(IDENTIFIABLE).GetCountry">IDENTIFIABLE.GetCountry</a>(): Returns the country of the Identifiable.</li>
+    <li><a href="##(IDENTIFIABLE).GetDesc">IDENTIFIABLE.GetDesc</a>(): Returns the descriptor structure of the Identifiable.</li>
 </ul>
 
 
@@ -247,7 +249,7 @@
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSObject.html##(Object.Category)">DCSObject#Object.Category</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Object.html##(Object.Category)">Dcs.DCSWrapper.Object#Object.Category</a>:</em>
 The category ID</p>
 
 </dd>
@@ -285,7 +287,7 @@ The DCS Identifiable Category Name</p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSCoalitionObject.html##(coalition.side)">DCSCoalitionObject#coalition.side</a>:</em>
+<p><em><a href="Dcs.DCSCoalitionWrapper.Object.html##(coalition.side)">Dcs.DCSCoalitionWrapper.Object#coalition.side</a>:</em>
 The side of the coalition.</p>
 
 				</li>
@@ -313,7 +315,7 @@ The DCS Identifiable is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCScountry.html##(country.id)">DCScountry#country.id</a>:</em>
+<p><em><a href="Dcs.DCScountry.html##(country.id)">Dcs.DCScountry#country.id</a>:</em>
 The country identifier.</p>
 
 				</li>
@@ -344,7 +346,7 @@ The DCS Identifiable is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSIdentifiable.html##(Identifiable.Desc)">DCSIdentifiable#Identifiable.Desc</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Identifiable.html##(Identifiable.Desc)">Dcs.DCSWrapper.Identifiable#Identifiable.Desc</a>:</em>
 The Identifiable descriptor.</p>
 
 				</li>
@@ -473,7 +475,7 @@ The DCS Identifiable is not existing or alive.  </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSIdentifiable.html##(Identifiable)">DCSIdentifiable#Identifiable</a> IdentifiableName </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Identifiable.html##(Identifiable)">Dcs.DCSWrapper.Identifiable#Identifiable</a> IdentifiableName </em></code>: 
 The DCS Identifiable name</p>
 
 				</li>
diff --git a/Moose Training/Documentation/MISSION.html b/Moose Training/Documentation/MISSION.html
index b9123d399..5ed4fbcb6 100644
--- a/Moose Training/Documentation/MISSION.html	
+++ b/Moose Training/Documentation/MISSION.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -113,6 +115,12 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 			<h2><a id="#(MISSION)">Type <code>MISSION</code></a></h2>
 				<table class="function_list">
 		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).AbortUnit">MISSION:AbortUnit(PlayerUnit)</a></td>
+		<td class="summary">
+<p>Aborts a PlayerUnit from the Mission.</p>
+</td>
+		</tr>
+		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(MISSION).AddClient">MISSION.AddClient(CLIENT, self, Client)</a></td>
 		<td class="summary">
 <p>Register a new <a href="CLIENT.html">CLIENT</a> to participate within the mission.</p>
@@ -152,6 +160,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).Completed">MISSION:Completed()</a></td>
 		<td class="summary">
 <p>Set a Mission to completed.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).CrashUnit">MISSION:CrashUnit(PlayerUnit)</a></td>
+		<td class="summary">
+<p>Handles a crash of a PlayerUnit from the Mission.</p>
 </td>
 		</tr>
 		<tr>
@@ -170,6 +184,18 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<td class="name" nowrap="nowrap"><a href="##(MISSION).FindClient">MISSION.FindClient(CLIENT, self, ClientName)</a></td>
 		<td class="summary">
 <p>Find a <a href="CLIENT.html">CLIENT</a> object within the <a href="MISSION.html">MISSION</a> by its ClientName.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).GetCommandCenter">MISSION:GetCommandCenter()</a></td>
+		<td class="summary">
+<p>Gets the COMMANDCENTER.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).GetGroups">MISSION:GetGroups()</a></td>
+		<td class="summary">
+<p>Get the groups for which TASKS are given in the mission</p>
 </td>
 		</tr>
 		<tr>
@@ -197,7 +223,7 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).GetTask">MISSION.GetTask(TaskIndex, TaskID, self, TaskName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).GetTask">MISSION.GetTask(TaskName, self)</a></td>
 		<td class="summary">
 <p>Get the TASK identified by the TaskNumber from the Mission.</p>
 </td>
@@ -212,6 +238,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).GoalFunction">MISSION.GoalFunction</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).HasGroup">MISSION:HasGroup(TaskGroup)</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -239,9 +271,9 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).Meta">MISSION:Meta()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).JoinUnit">MISSION:JoinUnit(PlayerUnit)</a></td>
 		<td class="summary">
-
+<p>Add a Unit to join the Mission.</p>
 </td>
 		</tr>
 		<tr>
@@ -260,12 +292,6 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<td class="name" nowrap="nowrap"><a href="##(MISSION).MissionMenu">MISSION.MissionMenu</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).MissionPriority">MISSION.MissionPriority</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -311,7 +337,7 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).New">MISSION:New(MissionName, MissionPriority, MissionBriefing, MissionCoalition)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).New">MISSION:New(CommandCenter, MissionName, MissionPriority, MissionBriefing, MissionCoalition)</a></td>
 		<td class="summary">
 <p>This is the main MISSION declaration method.</p>
 </td>
@@ -347,15 +373,27 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).ReportToAll">MISSION:ReportToAll()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).ReportDetails">MISSION:ReportDetails()</a></td>
 		<td class="summary">
-<p>Report the status of all MISSIONs to all active Clients.</p>
+<p>Create a detailed report of the Mission, listing all the details of the Task.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).ReportTrigger">MISSION:ReportTrigger()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).ReportOverview">MISSION:ReportOverview()</a></td>
 		<td class="summary">
-<p>Handles the reporting.</p>
+<p>Create a overview report of the Mission (multiple lines).</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).ReportSummary">MISSION:ReportSummary()</a></td>
+		<td class="summary">
+<p>Create a summary report of the Mission (one line).</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).ReportToAll">MISSION:ReportToAll()</a></td>
+		<td class="summary">
+<p>Report the status of all MISSIONs to all active Clients.</p>
 </td>
 		</tr>
 		<tr>
@@ -377,7 +415,7 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).SetPlannedMenu">MISSION:SetPlannedMenu()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).SetMenu">MISSION:SetMenu(CommandCenterMenu)</a></td>
 		<td class="summary">
 <p>Sets the Planned Task menu.</p>
 </td>
@@ -404,12 +442,6 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<td class="name" nowrap="nowrap"><a href="##(MISSION).TaskTypeMenus">MISSION.TaskTypeMenus</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(MISSION).Tasks">MISSION.Tasks</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -428,6 +460,18 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<td class="name" nowrap="nowrap"><a href="##(MISSION)._GoalTasks">MISSION._GoalTasks</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).onbeforeComplete">MISSION:onbeforeComplete(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a MISSION</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MISSION).onenterCompleted">MISSION:onenterCompleted(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a MISSION</p>
 </td>
 		</tr>
 	</table>
@@ -614,6 +658,38 @@ A <a href="CLIENT.html">CLIENT</a> needs to be registered within the <a href="MI
 		<dl class="function">
 <dt>
 
+<a id="#(MISSION).AbortUnit" >
+<strong>MISSION:AbortUnit(PlayerUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Aborts a PlayerUnit from the Mission.</p>
+
+	
+<p>For each Task within the Mission, the PlayerUnit is removed from Task where it is assigned.
+If the Unit was not part of a Task in the Mission, false is returned.
+If the Unit is part of a Task in the Mission, true is returned.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The CLIENT or UNIT of the Player joining the Mission.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em>
+true if Unit is part of a Task in the Mission.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(MISSION).AddClient" >
 <strong>MISSION.AddClient(CLIENT, self, Client)</strong>
 </a>
@@ -770,14 +846,14 @@ Each Task can be set a certain Goals. The Mission will not be completed until al
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a> Task </em></code>: 
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: 
 is the <a href="Task.html">Task</a> object.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a>:</em>
+<p><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>:</em>
 The task added.</p>
 
 </dd>
@@ -825,6 +901,38 @@ self</p>
 	
 <p>Set a Mission to completed.</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).CrashUnit" >
+<strong>MISSION:CrashUnit(PlayerUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Handles a crash of a PlayerUnit from the Mission.</p>
+
+	
+<p>For each Task within the Mission, the PlayerUnit is removed from Task where it is assigned.
+If the Unit was not part of a Task in the Mission, false is returned.
+If the Unit is part of a Task in the Mission, true is returned.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The CLIENT or UNIT of the Player crashing.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em>
+true if Unit is part of a Task in the Mission.</p>
+
 </dd>
 </dl>
 		<dl class="function">
@@ -893,6 +1001,42 @@ ClientName is a string defining the Client Group as defined within the ME.</p>
 		<pre class="example"><code>-- Seach for Client "Bomber" within the Mission.
 local BomberClient = Mission:FindClient( "Bomber" )</code></pre>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).GetCommandCenter" >
+<strong>MISSION:GetCommandCenter()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the COMMANDCENTER.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.CommandCenter.html##(COMMANDCENTER)">Tasking.CommandCenter#COMMANDCENTER</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).GetGroups" >
+<strong>MISSION:GetGroups()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Get the groups for which TASKS are given in the mission</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a>:</em></p>
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -910,13 +1054,13 @@ local BomberClient = Mission:FindClient( "Bomber" )</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> TaskGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> TaskGroup </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Menu.html##(MENU_COALITION)">Menu#MENU_COALITION</a>:</em>
+<p><em><a href="Core.Menu.html##(MENU_COALITION)">Core.Menu#MENU_COALITION</a>:</em>
 self</p>
 
 </dd>
@@ -954,14 +1098,14 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a> Task </em></code>: 
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: 
 is the <a href="Task.html">Task</a> object.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a>:</em>
+<p><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>:</em>
 The task added.</p>
 
 </dd>
@@ -988,7 +1132,7 @@ Scoring</p>
 <dt>
 
 <a id="#(MISSION).GetTask" >
-<strong>MISSION.GetTask(TaskIndex, TaskID, self, TaskName)</strong>
+<strong>MISSION.GetTask(TaskName, self)</strong>
 </a>
 </dt>
 <dd>
@@ -1002,32 +1146,21 @@ Scoring</p>
 		<ul>
 				<li>
 				
-<p><code><em>#string TaskIndex </em></code>: 
-is the Index of the <a href="Task.html">Task</a> within the <a href="Mission.html">Mission</a>.</p>
-
-				</li>
-				<li>
-				
-<p><code><em>#number TaskID </em></code>: 
-is the ID of the <a href="Task.html">Task</a> within the <a href="Mission.html">Mission</a>.</p>
+<p><code><em>#string TaskName </em></code>: 
+The Name of the <a href="Task.html">Task</a> within the <a href="Mission.html">Mission</a>.</p>
 
 				</li>
 				<li>
 				
 <p><code><em> self </em></code>: </p>
 
-				</li>
-				<li>
-				
-<p><code><em> TaskName </em></code>: </p>
-
 				</li>
 		</ul>
 		<h3>Return values</h3>
 			<ol>
 				<li>
 				
-<p><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a>:</em>
+<p><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>:</em>
 The Task</p>
 
 				</li>
@@ -1077,6 +1210,27 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).HasGroup" >
+<strong>MISSION:HasGroup(TaskGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> TaskGroup </em></code>: </p>
+
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
@@ -1148,13 +1302,32 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 		<dl class="function">
 <dt>
 
-<a id="#(MISSION).Meta" >
-<strong>MISSION:Meta()</strong>
+<a id="#(MISSION).JoinUnit" >
+<strong>MISSION:JoinUnit(PlayerUnit)</strong>
 </a>
 </dt>
 <dd>
 	
+<p>Add a Unit to join the Mission.</p>
 
+	
+<p>For each Task within the Mission, the Unit is joined with the Task.
+If the Unit was not part of a Task in the Mission, false is returned.
+If the Unit is part of a Task in the Mission, true is returned.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The CLIENT or UNIT of the Player joining the Mission.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em>
+true if Unit is part of a Task in the Mission.</p>
 
 </dd>
 </dl>
@@ -1175,7 +1348,7 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em>#string</em>
 <a id="#(MISSION).MissionCoalition" >
 <strong>MISSION.MissionCoalition</strong>
 </a>
@@ -1189,7 +1362,7 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 		<dl class="function">
 <dt>
 
-		<em><a href="Menu.html##(MENU_COALITION)">Menu#MENU_COALITION</a></em>
+		<em><a href="Core.Menu.html##(MENU_COALITION)">Core.Menu#MENU_COALITION</a></em>
 <a id="#(MISSION).MissionMenu" >
 <strong>MISSION.MissionMenu</strong>
 </a>
@@ -1198,20 +1371,6 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(MISSION).MissionPriority" >
-<strong>MISSION.MissionPriority</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1301,7 +1460,7 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em>#string</em>
 <a id="#(MISSION).Name" >
 <strong>MISSION.Name</strong>
 </a>
@@ -1316,7 +1475,7 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 <dt>
 
 <a id="#(MISSION).New" >
-<strong>MISSION:New(MissionName, MissionPriority, MissionBriefing, MissionCoalition)</strong>
+<strong>MISSION:New(CommandCenter, MissionName, MissionPriority, MissionBriefing, MissionCoalition)</strong>
 </a>
 </dt>
 <dd>
@@ -1330,6 +1489,11 @@ env.info( "Task 2 Completion = " .. Tasks[2]:GetGoalPercentage() .. "%" )</code>
 		<ul>
 				<li>
 				
+<p><code><em><a href="Tasking.CommandCenter.html##(COMMANDCENTER)">Tasking.CommandCenter#COMMANDCENTER</a> CommandCenter </em></code>: </p>
+
+				</li>
+				<li>
+				
 <p><code><em>#string MissionName </em></code>: 
 is the name of the mission. This name will be used to reference the status of each mission by the players.</p>
 
@@ -1348,7 +1512,7 @@ is a string indicating the mission briefing to be shown when a player joins a <a
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSCoalitionObject.html##(coalition)">DCSCoalitionObject#coalition</a> MissionCoalition </em></code>: 
+<p><code><em><a href="Dcs.DCSCoalitionWrapper.Object.html##(coalition)">Dcs.DCSCoalitionWrapper.Object#coalition</a> MissionCoalition </em></code>: 
 is a string indicating the coalition or party to which this mission belongs to. It is free format and can be chosen freely by the mission designer. Note that this field is not to be confused with the coalition concept of the ME. Examples of a Mission Coalition could be "NATO", "CCCP", "Intruders", "Terrorists"...</p>
 
 				</li>
@@ -1419,7 +1583,7 @@ Each Task can be set a certain Goals. The Mission will not be completed until al
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a> Task </em></code>: 
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: 
 is the <a href="Task.html">Task</a> object.</p>
 
 				</li>
@@ -1446,7 +1610,7 @@ The cleaned Task reference.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a> Task </em></code>: </p>
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1455,6 +1619,60 @@ The cleaned Task reference.</p>
 <p><em><a href="##(MISSION)">#MISSION</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).ReportDetails" >
+<strong>MISSION:ReportDetails()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a detailed report of the Mission, listing all the details of the Task.</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#string:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).ReportOverview" >
+<strong>MISSION:ReportOverview()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a overview report of the Mission (multiple lines).</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#string:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).ReportSummary" >
+<strong>MISSION:ReportSummary()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a summary report of the Mission (one line).</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#string:</em></p>
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1468,22 +1686,6 @@ self</p>
 	
 <p>Report the status of all MISSIONs to all active Clients.</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(MISSION).ReportTrigger" >
-<strong>MISSION:ReportTrigger()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Handles the reporting.</p>
-
-	
-<p>After certain time intervals, a MISSION report MESSAGE will be shown to All Players.</p>
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1529,7 +1731,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a> Task </em></code>: </p>
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: </p>
 
 				</li>
 				<li>
@@ -1549,14 +1751,22 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(MISSION).SetPlannedMenu" >
-<strong>MISSION:SetPlannedMenu()</strong>
+<a id="#(MISSION).SetMenu" >
+<strong>MISSION:SetMenu(CommandCenterMenu)</strong>
 </a>
 </dt>
 <dd>
 	
 <p>Sets the Planned Task menu.</p>
 
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Menu.html##(MENU_COALITION)">Core.Menu#MENU_COALITION</a> CommandCenterMenu </em></code>: </p>
+
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
@@ -1612,20 +1822,6 @@ self</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(MISSION).Tasks" >
-<strong>MISSION.Tasks</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1668,6 +1864,68 @@ self</p>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).onbeforeComplete" >
+<strong>MISSION:onbeforeComplete(Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM function for a MISSION</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(MISSION).onenterCompleted" >
+<strong>MISSION:onenterCompleted(Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM function for a MISSION</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/MOVEMENT.html b/Moose Training/Documentation/MOVEMENT.html
index 2a67261d7..13e5d0dfb 100644
--- a/Moose Training/Documentation/MOVEMENT.html	
+++ b/Moose Training/Documentation/MOVEMENT.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li>MOVEMENT</li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/Menu.html b/Moose Training/Documentation/Menu.html
index 99369d601..8c0552dd9 100644
--- a/Moose Training/Documentation/Menu.html	
+++ b/Moose Training/Documentation/Menu.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -103,19 +105,19 @@ On top, MOOSE implements <strong>variable parameter</strong> passing for command
 <h3>To manage <strong>main menus</strong>, the classes begin with <strong>MENU_</strong>:</h3>
 
 <ul>
-    <li><a href="Menu.html##(MENU_MISSION)">Menu#MENU_MISSION</a>: Manages main menus for whole mission file.</li>
-    <li><a href="Menu.html##(MENU_COALITION)">Menu#MENU_COALITION</a>: Manages main menus for whole coalition.</li>
-    <li><a href="Menu.html##(MENU_GROUP)">Menu#MENU_GROUP</a>: Manages main menus for GROUPs.</li>
-    <li><a href="Menu.html##(MENU_CLIENT)">Menu#MENU_CLIENT</a>: Manages main menus for CLIENTs. This manages menus for units with the skill level "Client".</li>
+    <li><a href="Core.Menu.html##(MENU_MISSION)">Core.Menu#MENU_MISSION</a>: Manages main menus for whole mission file.</li>
+    <li><a href="Core.Menu.html##(MENU_COALITION)">Core.Menu#MENU_COALITION</a>: Manages main menus for whole coalition.</li>
+    <li><a href="Core.Menu.html##(MENU_GROUP)">Core.Menu#MENU_GROUP</a>: Manages main menus for GROUPs.</li>
+    <li><a href="Core.Menu.html##(MENU_CLIENT)">Core.Menu#MENU_CLIENT</a>: Manages main menus for CLIENTs. This manages menus for units with the skill level "Client".</li>
 </ul>
 
 <h3>To manage <strong>command menus</strong>, which are menus that allow the player to issue <strong>functions</strong>, the classes begin with <strong>MENU<em>COMMAND</em></strong>:</h3>
 
 <ul>
-    <li><a href="Menu.html##(MENU_MISSION_COMMAND)">Menu#MENU<em>MISSION</em>COMMAND</a>: Manages command menus for whole mission file.</li>
-    <li><a href="Menu.html##(MENU_COALITION_COMMAND)">Menu#MENU<em>COALITION</em>COMMAND</a>: Manages command menus for whole coalition.</li>
-    <li><a href="Menu.html##(MENU_GROUP_COMMAND)">Menu#MENU<em>GROUP</em>COMMAND</a>: Manages command menus for GROUPs.</li>
-    <li><a href="Menu.html##(MENU_CLIENT_COMMAND)">Menu#MENU<em>CLIENT</em>COMMAND</a>: Manages command menus for CLIENTs. This manages menus for units with the skill level "Client".</li>
+    <li><a href="Core.Menu.html##(MENU_MISSION_COMMAND)">Core.Menu#MENU<em>MISSION</em>COMMAND</a>: Manages command menus for whole mission file.</li>
+    <li><a href="Core.Menu.html##(MENU_COALITION_COMMAND)">Core.Menu#MENU<em>COALITION</em>COMMAND</a>: Manages command menus for whole coalition.</li>
+    <li><a href="Core.Menu.html##(MENU_GROUP_COMMAND)">Core.Menu#MENU<em>GROUP</em>COMMAND</a>: Manages command menus for GROUPs.</li>
+    <li><a href="Core.Menu.html##(MENU_CLIENT_COMMAND)">Core.Menu#MENU<em>CLIENT</em>COMMAND</a>: Manages command menus for CLIENTs. This manages menus for units with the skill level "Client".</li>
 </ul>
 
 <hr/>
@@ -127,10 +129,10 @@ On top, MOOSE implements <strong>variable parameter</strong> passing for command
 These are simply abstract base classes defining a couple of fields that are used by the 
 derived MENU_ classes to manage menus.</p>
 
-<h2>1.1) <a href="Menu.html##(MENU_BASE)">Menu#MENU_BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h2>
+<h2>1.1) <a href="Core.Menu.html##(MENU_BASE)">Core.Menu#MENU_BASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h2>
 <p>The <a href="##(MENU_BASE)">#MENU_BASE</a> class defines the main MENU class where other MENU classes are derived from.</p>
 
-<h2>1.2) <a href="Menu.html##(MENU_COMMAND_BASE)">Menu#MENU<em>COMMAND</em>BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h2>
+<h2>1.2) <a href="Core.Menu.html##(MENU_COMMAND_BASE)">Core.Menu#MENU<em>COMMAND</em>BASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h2>
 <p>The <a href="##(MENU_COMMAND_BASE)">#MENU<em>COMMAND</em>BASE</a> class defines the main MENU class where other MENU COMMAND_ classes are derived from, in order to set commands.</p>
 
 <hr/>
@@ -140,13 +142,13 @@ derived MENU_ classes to manage menus.</p>
 <h1>2) MENU MISSION classes</h1>
 <p>The underlying classes manage the menus for a complete mission file.</p>
 
-<h2>2.1) <a href="Menu.html##(MENU_MISSION)">Menu#MENU_MISSION</a> class, extends <a href="Menu.html##(MENU_BASE)">Menu#MENU_BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_MISSION)">Menu#MENU_MISSION</a> class manages the main menus for a complete mission. <br/>
+<h2>2.1) <a href="Menu.html##(MENU_MISSION)">Menu#MENU_MISSION</a> class, extends <a href="Core.Menu.html##(MENU_BASE)">Core.Menu#MENU_BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_MISSION)">Core.Menu#MENU_MISSION</a> class manages the main menus for a complete mission. <br/>
 You can add menus with the <a href="##(MENU_MISSION).New">MENU_MISSION.New</a> method, which constructs a MENU_MISSION object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_MISSION).Remove">MENU_MISSION.Remove</a>.</p>
 
-<h2>2.2) <a href="Menu.html##(MENU_MISSION_COMMAND)">Menu#MENU<em>MISSION</em>COMMAND</a> class, extends <a href="Menu.html##(MENU_COMMAND_BASE)">Menu#MENU<em>COMMAND</em>BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_MISSION_COMMAND)">Menu#MENU<em>MISSION</em>COMMAND</a> class manages the command menus for a complete mission, which allow players to execute functions during mission execution. <br/>
+<h2>2.2) <a href="Menu.html##(MENU_MISSION_COMMAND)">Menu#MENU<em>MISSION</em>COMMAND</a> class, extends <a href="Core.Menu.html##(MENU_COMMAND_BASE)">Core.Menu#MENU<em>COMMAND</em>BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_MISSION_COMMAND)">Core.Menu#MENU<em>MISSION</em>COMMAND</a> class manages the command menus for a complete mission, which allow players to execute functions during mission execution. <br/>
 You can add menus with the <a href="##(MENU_MISSION_COMMAND).New">MENU<em>MISSION</em>COMMAND.New</a> method, which constructs a MENU<em>MISSION</em>COMMAND object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_MISSION_COMMAND).Remove">MENU<em>MISSION</em>COMMAND.Remove</a>.</p>
 
@@ -155,13 +157,13 @@ Using this object reference, you can then remove ALL the menus and submenus unde
 <h1>3) MENU COALITION classes</h1>
 <p>The underlying classes manage the menus for whole coalitions.</p>
 
-<h2>3.1) <a href="Menu.html##(MENU_COALITION)">Menu#MENU_COALITION</a> class, extends <a href="Menu.html##(MENU_BASE)">Menu#MENU_BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_COALITION)">Menu#MENU_COALITION</a> class manages the main menus for coalitions. <br/>
+<h2>3.1) <a href="Menu.html##(MENU_COALITION)">Menu#MENU_COALITION</a> class, extends <a href="Core.Menu.html##(MENU_BASE)">Core.Menu#MENU_BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_COALITION)">Core.Menu#MENU_COALITION</a> class manages the main menus for coalitions. <br/>
 You can add menus with the <a href="##(MENU_COALITION).New">MENU_COALITION.New</a> method, which constructs a MENU_COALITION object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_COALITION).Remove">MENU_COALITION.Remove</a>.</p>
 
-<h2>3.2) <a href="Menu.html##(MENU_COALITION_COMMAND)">Menu#MENU<em>COALITION</em>COMMAND</a> class, extends <a href="Menu.html##(MENU_COMMAND_BASE)">Menu#MENU<em>COMMAND</em>BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_COALITION_COMMAND)">Menu#MENU<em>COALITION</em>COMMAND</a> class manages the command menus for coalitions, which allow players to execute functions during mission execution. <br/>
+<h2>3.2) <a href="Menu.html##(MENU_COALITION_COMMAND)">Menu#MENU<em>COALITION</em>COMMAND</a> class, extends <a href="Core.Menu.html##(MENU_COMMAND_BASE)">Core.Menu#MENU<em>COMMAND</em>BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_COALITION_COMMAND)">Core.Menu#MENU<em>COALITION</em>COMMAND</a> class manages the command menus for coalitions, which allow players to execute functions during mission execution. <br/>
 You can add menus with the <a href="##(MENU_COALITION_COMMAND).New">MENU<em>COALITION</em>COMMAND.New</a> method, which constructs a MENU<em>COALITION</em>COMMAND object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_COALITION_COMMAND).Remove">MENU<em>COALITION</em>COMMAND.Remove</a>.</p>
 
@@ -170,13 +172,13 @@ Using this object reference, you can then remove ALL the menus and submenus unde
 <h1>4) MENU GROUP classes</h1>
 <p>The underlying classes manage the menus for groups. Note that groups can be inactive, alive or can be destroyed.</p>
 
-<h2>4.1) <a href="Menu.html##(MENU_GROUP)">Menu#MENU_GROUP</a> class, extends <a href="Menu.html##(MENU_BASE)">Menu#MENU_BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_GROUP)">Menu#MENU_GROUP</a> class manages the main menus for coalitions. <br/>
+<h2>4.1) <a href="Menu.html##(MENU_GROUP)">Menu#MENU_GROUP</a> class, extends <a href="Core.Menu.html##(MENU_BASE)">Core.Menu#MENU_BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_GROUP)">Core.Menu#MENU_GROUP</a> class manages the main menus for coalitions. <br/>
 You can add menus with the <a href="##(MENU_GROUP).New">MENU_GROUP.New</a> method, which constructs a MENU_GROUP object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_GROUP).Remove">MENU_GROUP.Remove</a>.</p>
 
-<h2>4.2) <a href="Menu.html##(MENU_GROUP_COMMAND)">Menu#MENU<em>GROUP</em>COMMAND</a> class, extends <a href="Menu.html##(MENU_COMMAND_BASE)">Menu#MENU<em>COMMAND</em>BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_GROUP_COMMAND)">Menu#MENU<em>GROUP</em>COMMAND</a> class manages the command menus for coalitions, which allow players to execute functions during mission execution. <br/>
+<h2>4.2) <a href="Menu.html##(MENU_GROUP_COMMAND)">Menu#MENU<em>GROUP</em>COMMAND</a> class, extends <a href="Core.Menu.html##(MENU_COMMAND_BASE)">Core.Menu#MENU<em>COMMAND</em>BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_GROUP_COMMAND)">Core.Menu#MENU<em>GROUP</em>COMMAND</a> class manages the command menus for coalitions, which allow players to execute functions during mission execution. <br/>
 You can add menus with the <a href="##(MENU_GROUP_COMMAND).New">MENU<em>GROUP</em>COMMAND.New</a> method, which constructs a MENU<em>GROUP</em>COMMAND object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_GROUP_COMMAND).Remove">MENU<em>GROUP</em>COMMAND.Remove</a>.</p>
 
@@ -185,13 +187,13 @@ Using this object reference, you can then remove ALL the menus and submenus unde
 <h1>5) MENU CLIENT classes</h1>
 <p>The underlying classes manage the menus for units with skill level client or player.</p>
 
-<h2>5.1) <a href="Menu.html##(MENU_CLIENT)">Menu#MENU_CLIENT</a> class, extends <a href="Menu.html##(MENU_BASE)">Menu#MENU_BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_CLIENT)">Menu#MENU_CLIENT</a> class manages the main menus for coalitions. <br/>
+<h2>5.1) <a href="Menu.html##(MENU_CLIENT)">Menu#MENU_CLIENT</a> class, extends <a href="Core.Menu.html##(MENU_BASE)">Core.Menu#MENU_BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_CLIENT)">Core.Menu#MENU_CLIENT</a> class manages the main menus for coalitions. <br/>
 You can add menus with the <a href="##(MENU_CLIENT).New">MENU_CLIENT.New</a> method, which constructs a MENU_CLIENT object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_CLIENT).Remove">MENU_CLIENT.Remove</a>.</p>
 
-<h2>5.2) <a href="Menu.html##(MENU_CLIENT_COMMAND)">Menu#MENU<em>CLIENT</em>COMMAND</a> class, extends <a href="Menu.html##(MENU_COMMAND_BASE)">Menu#MENU<em>COMMAND</em>BASE</a></h2>
-<p>The <a href="Menu.html##(MENU_CLIENT_COMMAND)">Menu#MENU<em>CLIENT</em>COMMAND</a> class manages the command menus for coalitions, which allow players to execute functions during mission execution. <br/>
+<h2>5.2) <a href="Menu.html##(MENU_CLIENT_COMMAND)">Menu#MENU<em>CLIENT</em>COMMAND</a> class, extends <a href="Core.Menu.html##(MENU_COMMAND_BASE)">Core.Menu#MENU<em>COMMAND</em>BASE</a></h2>
+<p>The <a href="Core.Menu.html##(MENU_CLIENT_COMMAND)">Core.Menu#MENU<em>CLIENT</em>COMMAND</a> class manages the command menus for coalitions, which allow players to execute functions during mission execution. <br/>
 You can add menus with the <a href="##(MENU_CLIENT_COMMAND).New">MENU<em>CLIENT</em>COMMAND.New</a> method, which constructs a MENU<em>CLIENT</em>COMMAND object and returns you the object reference.
 Using this object reference, you can then remove ALL the menus and submenus underlying automatically with <a href="##(MENU_CLIENT_COMMAND).Remove">MENU<em>CLIENT</em>COMMAND.Remove</a>.</p>
 
@@ -438,12 +440,54 @@ Using this object reference, you can then remove ALL the menus and submenus unde
 		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).ClassName">MENU_GROUP.ClassName</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).MenuGroup">MENU_GROUP.MenuGroup</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).MenuGroupID">MENU_GROUP.MenuGroupID</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).MenuPath">MENU_GROUP.MenuPath</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).MenuText">MENU_GROUP.MenuText</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).Menus">MENU_GROUP.Menus</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).New">MENU_GROUP:New(MenuGroup, MenuText, ParentMenu)</a></td>
 		<td class="summary">
 <p>MENU_GROUP constructor.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).ParentMenu">MENU_GROUP.ParentMenu</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP).Path">MENU_GROUP.Path</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -466,12 +510,48 @@ Using this object reference, you can then remove ALL the menus and submenus unde
 		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).ClassName">MENU_GROUP_COMMAND.ClassName</a></td>
 		<td class="summary">
 
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).MenuGroup">MENU_GROUP_COMMAND.MenuGroup</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).MenuGroupID">MENU_GROUP_COMMAND.MenuGroupID</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).MenuPath">MENU_GROUP_COMMAND.MenuPath</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).MenuText">MENU_GROUP_COMMAND.MenuText</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).New">MENU_GROUP_COMMAND:New(MenuGroup, MenuText, ParentMenu, CommandMenuFunction, CommandMenuArgument, ...)</a></td>
 		<td class="summary">
 <p>Creates a new radio command item for a group</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).ParentMenu">MENU_GROUP_COMMAND.ParentMenu</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(MENU_GROUP_COMMAND).Path">MENU_GROUP_COMMAND.Path</a></td>
+		<td class="summary">
+
 </td>
 		</tr>
 		<tr>
@@ -790,7 +870,7 @@ Using this object reference, you can then remove ALL the menus and submenus unde
    MenuStatus[MenuClientName]:Remove()
  end
 
- --- @param Client#CLIENT MenuClient
+ --- @param Wrapper.Client#CLIENT MenuClient
  local function AddStatusMenu( MenuClient )
    local MenuClientName = MenuClient:GetName()
    -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
@@ -851,7 +931,7 @@ Using this object reference, you can then remove ALL the menus and submenus unde
 		<ul>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> Client </em></code>: 
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> Client </em></code>: 
 The Client owning the menu.</p>
 
 				</li>
@@ -949,7 +1029,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> Client </em></code>: 
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> Client </em></code>: 
 The Client owning the menu.</p>
 
 				</li>
@@ -1088,7 +1168,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSCoalition.html##(coalition.side)">DCSCoalition#coalition.side</a> Coalition </em></code>: 
+<p><code><em><a href="Dcs.DCSCoalition.html##(coalition.side)">Dcs.DCSCoalition#coalition.side</a> Coalition </em></code>: 
 The coalition owning the menu.</p>
 
 				</li>
@@ -1189,7 +1269,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSCoalition.html##(coalition.side)">DCSCoalition#coalition.side</a> Coalition </em></code>: 
+<p><code><em><a href="Dcs.DCSCoalition.html##(coalition.side)">Dcs.DCSCoalition#coalition.side</a> Coalition </em></code>: 
 The coalition owning the menu.</p>
 
 				</li>
@@ -1371,7 +1451,7 @@ self</p>
    MenuStatus[MenuGroupName]:Remove()
  end
 
- --- @param Group#GROUP MenuGroup
+ --- @param Wrapper.Group#GROUP MenuGroup
  local function AddStatusMenu( MenuGroup )
    local MenuGroupName = MenuGroup:GetName()
    -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
@@ -1413,6 +1493,76 @@ self</p>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).MenuGroup" >
+<strong>MENU_GROUP.MenuGroup</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).MenuGroupID" >
+<strong>MENU_GROUP.MenuGroupID</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).MenuPath" >
+<strong>MENU_GROUP.MenuPath</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).MenuText" >
+<strong>MENU_GROUP.MenuText</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).Menus" >
+<strong>MENU_GROUP.Menus</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1433,7 +1583,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> MenuGroup </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> MenuGroup </em></code>: 
 The Group owning the menu.</p>
 
 				</li>
@@ -1455,6 +1605,34 @@ The parent menu.</p>
 <p><em><a href="##(MENU_GROUP)">#MENU_GROUP</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).ParentMenu" >
+<strong>MENU_GROUP.ParentMenu</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP).Path" >
+<strong>MENU_GROUP.Path</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1511,6 +1689,62 @@ self</p>
 	
 
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP_COMMAND).MenuGroup" >
+<strong>MENU_GROUP_COMMAND.MenuGroup</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP_COMMAND).MenuGroupID" >
+<strong>MENU_GROUP_COMMAND.MenuGroupID</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP_COMMAND).MenuPath" >
+<strong>MENU_GROUP_COMMAND.MenuPath</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP_COMMAND).MenuText" >
+<strong>MENU_GROUP_COMMAND.MenuText</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -1528,7 +1762,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> MenuGroup </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> MenuGroup </em></code>: 
 The Group owning the menu.</p>
 
 				</li>
@@ -1567,6 +1801,34 @@ An argument for the function.</p>
 <p><em><a href="Menu.html##(MENU_GROUP_COMMAND)">Menu#MENU<em>GROUP</em>COMMAND</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP_COMMAND).ParentMenu" >
+<strong>MENU_GROUP_COMMAND.ParentMenu</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(MENU_GROUP_COMMAND).Path" >
+<strong>MENU_GROUP_COMMAND.Path</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
diff --git a/Moose Training/Documentation/Message.html b/Moose Training/Documentation/Message.html
index f99338672..9a3b3c646 100644
--- a/Moose Training/Documentation/Message.html	
+++ b/Moose Training/Documentation/Message.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,22 +89,22 @@
 
    
 
-<h1>1) <a href="Message.html##(MESSAGE)">Message#MESSAGE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
+<h1>1) <a href="Core.Message.html##(MESSAGE)">Core.Message#MESSAGE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
 <p>Message System to display Messages to Clients, Coalitions or All.
 Messages are shown on the display panel for an amount of seconds, and will then disappear.
 Messages can contain a category which is indicating the category of the message.</p>
 
 <h2>1.1) MESSAGE construction methods</h2>
-<p>Messages are created with <a href="Message.html##(MESSAGE).New">Message#MESSAGE.New</a>. Note that when the MESSAGE object is created, no message is sent yet.
+<p>Messages are created with <a href="Core.Message.html##(MESSAGE).New">Core.Message#MESSAGE.New</a>. Note that when the MESSAGE object is created, no message is sent yet.
 To send messages, you need to use the To functions.</p>
 
 <h2>1.2) Send messages with MESSAGE To methods</h2>
 <p>Messages are sent to:</p>
 
 <ul>
-    <li>Clients with <a href="Message.html##(MESSAGE).ToClient">Message#MESSAGE.ToClient</a>.</li>
-    <li>Coalitions with <a href="Message.html##(MESSAGE).ToCoalition">Message#MESSAGE.ToCoalition</a>.</li>
-    <li>All Players with <a href="Message.html##(MESSAGE).ToAll">Message#MESSAGE.ToAll</a>.
+    <li>Clients with <a href="Core.Message.html##(MESSAGE).ToClient">Core.Message#MESSAGE.ToClient</a>.</li>
+    <li>Coalitions with <a href="Core.Message.html##(MESSAGE).ToCoalition">Core.Message#MESSAGE.ToCoalition</a>.</li>
+    <li>All Players with <a href="Core.Message.html##(MESSAGE).ToAll">Core.Message#MESSAGE.ToAll</a>.
     </li>
 </ul>
 
@@ -368,7 +370,7 @@ MessageBLUE:ToBlue()</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> Client </em></code>: 
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> Client </em></code>: 
 is the Group of the Client.</p>
 
 				</li>
@@ -447,7 +449,7 @@ MessageRED:ToCoalition( coalition.side.RED )</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> Group </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> Group </em></code>: 
 is the Group.</p>
 
 				</li>
diff --git a/Moose Training/Documentation/MissileTrainer.html b/Moose Training/Documentation/MissileTrainer.html
index 694e2fc70..586e70888 100644
--- a/Moose Training/Documentation/MissileTrainer.html	
+++ b/Moose Training/Documentation/MissileTrainer.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,7 +91,7 @@
 
 <hr/>
 
-<h1>1) <a href="MissileTrainer.html##(MISSILETRAINER)">MissileTrainer#MISSILETRAINER</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
+<h1>1) <a href="Functional.MissileTrainer.html##(MISSILETRAINER)">Functional.MissileTrainer#MISSILETRAINER</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
 <p>The <a href="##(MISSILETRAINER)">#MISSILETRAINER</a> class uses the DCS world messaging system to be alerted of any missiles fired, and when a missile would hit your aircraft,
 the class will destroy the missile within a certain range, to avoid damage to your aircraft.
 It suports the following functionality:</p>
@@ -453,7 +455,7 @@ Together with the <strong>476 virtual team</strong>, we tested the MISSILETRAINE
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a></em>
+		<em><a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a></em>
 <a id="#(MISSILETRAINER).DBClients" >
 <strong>MISSILETRAINER.DBClients</strong>
 </a>
@@ -980,7 +982,7 @@ The distance in meters when a tracked missile needs to be destroyed when close t
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
diff --git a/Moose Training/Documentation/Object.html b/Moose Training/Documentation/Object.html
index f2fbf901d..00eff6a9b 100644
--- a/Moose Training/Documentation/Object.html	
+++ b/Moose Training/Documentation/Object.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Object.html##(OBJECT)">Object#OBJECT</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<p>The <a href="Object.html##(OBJECT)">Object#OBJECT</a> class is a wrapper class to handle the DCS Object objects:</p>
+<h1>1) <a href="Wrapper.Object.html##(OBJECT)">Wrapper.Object#OBJECT</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+<p>The <a href="Wrapper.Object.html##(OBJECT)">Wrapper.Object#OBJECT</a> class is a wrapper class to handle the DCS Object objects:</p>
 
 <ul>
     <li>Support all DCS Object APIs.</li>
@@ -100,14 +102,14 @@
 <p>The OBJECT class provides the following functions to construct a OBJECT instance:</p>
 
 <ul>
-    <li><a href="Object.html##(OBJECT).New">Object#OBJECT.New</a>(): Create a OBJECT instance.</li>
+    <li><a href="Wrapper.Object.html##(OBJECT).New">Wrapper.Object#OBJECT.New</a>(): Create a OBJECT instance.</li>
 </ul>
 
 <h2>1.2) OBJECT methods:</h2>
 <p>The following methods can be used to identify an Object object:</p>
 
 <ul>
-    <li><a href="Object.html##(OBJECT).GetID">Object#OBJECT.GetID</a>(): Returns the ID of the Object object.</li>
+    <li><a href="Wrapper.Object.html##(OBJECT).GetID">Wrapper.Object#OBJECT.GetID</a>(): Returns the ID of the Object object.</li>
 </ul>
 
 <hr/>
@@ -254,7 +256,7 @@ The DCS Unit is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSObject.html##(Object.ID)">DCSObject#Object.ID</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Object.html##(Object.ID)">Dcs.DCSWrapper.Object#Object.ID</a>:</em>
 ObjectID</p>
 
 				</li>
@@ -282,7 +284,7 @@ The DCS Object is not existing or alive.  </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSObject.html##(Object)">DCSObject#Object</a> ObjectName </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Object.html##(Object)">Dcs.DCSWrapper.Object#Object</a> ObjectName </em></code>: 
 The Object name</p>
 
 				</li>
diff --git a/Moose Training/Documentation/Patrol.html b/Moose Training/Documentation/Patrol.html
index fdcbcd970..7743ee2b3 100644
--- a/Moose Training/Documentation/Patrol.html	
+++ b/Moose Training/Documentation/Patrol.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li>Patrol</li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,8 +91,8 @@
 
 <hr/>
 
-<h1>1) <a href="##(PATROLZONE)">#PATROLZONE</a> class, extends <a href="StateMachine.html##(STATEMACHINE)">StateMachine#STATEMACHINE</a></h1>
-<p>The <a href="##(PATROLZONE)">#PATROLZONE</a> class implements the core functions to patrol a <a href="Zone.html">Zone</a> by an AIR <a href="Controllable.html">Controllable</a> <a href="Group.html">Group</a>.
+<h1>1) <a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a> class, extends <a href="Core.Fsm.html##(FSM_CONTROLLABLE)">Core.Fsm#FSM_CONTROLLABLE</a></h1>
+<p>The <a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a> class implements the core functions to patrol a <a href="Zone.html">Zone</a> by an AIR <a href="Controllable.html">Controllable</a> <a href="Group.html">Group</a>.
 The patrol algorithm works that for each airplane patrolling, upon arrival at the patrol zone,
 a random point is selected as the route point within the 3D space, within the given boundary limits.
 The airplane will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits.
@@ -98,52 +100,52 @@ Upon arrival at the random 3D point, a new 3D random point will be selected with
 This cycle will continue until a fuel treshold has been reached by the airplane.
 When the fuel treshold has been reached, the airplane will fly towards the nearest friendly airbase and will land.</p>
 
-<h2>1.1) PATROLZONE constructor:</h2>
+<h2>1.1) AI_PATROLZONE constructor:</h2>
 
 <ul>
-    <li><a href="##(PATROLZONE).New">PATROLZONE.New</a>(): Creates a new PATROLZONE object.</li>
+    <li><a href="##(AI_PATROLZONE).New">AI_PATROLZONE.New</a>(): Creates a new AI_PATROLZONE object.</li>
 </ul>
 
-<h2>1.2) PATROLZONE state machine:</h2>
-<p>The PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.</p>
+<h2>1.2) AI_PATROLZONE state machine:</h2>
+<p>The AI_PATROLZONE is a state machine: it manages the different events and states of the AIControllable it is controlling.</p>
 
-<h3>1.2.1) PATROLZONE Events:</h3>
+<h3>1.2.1) AI_PATROLZONE Events:</h3>
 
 <ul>
-    <li><a href="##(PATROLZONE).Route">PATROLZONE.Route</a>( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.</li>
-    <li><a href="##(PATROLZONE).Patrol">PATROLZONE.Patrol</a>( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.</li>
-    <li><a href="##(PATROLZONE).RTB">PATROLZONE.RTB</a>( AIControllable ): The AIControllable will report return to base.</li>
-    <li><a href="##(PATROLZONE).End">PATROLZONE.End</a>( AIControllable ): The end of the PATROLZONE process.</li>
-    <li><a href="##(PATROLZONE).Dead">PATROLZONE.Dead</a>( AIControllable ): The AIControllable is dead. The PATROLZONE process will be ended.</li>
+    <li><a href="##(AI_PATROLZONE).Route">AI_PATROLZONE.Route</a>( AIControllable ):  A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.</li>
+    <li><a href="##(AI_PATROLZONE).Patrol">AI_PATROLZONE.Patrol</a>( AIControllable ): The AIControllable reports it is patrolling. This event is called every 30 seconds.</li>
+    <li><a href="##(AI_PATROLZONE).RTB">AI_PATROLZONE.RTB</a>( AIControllable ): The AIControllable will report return to base.</li>
+    <li><a href="##(AI_PATROLZONE).End">AI_PATROLZONE.End</a>( AIControllable ): The end of the AI_PATROLZONE process.</li>
+    <li><a href="##(AI_PATROLZONE).Dead">AI_PATROLZONE.Dead</a>( AIControllable ): The AIControllable is dead. The AI_PATROLZONE process will be ended.</li>
 </ul>
 
-<h3>1.2.2) PATROLZONE States:</h3>
+<h3>1.2.2) AI_PATROLZONE States:</h3>
 
 <ul>
     <li><strong>Route</strong>: A new 3D route point is selected and the AIControllable will fly towards that point with the given speed.</li>
-    <li><strong>Patrol</strong>: The AIControllable is patrolling. This state is set every 30 seconds, so every 30 seconds, a state transition function can be used.</li>
+    <li><strong>Patrol</strong>: The AIControllable is patrolling. This state is set every 30 seconds, so every 30 seconds, a state transition method can be used.</li>
     <li><strong>RTB</strong>: The AIControllable reports it wants to return to the base.</li>
     <li><strong>Dead</strong>: The AIControllable is dead ...</li>
     <li><strong>End</strong>: The process has come to an end.</li>
 </ul>
 
-<h3>1.2.3) PATROLZONE state transition functions:</h3>
+<h3>1.2.3) AI_PATROLZONE state transition methods:</h3>
 
 <p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
-There are 2 moments when state transition functions will be called by the state machine:</p>
+There are 2 moments when state transition methods will be called by the state machine:</p>
 
 <ul>
     <li><p><strong>Before</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnBefore + the name of the state</strong>. 
-    If the state transition function returns false, then the processing of the state transition will not be done!
+    The state transition method needs to start with the name <strong>OnBefore + the name of the state</strong>. 
+    If the state transition method returns false, then the processing of the state transition will not be done!
     If you want to change the behaviour of the AIControllable at this event, return false, 
     but then you'll need to specify your own logic using the AIControllable!</p></li>
     <li><p><strong>After</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnAfter + the name of the state</strong>. 
-    These state transition functions need to provide a return value, which is specified at the function description.</p></li>
+    The state transition method needs to start with the name <strong>OnAfter + the name of the state</strong>. 
+    These state transition methods need to provide a return value, which is specified at the function description.</p></li>
 </ul>
 
-<p>An example how to manage a state transition for an PATROLZONE object <strong>Patrol</strong> for the state <strong>RTB</strong>:</p>
+<p>An example how to manage a state transition for an AI_PATROLZONE object <strong>Patrol</strong> for the state <strong>RTB</strong>:</p>
 
 <pre><code> local PatrolZoneGroup = GROUP:FindByName( "Patrol Zone" )
  local PatrolZone = ZONE_POLYGON:New( "PatrolZone", PatrolZoneGroup )
@@ -151,49 +153,49 @@ There are 2 moments when state transition functions will be called by the state
  local PatrolSpawn = SPAWN:New( "Patrol Group" )
  local PatrolGroup = PatrolSpawn:Spawn()
 
- local Patrol = PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
+ local Patrol = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 300, 600 )
  Patrol:SetControllable( PatrolGroup )
  Patrol:ManageFuel( 0.2, 60 )
 </code></pre>
 
-<p><strong>OnBefore</strong>RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but <strong>before</strong> the RTB default action is processed by the PATROLZONE object.</p>
+<p><strong>OnBefore</strong>RTB( AIGroup ) will be called by the AI<em>PATROLZONE object when the AIGroup reports RTB, but <strong>before</strong> the RTB default action is processed by the AI</em>PATROLZONE object.</p>
 
-<pre><code> --- State transition function for the PATROLZONE **Patrol** object
- -- @param #PATROLZONE self 
- -- @param Controllable#CONTROLLABLE AIGroup
- -- @return #boolean If false is returned, then the OnAfter state transition function will not be called.
+<pre><code> --- State transition function for the AI_PATROLZONE **Patrol** object
+ -- @param #AI_PATROLZONE self 
+ -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
+ -- @return #boolean If false is returned, then the OnAfter state transition method will not be called.
  function Patrol:OnBeforeRTB( AIGroup )
    AIGroup:MessageToRed( "Returning to base", 20 )
  end
 </code></pre>
 
-<p><strong>OnAfter</strong>RTB( AIGroup ) will be called by the PATROLZONE object when the AIGroup reports RTB, but <strong>after</strong> the RTB default action was processed by the PATROLZONE object.</p>
+<p><strong>OnAfter</strong>RTB( AIGroup ) will be called by the AI<em>PATROLZONE object when the AIGroup reports RTB, but <strong>after</strong> the RTB default action was processed by the AI</em>PATROLZONE object.</p>
 
-<pre><code> --- State transition function for the PATROLZONE **Patrol** object
- -- @param #PATROLZONE self 
- -- @param Controllable#CONTROLLABLE AIGroup
- -- @return #Controllable#CONTROLLABLE The new AIGroup object that is set to be patrolling the zone.
+<pre><code> --- State transition function for the AI_PATROLZONE **Patrol** object
+ -- @param #AI_PATROLZONE self 
+ -- @param Wrapper.Controllable#CONTROLLABLE AIGroup
+ -- @return #Wrapper.Controllable#CONTROLLABLE The new AIGroup object that is set to be patrolling the zone.
  function Patrol:OnAfterRTB( AIGroup )
    return PatrolSpawn:Spawn()
  end 
 </code></pre>
 
-<h2>1.3) Manage the PATROLZONE parameters:</h2>
-<p>The following methods are available to modify the parameters of a PATROLZONE object:</p>
+<h2>1.3) Manage the AI_PATROLZONE parameters:</h2>
+<p>The following methods are available to modify the parameters of a AI_PATROLZONE object:</p>
 
 <ul>
-    <li><a href="##(PATROLZONE).SetControllable">PATROLZONE.SetControllable</a>(): Set the AIControllable.</li>
-    <li><a href="##(PATROLZONE).GetControllable">PATROLZONE.GetControllable</a>(): Get the AIControllable.</li>
-    <li><a href="##(PATROLZONE).SetSpeed">PATROLZONE.SetSpeed</a>(): Set the patrol speed of the AI, for the next patrol.</li>
-    <li><a href="##(PATROLZONE).SetAltitude">PATROLZONE.SetAltitude</a>(): Set altitude of the AI, for the next patrol.</li>
+    <li><a href="##(AI_PATROLZONE).SetControllable">AI_PATROLZONE.SetControllable</a>(): Set the AIControllable.</li>
+    <li><a href="##(AI_PATROLZONE).GetControllable">AI_PATROLZONE.GetControllable</a>(): Get the AIControllable.</li>
+    <li><a href="##(AI_PATROLZONE).SetSpeed">AI_PATROLZONE.SetSpeed</a>(): Set the patrol speed of the AI, for the next patrol.</li>
+    <li><a href="##(AI_PATROLZONE).SetAltitude">AI_PATROLZONE.SetAltitude</a>(): Set altitude of the AI, for the next patrol.</li>
 </ul>
 
-<h2>1.3) Manage the out of fuel in the PATROLZONE:</h2>
+<h2>1.3) Manage the out of fuel in the AI_PATROLZONE:</h2>
 <p>When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.
 Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
-When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 Once the time is finished, the old AIControllable will return to the base.
-Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() to have this proces in place.</p>
+Use the method <a href="##(AI_PATROLZONE).ManageFuel">AI_PATROLZONE.ManageFuel</a>() to have this proces in place.</p>
 
 <hr/>
 
@@ -232,7 +234,7 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#PATROLZONE">PATROLZONE</a></td>
+		<td class="name" nowrap="nowrap"><a href="#AI_PATROLZONE">AI_PATROLZONE</a></td>
 		<td class="summary">
 
 </td>
@@ -244,112 +246,112 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 </td>
 		</tr>
 	</table>
-			<h2><a id="#(PATROLZONE)">Type <code>PATROLZONE</code></a></h2>
+			<h2><a id="#(AI_PATROLZONE)">Type <code>AI_PATROLZONE</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).AIControllable">PATROLZONE.AIControllable</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).AIControllable">AI_PATROLZONE.AIControllable</a></td>
 		<td class="summary">
 <p>The <a href="Controllable.html">Controllable</a> patrolling.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).ClassName">PATROLZONE.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).ClassName">AI_PATROLZONE.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).ManageFuel">PATROLZONE:ManageFuel(PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).ManageFuel">AI_PATROLZONE:ManageFuel(PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime)</a></td>
 		<td class="summary">
 <p>When the AIControllable is out of fuel, it is required that a new AIControllable is started, before the old AIControllable can return to the home base.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).New">PATROLZONE:New(PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).New">AI_PATROLZONE:New(PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed)</a></td>
 		<td class="summary">
-<p>Creates a new PATROLZONE object</p>
+<p>Creates a new AI_PATROLZONE object</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).OnAfterRoute">PATROLZONE:OnAfterRoute(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).OnAfterRoute">AI_PATROLZONE:OnAfterRoute(Controllable)</a></td>
 		<td class="summary">
 <p>OnAfter State Transition Function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).OnBeforeRoute">PATROLZONE:OnBeforeRoute(Controllable)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).OnBeforeRoute">AI_PATROLZONE:OnBeforeRoute(Controllable)</a></td>
 		<td class="summary">
 <p>OnBefore State Transition Function</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolCeilingAltitude">PATROLZONE.PatrolCeilingAltitude</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolCeilingAltitude">AI_PATROLZONE.PatrolCeilingAltitude</a></td>
 		<td class="summary">
 <p>The highest altitude in meters where to execute the patrol.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolFloorAltitude">PATROLZONE.PatrolFloorAltitude</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolFloorAltitude">AI_PATROLZONE.PatrolFloorAltitude</a></td>
 		<td class="summary">
 <p>The lowest altitude in meters where to execute the patrol.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolFuelTresholdPercentage">PATROLZONE.PatrolFuelTresholdPercentage</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolFuelTresholdPercentage">AI_PATROLZONE.PatrolFuelTresholdPercentage</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolManageFuel">PATROLZONE.PatrolManageFuel</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolManageFuel">AI_PATROLZONE.PatrolManageFuel</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolMaxSpeed">PATROLZONE.PatrolMaxSpeed</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolMaxSpeed">AI_PATROLZONE.PatrolMaxSpeed</a></td>
 		<td class="summary">
 <p>The maximum speed of the <a href="Controllable.html">Controllable</a> in km/h.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolMinSpeed">PATROLZONE.PatrolMinSpeed</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolMinSpeed">AI_PATROLZONE.PatrolMinSpeed</a></td>
 		<td class="summary">
 <p>The minimum speed of the <a href="Controllable.html">Controllable</a> in km/h.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolOutOfFuelOrbitTime">PATROLZONE.PatrolOutOfFuelOrbitTime</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolOutOfFuelOrbitTime">AI_PATROLZONE.PatrolOutOfFuelOrbitTime</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).PatrolZone">PATROLZONE.PatrolZone</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).PatrolZone">AI_PATROLZONE.PatrolZone</a></td>
 		<td class="summary">
 <p>The <a href="Zone.html">Zone</a> where the patrol needs to be executed.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).SetAltitude">PATROLZONE:SetAltitude(PatrolFloorAltitude, PatrolCeilingAltitude)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).SetAltitude">AI_PATROLZONE:SetAltitude(PatrolFloorAltitude, PatrolCeilingAltitude)</a></td>
 		<td class="summary">
 <p>Sets the floor and ceiling altitude of the patrol.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).SetSpeed">PATROLZONE:SetSpeed(PatrolMinSpeed, PatrolMaxSpeed)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).SetSpeed">AI_PATROLZONE:SetSpeed(PatrolMinSpeed, PatrolMaxSpeed)</a></td>
 		<td class="summary">
 <p>Sets (modifies) the minimum and maximum speed of the patrol.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).onenterPatrol">PATROLZONE:onenterPatrol()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).onenterPatrol">AI_PATROLZONE:onenterPatrol()</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(PATROLZONE).onenterRoute">PATROLZONE:onenterRoute()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(AI_PATROLZONE).onenterRoute">AI_PATROLZONE:onenterRoute()</a></td>
 		<td class="summary">
 <p>Defines a new patrol route using the <a href="Process_PatrolZone.html">Process_PatrolZone</a> parameters and settings.</p>
 </td>
@@ -360,9 +362,9 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 		<dl class="function">
 <dt>
 
-		<em><a href="##(PATROLZONE)">#PATROLZONE</a></em>
-<a id="PATROLZONE" >
-<strong>PATROLZONE</strong>
+		<em><a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a></em>
+<a id="AI_PATROLZONE" >
+<strong>AI_PATROLZONE</strong>
 </a>
 </dt>
 <dd>
@@ -386,7 +388,7 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> AIControllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> AIControllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -394,17 +396,17 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 </dl>
 	<h2><a id="#(Patrol)" >Type <code>Patrol</code></a></h2>
 	
-			<h2><a id="#(PATROLZONE)" >Type <code>PATROLZONE</code></a></h2>
+			<h2><a id="#(AI_PATROLZONE)" >Type <code>AI_PATROLZONE</code></a></h2>
 				
-<p>PATROLZONE class</p>
+<p>AI_PATROLZONE class</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
-		<em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a></em>
-<a id="#(PATROLZONE).AIControllable" >
-<strong>PATROLZONE.AIControllable</strong>
+		<em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a></em>
+<a id="#(AI_PATROLZONE).AIControllable" >
+<strong>AI_PATROLZONE.AIControllable</strong>
 </a>
 </dt>
 <dd>
@@ -417,8 +419,8 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 <dt>
 
 		<em>#string</em>
-<a id="#(PATROLZONE).ClassName" >
-<strong>PATROLZONE.ClassName</strong>
+<a id="#(AI_PATROLZONE).ClassName" >
+<strong>AI_PATROLZONE.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -430,8 +432,8 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).ManageFuel" >
-<strong>PATROLZONE:ManageFuel(PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime)</strong>
+<a id="#(AI_PATROLZONE).ManageFuel" >
+<strong>AI_PATROLZONE:ManageFuel(PatrolFuelTresholdPercentage, PatrolOutOfFuelOrbitTime)</strong>
 </a>
 </dt>
 <dd>
@@ -440,7 +442,7 @@ Use the method <a href="##(PATROLZONE).ManageFuel">PATROLZONE.ManageFuel</a>() t
 
 	
 <p>Therefore, with a parameter and a calculation of the distance to the home base, the fuel treshold is calculated.
-When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the PATROLZONE.
+When the fuel treshold is reached, the AIControllable will continue for a given time its patrol task in orbit, while a new AIControllable is targetted to the AI_PATROLZONE.
 Once the time is finished, the old AIControllable will return to the base.</p>
 
 		<h3>Parameters</h3>
@@ -460,7 +462,7 @@ The amount of seconds the out of fuel AIControllable will orbit before returning
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(PATROLZONE)">#PATROLZONE</a>:</em>
+<p><em><a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a>:</em>
 self</p>
 
 </dd>
@@ -468,65 +470,65 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).New" >
-<strong>PATROLZONE:New(PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed)</strong>
+<a id="#(AI_PATROLZONE).New" >
+<strong>AI_PATROLZONE:New(PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Creates a new PATROLZONE object</p>
+<p>Creates a new AI_PATROLZONE object</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> PatrolZone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> PatrolZone </em></code>: 
 The <a href="Zone.html">Zone</a> where the patrol needs to be executed.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Altitude)">DCSTypes#Altitude</a> PatrolFloorAltitude </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Altitude)">Dcs.DCSTypes#Altitude</a> PatrolFloorAltitude </em></code>: 
 The lowest altitude in meters where to execute the patrol.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Altitude)">DCSTypes#Altitude</a> PatrolCeilingAltitude </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Altitude)">Dcs.DCSTypes#Altitude</a> PatrolCeilingAltitude </em></code>: 
 The highest altitude in meters where to execute the patrol.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a> PatrolMinSpeed </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a> PatrolMinSpeed </em></code>: 
 The minimum speed of the <a href="Controllable.html">Controllable</a> in km/h.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a> PatrolMaxSpeed </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a> PatrolMaxSpeed </em></code>: 
 The maximum speed of the <a href="Controllable.html">Controllable</a> in km/h.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(PATROLZONE)">#PATROLZONE</a>:</em>
+<p><em><a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a>:</em>
 self</p>
 
 			<h3>Usage:</h3>
-		<pre class="example"><code>-- Define a new PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
+		<pre class="example"><code>-- Define a new AI_PATROLZONE Object. This PatrolArea will patrol an AIControllable within PatrolZone between 3000 and 6000 meters, with a variying speed between 600 and 900 km/h.
 PatrolZone = ZONE:New( 'PatrolZone' )
 PatrolSpawn = SPAWN:New( 'Patrol Group' )
-PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
+PatrolArea = AI_PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).OnAfterRoute" >
-<strong>PATROLZONE:OnAfterRoute(Controllable)</strong>
+<a id="#(AI_PATROLZONE).OnAfterRoute" >
+<strong>AI_PATROLZONE:OnAfterRoute(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -537,7 +539,7 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -546,8 +548,8 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).OnBeforeRoute" >
-<strong>PATROLZONE:OnBeforeRoute(Controllable)</strong>
+<a id="#(AI_PATROLZONE).OnBeforeRoute" >
+<strong>AI_PATROLZONE:OnBeforeRoute(Controllable)</strong>
 </a>
 </dt>
 <dd>
@@ -558,7 +560,7 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> Controllable </em></code>: </p>
 
 				</li>
 		</ul>
@@ -572,9 +574,9 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Altitude)">DCSTypes#Altitude</a></em>
-<a id="#(PATROLZONE).PatrolCeilingAltitude" >
-<strong>PATROLZONE.PatrolCeilingAltitude</strong>
+		<em><a href="Dcs.DCSTypes.html##(Altitude)">Dcs.DCSTypes#Altitude</a></em>
+<a id="#(AI_PATROLZONE).PatrolCeilingAltitude" >
+<strong>AI_PATROLZONE.PatrolCeilingAltitude</strong>
 </a>
 </dt>
 <dd>
@@ -586,9 +588,9 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Altitude)">DCSTypes#Altitude</a></em>
-<a id="#(PATROLZONE).PatrolFloorAltitude" >
-<strong>PATROLZONE.PatrolFloorAltitude</strong>
+		<em><a href="Dcs.DCSTypes.html##(Altitude)">Dcs.DCSTypes#Altitude</a></em>
+<a id="#(AI_PATROLZONE).PatrolFloorAltitude" >
+<strong>AI_PATROLZONE.PatrolFloorAltitude</strong>
 </a>
 </dt>
 <dd>
@@ -601,8 +603,8 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 <dt>
 
 		<em></em>
-<a id="#(PATROLZONE).PatrolFuelTresholdPercentage" >
-<strong>PATROLZONE.PatrolFuelTresholdPercentage</strong>
+<a id="#(AI_PATROLZONE).PatrolFuelTresholdPercentage" >
+<strong>AI_PATROLZONE.PatrolFuelTresholdPercentage</strong>
 </a>
 </dt>
 <dd>
@@ -615,8 +617,8 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 <dt>
 
 		<em>#boolean</em>
-<a id="#(PATROLZONE).PatrolManageFuel" >
-<strong>PATROLZONE.PatrolManageFuel</strong>
+<a id="#(AI_PATROLZONE).PatrolManageFuel" >
+<strong>AI_PATROLZONE.PatrolManageFuel</strong>
 </a>
 </dt>
 <dd>
@@ -628,9 +630,9 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a></em>
-<a id="#(PATROLZONE).PatrolMaxSpeed" >
-<strong>PATROLZONE.PatrolMaxSpeed</strong>
+		<em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a></em>
+<a id="#(AI_PATROLZONE).PatrolMaxSpeed" >
+<strong>AI_PATROLZONE.PatrolMaxSpeed</strong>
 </a>
 </dt>
 <dd>
@@ -642,9 +644,9 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a></em>
-<a id="#(PATROLZONE).PatrolMinSpeed" >
-<strong>PATROLZONE.PatrolMinSpeed</strong>
+		<em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a></em>
+<a id="#(AI_PATROLZONE).PatrolMinSpeed" >
+<strong>AI_PATROLZONE.PatrolMinSpeed</strong>
 </a>
 </dt>
 <dd>
@@ -657,8 +659,8 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 <dt>
 
 		<em></em>
-<a id="#(PATROLZONE).PatrolOutOfFuelOrbitTime" >
-<strong>PATROLZONE.PatrolOutOfFuelOrbitTime</strong>
+<a id="#(AI_PATROLZONE).PatrolOutOfFuelOrbitTime" >
+<strong>AI_PATROLZONE.PatrolOutOfFuelOrbitTime</strong>
 </a>
 </dt>
 <dd>
@@ -670,9 +672,9 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-		<em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></em>
-<a id="#(PATROLZONE).PatrolZone" >
-<strong>PATROLZONE.PatrolZone</strong>
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(AI_PATROLZONE).PatrolZone" >
+<strong>AI_PATROLZONE.PatrolZone</strong>
 </a>
 </dt>
 <dd>
@@ -684,8 +686,8 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).SetAltitude" >
-<strong>PATROLZONE:SetAltitude(PatrolFloorAltitude, PatrolCeilingAltitude)</strong>
+<a id="#(AI_PATROLZONE).SetAltitude" >
+<strong>AI_PATROLZONE:SetAltitude(PatrolFloorAltitude, PatrolCeilingAltitude)</strong>
 </a>
 </dt>
 <dd>
@@ -696,20 +698,20 @@ PatrolArea = PATROLZONE:New( PatrolZone, 3000, 6000, 600, 900 )</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Altitude)">DCSTypes#Altitude</a> PatrolFloorAltitude </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Altitude)">Dcs.DCSTypes#Altitude</a> PatrolFloorAltitude </em></code>: 
 The lowest altitude in meters where to execute the patrol.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Altitude)">DCSTypes#Altitude</a> PatrolCeilingAltitude </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Altitude)">Dcs.DCSTypes#Altitude</a> PatrolCeilingAltitude </em></code>: 
 The highest altitude in meters where to execute the patrol.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(PATROLZONE)">#PATROLZONE</a>:</em>
+<p><em><a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a>:</em>
 self</p>
 
 </dd>
@@ -717,8 +719,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).SetSpeed" >
-<strong>PATROLZONE:SetSpeed(PatrolMinSpeed, PatrolMaxSpeed)</strong>
+<a id="#(AI_PATROLZONE).SetSpeed" >
+<strong>AI_PATROLZONE:SetSpeed(PatrolMinSpeed, PatrolMaxSpeed)</strong>
 </a>
 </dt>
 <dd>
@@ -729,20 +731,20 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a> PatrolMinSpeed </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a> PatrolMinSpeed </em></code>: 
 The minimum speed of the <a href="Controllable.html">Controllable</a> in km/h.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a> PatrolMaxSpeed </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a> PatrolMaxSpeed </em></code>: 
 The maximum speed of the <a href="Controllable.html">Controllable</a> in km/h.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(PATROLZONE)">#PATROLZONE</a>:</em>
+<p><em><a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a>:</em>
 self</p>
 
 </dd>
@@ -750,8 +752,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).onenterPatrol" >
-<strong>PATROLZONE:onenterPatrol()</strong>
+<a id="#(AI_PATROLZONE).onenterPatrol" >
+<strong>AI_PATROLZONE:onenterPatrol()</strong>
 </a>
 </dt>
 <dd>
@@ -763,8 +765,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(PATROLZONE).onenterRoute" >
-<strong>PATROLZONE:onenterRoute()</strong>
+<a id="#(AI_PATROLZONE).onenterRoute" >
+<strong>AI_PATROLZONE:onenterRoute()</strong>
 </a>
 </dt>
 <dd>
@@ -773,7 +775,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="##(PATROLZONE)">#PATROLZONE</a>:</em>
+<p><em><a href="##(AI_PATROLZONE)">#AI_PATROLZONE</a>:</em>
 self</p>
 
 </dd>
diff --git a/Moose Training/Documentation/Point.html b/Moose Training/Documentation/Point.html
index f60d643ea..589adc82b 100644
--- a/Moose Training/Documentation/Point.html	
+++ b/Moose Training/Documentation/Point.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li>Point</li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Point.html##(POINT_VEC3)">Point#POINT_VEC3</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<p>The <a href="Point.html##(POINT_VEC3)">Point#POINT_VEC3</a> class defines a 3D point in the simulator.</p>
+<h1>1) <a href="Core.Point.html##(POINT_VEC3)">Core.Point#POINT_VEC3</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+<p>The <a href="Core.Point.html##(POINT_VEC3)">Core.Point#POINT_VEC3</a> class defines a 3D point in the simulator.</p>
 
 <p><strong>Important Note:</strong> Most of the functions in this section were taken from MIST, and reworked to OO concepts.
 In order to keep the credibility of the the author, I want to emphasize that the of the MIST framework was created by Grimes, who you can find on the Eagle Dynamics Forums.</p>
@@ -98,19 +100,19 @@ In order to keep the credibility of the the author, I want to emphasize that the
 
 <ul>
     <li><a href="##(POINT_VEC3).New">POINT_VEC3.New</a>(): a 3D point.</li>
-    <li><a href="##(POINT_VEC3).NewFromVec3">POINT_VEC3.NewFromVec3</a>(): a 3D point created from a <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>.</li>
+    <li><a href="##(POINT_VEC3).NewFromVec3">POINT_VEC3.NewFromVec3</a>(): a 3D point created from a <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>.</li>
 </ul>
 
 
-<h1>2) <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> class, extends <a href="Point.html##(POINT_VEC3)">Point#POINT_VEC3</a></h1>
-<p>The <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> class defines a 2D point in the simulator. The height coordinate (if needed) will be the land height + an optional added height specified.</p>
+<h1>2) <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> class, extends <a href="Core.Point.html##(POINT_VEC3)">Core.Point#POINT_VEC3</a></h1>
+<p>The <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> class defines a 2D point in the simulator. The height coordinate (if needed) will be the land height + an optional added height specified.</p>
 
 <h2>2.1) POINT_VEC2 constructor</h2>
 <p>A new POINT_VEC2 instance can be created with:</p>
 
 <ul>
     <li><a href="##(POINT_VEC2).New">POINT_VEC2.New</a>(): a 2D point, taking an additional height parameter.</li>
-    <li><a href="##(POINT_VEC2).NewFromVec2">POINT_VEC2.NewFromVec2</a>(): a 2D point created from a <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>.</li>
+    <li><a href="##(POINT_VEC2).NewFromVec2">POINT_VEC2.NewFromVec2</a>(): a 2D point created from a <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>.</li>
 </ul>
 
 <hr/>
@@ -178,7 +180,7 @@ In order to keep the credibility of the the author, I want to emphasize that the
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(POINT_VEC2).DistanceFromVec2">POINT_VEC2:DistanceFromVec2(Vec2Reference)</a></td>
 		<td class="summary">
-<p>Calculate the distance from a reference <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>.</p>
+<p>Calculate the distance from a reference <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>.</p>
 </td>
 		</tr>
 		<tr>
@@ -655,7 +657,7 @@ The reference <a href="##(POINT_VEC2)">#POINT_VEC2</a>.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
 The distance from the reference <a href="##(POINT_VEC2)">#POINT_VEC2</a> in meters.</p>
 
 </dd>
@@ -669,21 +671,21 @@ The distance from the reference <a href="##(POINT_VEC2)">#POINT_VEC2</a> in mete
 </dt>
 <dd>
 	
-<p>Calculate the distance from a reference <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>.</p>
+<p>Calculate the distance from a reference <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2Reference </em></code>: 
-The reference <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>.</p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2Reference </em></code>: 
+The reference <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
-The distance from the reference <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> in meters.</p>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
+The distance from the reference <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> in meters.</p>
 
 </dd>
 </dl>
@@ -774,26 +776,26 @@ The y coodinate.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> x </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> x </em></code>: 
 The x coordinate of the Vec3 point, pointing to the North.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> y </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> y </em></code>: 
 The y coordinate of the Vec3 point, pointing to the Right.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> LandHeightAdd </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> LandHeightAdd </em></code>: 
 (optional) The default height if required to be evaluated will be the land height of the x, y coordinate. You can specify an extra height to be added to the land height.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>:</em></p>
+<p><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>:</em></p>
 
 
 </dd>
@@ -813,7 +815,7 @@ The y coordinate of the Vec3 point, pointing to the Right.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The Vec2 point.</p>
 
 				</li>
@@ -825,7 +827,7 @@ The Vec2 point.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>:</em>
+<p><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>:</em>
 self</p>
 
 </dd>
@@ -845,14 +847,14 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 The Vec3 point.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>:</em>
+<p><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>:</em>
 self</p>
 
 </dd>
@@ -926,13 +928,13 @@ The y coordinate.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Distance </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Distance </em></code>: 
 The Distance to be added in meters.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Angle)">DCSTypes#Angle</a> Angle </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Angle)">Dcs.DCSTypes#Angle</a> Angle </em></code>: 
 The Angle in degrees.</p>
 
 				</li>
@@ -947,7 +949,7 @@ The new calculated POINT_VEC2.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(POINT_VEC2).x" >
 <strong>POINT_VEC2.x</strong>
 </a>
@@ -961,7 +963,7 @@ The new calculated POINT_VEC2.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(POINT_VEC2).y" >
 <strong>POINT_VEC2.y</strong>
 </a>
@@ -1007,12 +1009,12 @@ The new calculated POINT_VEC2.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Utils.html##(FLARECOLOR)">Utils#FLARECOLOR</a> FlareColor </em></code>: </p>
+<p><code><em><a href="Utilities.Utils.html##(FLARECOLOR)">Utilities.Utils#FLARECOLOR</a> FlareColor </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> ( </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> ( </em></code>: 
 ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</p>
 
 				</li>
@@ -1027,7 +1029,7 @@ ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</
 		<dl class="function">
 <dt>
 
-		<em><a href="Utils.html##(FLARECOLOR)">Utils#FLARECOLOR</a></em>
+		<em><a href="Utilities.Utils.html##(FLARECOLOR)">Utilities.Utils#FLARECOLOR</a></em>
 <a id="#(POINT_VEC3).FlareColor" >
 <strong>POINT_VEC3.FlareColor</strong>
 </a>
@@ -1053,7 +1055,7 @@ ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> ( </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> ( </em></code>: 
 ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</p>
 
 				</li>
@@ -1101,7 +1103,7 @@ ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> ( </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> ( </em></code>: 
 ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</p>
 
 				</li>
@@ -1128,7 +1130,7 @@ ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> ( </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> ( </em></code>: 
 ptional) Azimuth The azimuth of the flare direction. The default azimuth is 0.</p>
 
 				</li>
@@ -1162,7 +1164,7 @@ The target POINT_VEC3.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
 Distance The distance in meters.</p>
 
 </dd>
@@ -1189,7 +1191,7 @@ The target POINT_VEC3.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
 Distance The distance in meters.</p>
 
 </dd>
@@ -1254,7 +1256,7 @@ The BR text.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> DirectionVec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> DirectionVec3 </em></code>: 
 The direction vector in Vec3 format.</p>
 
 				</li>
@@ -1288,7 +1290,7 @@ The target POINT_VEC3.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 DirectionVec3 The direction vector in Vec3 format.</p>
 
 </dd>
@@ -1326,12 +1328,12 @@ CorrectionRadians The correction in radians.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> OuterRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> OuterRadius </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> InnerRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> InnerRadius </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1357,12 +1359,12 @@ CorrectionRadians The correction in radians.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> OuterRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> OuterRadius </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> InnerRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> InnerRadius </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1388,18 +1390,18 @@ CorrectionRadians The correction in radians.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> OuterRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> OuterRadius </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> InnerRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> InnerRadius </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 Vec2</p>
 
 </dd>
@@ -1419,18 +1421,18 @@ Vec2</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> OuterRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> OuterRadius </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> InnerRadius </em></code>: </p>
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> InnerRadius </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 Vec3</p>
 
 </dd>
@@ -1448,7 +1450,7 @@ Vec3</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The Vec2 coodinate.</p>
 
 </dd>
@@ -1466,7 +1468,7 @@ The Vec2 coodinate.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 The Vec3 coodinate.</p>
 
 </dd>
@@ -1572,26 +1574,26 @@ Metric true means metric, false means NM.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> x </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> x </em></code>: 
 The x coordinate of the Vec3 point, pointing to the North.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> y </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> y </em></code>: 
 The y coordinate of the Vec3 point, pointing Upwards.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> z </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> z </em></code>: 
 The z coordinate of the Vec3 point, pointing to the Right.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Point.html##(POINT_VEC3)">Point#POINT_VEC3</a>:</em>
+<p><em><a href="Core.Point.html##(POINT_VEC3)">Core.Point#POINT_VEC3</a>:</em>
 self</p>
 
 </dd>
@@ -1611,14 +1613,14 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 The Vec3 point.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Point.html##(POINT_VEC3)">Point#POINT_VEC3</a>:</em>
+<p><em><a href="Core.Point.html##(POINT_VEC3)">Core.Point#POINT_VEC3</a>:</em>
 self</p>
 
 </dd>
@@ -1670,7 +1672,7 @@ The route point action.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a> Speed </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a> Speed </em></code>: 
 Airspeed in km/h.</p>
 
 				</li>
@@ -1717,7 +1719,7 @@ The route point.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Speed)">DCSTypes#Speed</a> Speed </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Speed)">Dcs.DCSTypes#Speed</a> Speed </em></code>: 
 Speed in km/h.</p>
 
 				</li>
@@ -1867,7 +1869,7 @@ The z coordinate.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Utils.html##(SMOKECOLOR)">Utils#SMOKECOLOR</a> SmokeColor </em></code>: </p>
+<p><code><em><a href="Utilities.Utils.html##(SMOKECOLOR)">Utilities.Utils#SMOKECOLOR</a> SmokeColor </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1889,7 +1891,7 @@ The z coordinate.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="##(POINT_VEC3.SmokeColor)">#POINT_VEC3.SmokeColor</a></em>
+		<em><a href="Utilities.Utils.html##(SMOKECOLOR)">Utilities.Utils#SMOKECOLOR</a></em>
 <a id="#(POINT_VEC3).SmokeColor" >
 <strong>POINT_VEC3.SmokeColor</strong>
 </a>
@@ -2043,13 +2045,13 @@ The BR Text</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Distance </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Distance </em></code>: 
 The Distance to be added in meters.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Angle)">DCSTypes#Angle</a> Angle </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Angle)">Dcs.DCSTypes#Angle</a> Angle </em></code>: 
 The Angle in degrees.</p>
 
 				</li>
@@ -2161,8 +2163,6 @@ The new calculated POINT_VEC3.</p>
 </dd>
 </dl>
 
-			<h2><a id="#(POINT_VEC3.SmokeColor)" >Type <code>POINT_VEC3.SmokeColor</code></a></h2>
-			
 </div>
 
 </div>
diff --git a/Moose Training/Documentation/Positionable.html b/Moose Training/Documentation/Positionable.html
index fa2fbcbb3..efda60337 100644
--- a/Moose Training/Documentation/Positionable.html	
+++ b/Moose Training/Documentation/Positionable.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li>Positionable</li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Positionable.html##(POSITIONABLE)">Positionable#POSITIONABLE</a> class, extends <a href="Identifiable.html##(IDENTIFIABLE)">Identifiable#IDENTIFIABLE</a></h1>
-<p>The <a href="Positionable.html##(POSITIONABLE)">Positionable#POSITIONABLE</a> class is a wrapper class to handle the POSITIONABLE objects:</p>
+<h1>1) <a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a> class, extends <a href="Wrapper.Identifiable.html##(IDENTIFIABLE)">Wrapper.Identifiable#IDENTIFIABLE</a></h1>
+<p>The <a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a> class is a wrapper class to handle the POSITIONABLE objects:</p>
 
 <ul>
     <li>Support all DCS APIs.</li>
@@ -100,15 +102,15 @@
 <p>The POSITIONABLE class provides the following functions to construct a POSITIONABLE instance:</p>
 
 <ul>
-    <li><a href="Positionable.html##(POSITIONABLE).New">Positionable#POSITIONABLE.New</a>(): Create a POSITIONABLE instance.</li>
+    <li><a href="Wrapper.Positionable.html##(POSITIONABLE).New">Wrapper.Positionable#POSITIONABLE.New</a>(): Create a POSITIONABLE instance.</li>
 </ul>
 
 <h2>1.2) POSITIONABLE methods:</h2>
 <p>The following methods can be used to identify an measurable object:</p>
 
 <ul>
-    <li><a href="Positionable.html##(POSITIONABLE).GetID">Positionable#POSITIONABLE.GetID</a>(): Returns the ID of the measurable object.</li>
-    <li><a href="Positionable.html##(POSITIONABLE).GetName">Positionable#POSITIONABLE.GetName</a>(): Returns the name of the measurable object.</li>
+    <li><a href="Wrapper.Positionable.html##(POSITIONABLE).GetID">Wrapper.Positionable#POSITIONABLE.GetID</a>(): Returns the ID of the measurable object.</li>
+    <li><a href="Wrapper.Positionable.html##(POSITIONABLE).GetName">Wrapper.Positionable#POSITIONABLE.GetName</a>(): Returns the name of the measurable object.</li>
 </ul>
 
 <hr/>
@@ -151,6 +153,12 @@
 		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).GetHeading">POSITIONABLE:GetHeading()</a></td>
 		<td class="summary">
 <p>Returns the POSITIONABLE heading in degrees.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).GetMessage">POSITIONABLE:GetMessage(Message, Duration)</a></td>
+		<td class="summary">
+<p>Returns a message with the callsign embedded (if there is one).</p>
 </td>
 		</tr>
 		<tr>
@@ -162,25 +170,25 @@
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).GetPositionVec3">POSITIONABLE:GetPositionVec3()</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Position3)">DCSTypes#Position3</a> position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Position3)">Dcs.DCSTypes#Position3</a> position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).GetRandomVec3">POSITIONABLE:GetRandomVec3(Radius)</a></td>
 		<td class="summary">
-<p>Returns a random <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.</p>
+<p>Returns a random <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).GetVec2">POSITIONABLE:GetVec2()</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> vector indicating the point in 2D of the POSITIONABLE within the mission.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> vector indicating the point in 2D of the POSITIONABLE within the mission.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).GetVec3">POSITIONABLE:GetVec3()</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> vector indicating the 3D vector of the POSITIONABLE within the mission.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> vector indicating the 3D vector of the POSITIONABLE within the mission.</p>
 </td>
 		</tr>
 		<tr>
@@ -205,6 +213,48 @@
 		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).IsAboveRunway">POSITIONABLE:IsAboveRunway()</a></td>
 		<td class="summary">
 <p>Returns if the Positionable is located above a runway.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).Message">POSITIONABLE:Message(Message, Duration)</a></td>
+		<td class="summary">
+<p>Send a message to the players in the <a href="Group.html">Group</a>.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).MessageToAll">POSITIONABLE:MessageToAll(Message, Duration)</a></td>
+		<td class="summary">
+<p>Send a message to all coalitions.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).MessageToBlue">POSITIONABLE:MessageToBlue(Message, Duration)</a></td>
+		<td class="summary">
+<p>Send a message to the blue coalition.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).MessageToClient">POSITIONABLE:MessageToClient(Message, Duration, Client)</a></td>
+		<td class="summary">
+<p>Send a message to a client.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).MessageToCoalition">POSITIONABLE:MessageToCoalition(Message, Duration, MessageCoalition)</a></td>
+		<td class="summary">
+<p>Send a message to a coalition.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).MessageToGroup">POSITIONABLE:MessageToGroup(Message, Duration, MessageGroup)</a></td>
+		<td class="summary">
+<p>Send a message to a <a href="Group.html">Group</a>.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(POSITIONABLE).MessageToRed">POSITIONABLE:MessageToRed(Message, Duration)</a></td>
+		<td class="summary">
+<p>Send a message to the red coalition.</p>
 </td>
 		</tr>
 		<tr>
@@ -291,7 +341,7 @@
 			<ol>
 				<li>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
 The altitude of the POSITIONABLE.</p>
 
 				</li>
@@ -320,6 +370,39 @@ The POSITIONABLE is not existing or alive.  </p>
 <p><em>#number:</em>
 The POSTIONABLE heading</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).GetMessage" >
+<strong>POSITIONABLE:GetMessage(Message, Duration)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns a message with the callsign embedded (if there is one).</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Duration)">Dcs.DCSTypes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Core.Message.html##(MESSAGE)">Core.Message#MESSAGE</a>:</em></p>
+
+
 </dd>
 </dl>
 		<dl class="function">
@@ -337,7 +420,7 @@ The POSTIONABLE heading</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>:</em>
+<p><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>:</em>
 The 2D point vector of the POSITIONABLE.</p>
 
 				</li>
@@ -359,13 +442,13 @@ The POSITIONABLE is not existing or alive.  </p>
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Position3)">DCSTypes#Position3</a> position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Position3)">Dcs.DCSTypes#Position3</a> position vectors indicating the point and direction vectors in 3D of the POSITIONABLE within the mission.</p>
 
 		<h3>Return values</h3>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSTypes.html##(Position)">DCSTypes#Position</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Position)">Dcs.DCSTypes#Position</a>:</em>
 The 3D position vectors of the POSITIONABLE.</p>
 
 				</li>
@@ -387,7 +470,7 @@ The POSITIONABLE is not existing or alive.  </p>
 </dt>
 <dd>
 	
-<p>Returns a random <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.</p>
+<p>Returns a random <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -401,7 +484,7 @@ The POSITIONABLE is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 The 3D point vector of the POSITIONABLE.</p>
 
 				</li>
@@ -423,13 +506,13 @@ The POSITIONABLE is not existing or alive.  </p>
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> vector indicating the point in 2D of the POSITIONABLE within the mission.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> vector indicating the point in 2D of the POSITIONABLE within the mission.</p>
 
 		<h3>Return values</h3>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The 2D point vector of the POSITIONABLE.</p>
 
 				</li>
@@ -451,13 +534,13 @@ The POSITIONABLE is not existing or alive.  </p>
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> vector indicating the 3D vector of the POSITIONABLE within the mission.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> vector indicating the 3D vector of the POSITIONABLE within the mission.</p>
 
 		<h3>Return values</h3>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 The 3D point vector of the POSITIONABLE.</p>
 
 				</li>
@@ -485,7 +568,7 @@ The POSITIONABLE is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 The velocity vector</p>
 
 				</li>
@@ -585,6 +668,240 @@ The POSITIONABLE is not existing or alive.  </p>
 		<dl class="function">
 <dt>
 
+<a id="#(POSITIONABLE).Message" >
+<strong>POSITIONABLE:Message(Message, Duration)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to the players in the <a href="Group.html">Group</a>.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Duration)">Dcs.DCSTypes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).MessageToAll" >
+<strong>POSITIONABLE:MessageToAll(Message, Duration)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to all coalitions.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Duration)">Dcs.DCSTypes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).MessageToBlue" >
+<strong>POSITIONABLE:MessageToBlue(Message, Duration)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to the blue coalition.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Duration)">Dcs.DCSTypes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).MessageToClient" >
+<strong>POSITIONABLE:MessageToClient(Message, Duration, Client)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to a client.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Duration)">Dcs.DCSTypes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> Client </em></code>: 
+The client object receiving the message.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).MessageToCoalition" >
+<strong>POSITIONABLE:MessageToCoalition(Message, Duration, MessageCoalition)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to a coalition.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTYpes.html##(Duration)">Dcs.DCSTYpes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+				<li>
+				
+<p><code><em> MessageCoalition </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).MessageToGroup" >
+<strong>POSITIONABLE:MessageToGroup(Message, Duration, MessageGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to a <a href="Group.html">Group</a>.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTypes.html##(Duration)">Dcs.DCSTypes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> MessageGroup </em></code>: 
+The GROUP object receiving the message.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(POSITIONABLE).MessageToRed" >
+<strong>POSITIONABLE:MessageToRed(Message, Duration)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message to the red coalition.</p>
+
+	
+<p>The message will appear in the message area. The message will begin with the callsign of the group and the type of the first unit sending the message.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string Message </em></code>: 
+The message text</p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Dcs.DCSTYpes.html##(Duration)">Dcs.DCSTYpes#Duration</a> Duration </em></code>: 
+The duration of the message.</p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
 <a id="#(POSITIONABLE).New" >
 <strong>POSITIONABLE:New(PositionableName)</strong>
 </a>
@@ -597,7 +914,7 @@ The POSITIONABLE is not existing or alive.  </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSPositionable.html##(Positionable)">DCSPositionable#Positionable</a> PositionableName </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Positionable.html##(Positionable)">Dcs.DCSWrapper.Positionable#Positionable</a> PositionableName </em></code>: 
 The POSITIONABLE name</p>
 
 				</li>
diff --git a/Moose Training/Documentation/Process_JTAC.html b/Moose Training/Documentation/Process_JTAC.html
index bbe55b515..c88e839d7 100644
--- a/Moose Training/Documentation/Process_JTAC.html	
+++ b/Moose Training/Documentation/Process_JTAC.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li>Process_JTAC</li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -349,22 +351,22 @@
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK)">Task#TASK</a> Task </em></code>: </p>
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> TargetSetUnit </em></code>: </p>
+<p><code><em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> TargetSetUnit </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> FACUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> FACUnit </em></code>: </p>
 
 				</li>
 		</ul>
@@ -390,7 +392,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -426,7 +428,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -446,7 +448,7 @@ self</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TargetUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TargetUnit </em></code>: </p>
 
 				</li>
 		</ul>
@@ -467,7 +469,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -487,7 +489,7 @@ self</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TargetUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TargetUnit </em></code>: </p>
 
 				</li>
 		</ul>
@@ -508,7 +510,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -544,7 +546,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -568,7 +570,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(PROCESS_JTAC).ProcessUnit" >
 <strong>PROCESS_JTAC.ProcessUnit</strong>
 </a>
@@ -582,7 +584,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
+		<em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a></em>
 <a id="#(PROCESS_JTAC).TargetSetUnit" >
 <strong>PROCESS_JTAC.TargetSetUnit</strong>
 </a>
diff --git a/Moose Training/Documentation/Process_Pickup.html b/Moose Training/Documentation/Process_Pickup.html
index c88a1f059..d6aa0dccd 100644
--- a/Moose Training/Documentation/Process_Pickup.html	
+++ b/Moose Training/Documentation/Process_Pickup.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li>Process_Pickup</li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -333,7 +335,7 @@
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -368,17 +370,17 @@
 		<ul>
 				<li>
 				
-<p><code><em><a href="Task.html##(TASK)">Task#TASK</a> Task </em></code>: </p>
+<p><code><em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a> Task </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> TargetSetUnit </em></code>: </p>
+<p><code><em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> TargetSetUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -409,7 +411,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -445,7 +447,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -465,7 +467,7 @@ self</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -486,7 +488,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -506,7 +508,7 @@ self</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> DCSEvent </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> DCSEvent </em></code>: </p>
 
 				</li>
 		</ul>
@@ -527,7 +529,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -563,7 +565,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -599,7 +601,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -635,7 +637,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_PROCESS)">StateMachine#STATEMACHINE_PROCESS</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -659,7 +661,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(PROCESS_PICKUP).ProcessUnit" >
 <strong>PROCESS_PICKUP.ProcessUnit</strong>
 </a>
@@ -673,7 +675,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
+		<em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a></em>
 <a id="#(PROCESS_PICKUP).TargetSetUnit" >
 <strong>PROCESS_PICKUP.TargetSetUnit</strong>
 </a>
diff --git a/Moose Training/Documentation/Route.html b/Moose Training/Documentation/Route.html
index 418f30ebd..31e30ad81 100644
--- a/Moose Training/Documentation/Route.html	
+++ b/Moose Training/Documentation/Route.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li>Route</li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,144 +75,247 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>Route</code></h1>
    
-<p>(SP) (MP) (FSM) Route AI or players to waypoints or zones.</p>
+<p>(SP) (MP) (FSM) Route AI or players through waypoints or to zones.</p>
 
    
 
 <hr/>
 
-<h1>1) <a href="##(ROUTEZONE)">#ROUTEZONE</a> class, extends <a href="StateMachine.html##(STATEMACHINE)">StateMachine#STATEMACHINE</a></h1>
-<p>The <a href="##(ROUTEZONE)">#ROUTEZONE</a> class implements the core functions to route an AIR <a href="Controllable.html">Controllable</a> player <a href="Unit.html">Unit</a> to a <a href="Zone.html">Zone</a>.
-The player receives on perioding times messages with the coordinates of the route to follow. 
-Upon arrival at the zone, a confirmation of arrival is sent, and the process will be ended.</p>
+<h1><a href="##(ACT_ROUTE)">#ACT_ROUTE</a> FSM class, extends <a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a></h1>
 
-<h2>1.1) ROUTEZONE constructor:</h2>
+<h2>ACT_ROUTE state machine:</h2>
+
+<p>This class is a state machine: it manages a process that is triggered by events causing state transitions to occur.
+All derived classes from this class will start with the class name, followed by a _. See the relevant derived class descriptions below.
+Each derived class follows exactly the same process, using the same events and following the same state transitions, 
+but will have <strong>different implementation behaviour</strong> upon each event or state transition.</p>
+
+<h3>ACT_ROUTE <strong>Events</strong>:</h3>
+
+<p>These are the events defined in this class:</p>
 
 <ul>
-    <li><a href="##(ROUTEZONE).New">ROUTEZONE.New</a>(): Creates a new ROUTEZONE object.</li>
+    <li><strong>Start</strong>:  The process is started. The process will go into the Report state.</li>
+    <li><strong>Report</strong>: The process is reporting to the player the route to be followed.</li>
+    <li><strong>Route</strong>: The process is routing the controllable.</li>
+    <li><strong>Pause</strong>: The process is pausing the route of the controllable.</li>
+    <li><strong>Arrive</strong>: The controllable has arrived at a route point.</li>
+    <li><strong>More</strong>:  There are more route points that need to be followed. The process will go back into the Report state.</li>
+    <li><strong>NoMore</strong>:  There are no more route points that need to be followed. The process will go into the Success state.</li>
 </ul>
 
-<h2>1.2) ROUTEZONE state machine:</h2>
-<p>The ROUTEZONE is a state machine: it manages the different events and states of the Controllable it is controlling.</p>
+<h3>ACT_ROUTE <strong>Event methods</strong>:</h3>
 
-<h3>1.2.1) ROUTEZONE Events:</h3>
+<p>Event methods are available (dynamically allocated by the state machine), that accomodate for state transitions occurring in the process.
+There are two types of event methods, which you can use to influence the normal mechanisms in the state machine:</p>
 
 <ul>
-    <li><a href="##(ROUTEZONE).Start">ROUTEZONE.Start</a>( Controllable ):  Start the route to the zone. Messages will appear within defined intervals.</li>
+    <li><strong>Immediate</strong>: The event method has exactly the name of the event.</li>
+    <li><strong>Delayed</strong>: The event method starts with a __ + the name of the event. The first parameter of the event method is a number value, expressing the delay in seconds when the event will be executed. </li>
 </ul>
 
-<h3>1.2.2) ROUTEZONE States:</h3>
+<h3>ACT_ROUTE <strong>States</strong>:</h3>
 
 <ul>
-    <li><strong>UnArrived</strong>: The player is still underway to the zone.</li>
-    <li><strong>Arrived</strong>: The Controllable has arrived at the zone.</li>
+    <li><strong>None</strong>: The controllable did not receive route commands.</li>
+    <li><strong>Arrived (*)</strong>: The controllable has arrived at a route point.</li>
+    <li><strong>Aborted (*)</strong>: The controllable has aborted the route path.</li>
+    <li><strong>Routing</strong>: The controllable is understay to the route point.</li>
+    <li><strong>Pausing</strong>: The process is pausing the routing. AI air will go into hover, AI ground will stop moving. Players can fly around.</li>
+    <li><strong>Success (*)</strong>: All route points were reached. </li>
+    <li><strong>Failed (*)</strong>: The process has failed.</li>
 </ul>
 
-<h3>1.2.3) ROUTEZONE state transition functions:</h3>
+<p>(*) End states of the process.</p>
+
+<h3>ACT_ROUTE state transition methods:</h3>
 
 <p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
-There are 2 moments when state transition functions will be called by the state machine:</p>
+There are 2 moments when state transition methods will be called by the state machine:</p>
 
 <ul>
     <li><p><strong>Before</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnBefore + the name of the state</strong>. 
-    If the state transition function returns false, then the processing of the state transition will not be done!
+    The state transition method needs to start with the name <strong>OnBefore + the name of the state</strong>. 
+    If the state transition method returns false, then the processing of the state transition will not be done!
     If you want to change the behaviour of the AIControllable at this event, return false, 
     but then you'll need to specify your own logic using the AIControllable!</p></li>
     <li><p><strong>After</strong> the state transition. 
-    The state transition function needs to start with the name <strong>OnAfter + the name of the state</strong>. 
-    These state transition functions need to provide a return value, which is specified at the function description.</p></li>
+    The state transition method needs to start with the name <strong>OnAfter + the name of the state</strong>. 
+    These state transition methods need to provide a return value, which is specified at the function description.</p></li>
 </ul>
 
-<h2>1.3) Manage the ROUTEZONE parameters:</h2>
-<p>The following methods are available to modify the parameters of a ROUTEZONE object:</p>
+<hr/>
 
+<h1>1) <a href="##(ACT_ROUTE_ZONE)">#ACT<em>ROUTE</em>ZONE</a> class, extends <a href="Fsm.Route.html##(ACT_ROUTE)">Fsm.Route#ACT_ROUTE</a></h1>
 
+<p>The ACT<em>ROUTE</em>ZONE class implements the core functions to route an AIR <a href="Controllable.html">Controllable</a> player <a href="Unit.html">Unit</a> to a <a href="Zone.html">Zone</a>.
+The player receives on perioding times messages with the coordinates of the route to follow. 
+Upon arrival at the zone, a confirmation of arrival is sent, and the process will be ended.</p>
+
+<h1>1.1) ACT<em>ROUTE</em>ZONE constructor:</h1>
+
+<ul>
+    <li><a href="##(ACT_ROUTE_ZONE).New">ACT<em>ROUTE</em>ZONE.New</a>(): Creates a new ACT<em>ROUTE</em>ZONE object.</li>
+</ul>
+
+<hr/>
 
 
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#ROUTEZONE">ROUTEZONE</a></td>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ROUTE">ACT_ROUTE</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ROUTE_ZONE">ACT_ROUTE_ZONE</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 	</table>
-			<h2><a id="#(ROUTEZONE)">Type <code>ROUTEZONE</code></a></h2>
+			<h2><a id="#(ACT_ROUTE)">Type <code>ACT_ROUTE</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).ClassName">ROUTEZONE.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).ClassName">ACT_ROUTE.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).DisplayCategory">ROUTEZONE.DisplayCategory</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).DisplayCount">ACT_ROUTE.DisplayCount</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).DisplayCount">ROUTEZONE.DisplayCount</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).DisplayInterval">ROUTEZONE.DisplayInterval</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).DisplayMessage">ROUTEZONE.DisplayMessage</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).DisplayTime">ROUTEZONE.DisplayTime</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).New">ROUTEZONE:New(Task, Unit, ProcessUnit, TargetZone)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).New">ACT_ROUTE:New()</a></td>
 		<td class="summary">
 <p>Creates a new routing state machine.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).ProcessUnit">ROUTEZONE.ProcessUnit</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).ProcessUnit">ACT_ROUTE.ProcessUnit</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).TASK">ROUTEZONE.TASK</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).TASK">ACT_ROUTE.TASK</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).TargetZone">ROUTEZONE.TargetZone</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).TargetZone">ACT_ROUTE.TargetZone</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(ROUTEZONE).onleaveUnArrived">ROUTEZONE:onleaveUnArrived(ProcessUnit, Event, From, To)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).onafterStart">ACT_ROUTE:onafterStart(ProcessUnit, Event, From, To)</a></td>
 		<td class="summary">
 <p>StateMachine callback function</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).onbeforeRoute">ACT_ROUTE:onbeforeRoute(ProcessUnit, Event, From, To)</a></td>
+		<td class="summary">
+<p>StateMachine callback function</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE).onfuncHasArrived">ACT_ROUTE:onfuncHasArrived(ProcessUnit)</a></td>
+		<td class="summary">
+<p>Check if the controllable has arrived.</p>
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(ACT_ROUTE_ZONE)">Type <code>ACT_ROUTE_ZONE</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).ClassName">ACT_ROUTE_ZONE.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).DisplayCount">ACT_ROUTE_ZONE.DisplayCount</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).DisplayInterval">ACT_ROUTE_ZONE.DisplayInterval</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).DisplayMessage">ACT_ROUTE_ZONE.DisplayMessage</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).DisplayTime">ACT_ROUTE_ZONE.DisplayTime</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).Init">ACT_ROUTE_ZONE:Init(FsmRoute)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).New">ACT_ROUTE_ZONE:New(TargetZone)</a></td>
+		<td class="summary">
+<p>Creates a new routing state machine.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).ProcessUnit">ACT_ROUTE_ZONE.ProcessUnit</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).TASK">ACT_ROUTE_ZONE.TASK</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).TargetZone">ACT_ROUTE_ZONE.TargetZone</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).onenterReporting">ACT_ROUTE_ZONE:onenterReporting(ProcessUnit, Event, From, To)</a></td>
+		<td class="summary">
+<p>StateMachine callback function</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ROUTE_ZONE).onfuncHasArrived">ACT_ROUTE_ZONE:onfuncHasArrived(ProcessUnit)</a></td>
+		<td class="summary">
+<p>Method override to check if the controllable has arrived.</p>
 </td>
 		</tr>
 	</table>
@@ -221,9 +324,23 @@ There are 2 moments when state transition functions will be called by the state
 		<dl class="function">
 <dt>
 
-		<em><a href="##(ROUTEZONE)">#ROUTEZONE</a></em>
-<a id="ROUTEZONE" >
-<strong>ROUTEZONE</strong>
+		<em><a href="##(ACT_ROUTE)">#ACT_ROUTE</a></em>
+<a id="ACT_ROUTE" >
+<strong>ACT_ROUTE</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(ACT_ROUTE_ZONE)">#ACT_ROUTE_ZONE</a></em>
+<a id="ACT_ROUTE_ZONE" >
+<strong>ACT_ROUTE_ZONE</strong>
 </a>
 </dt>
 <dd>
@@ -234,48 +351,17 @@ There are 2 moments when state transition functions will be called by the state
 </dl>
 	<h2><a id="#(Route)" >Type <code>Route</code></a></h2>
 	
-			<h2><a id="#(ROUTEZONE)" >Type <code>ROUTEZONE</code></a></h2>
+			<h2><a id="#(ACT_ROUTE)" >Type <code>ACT_ROUTE</code></a></h2>
 				
-<p>ROUTEZONE class</p>
+<p>ACT_ROUTE class</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(ROUTEZONE).ClassName" >
-<strong>ROUTEZONE.ClassName</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em>#string</em>
-<a id="#(ROUTEZONE).DisplayCategory" >
-<strong>ROUTEZONE.DisplayCategory</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-	
-<p> Route is the default display category</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em>#number</em>
-<a id="#(ROUTEZONE).DisplayCount" >
-<strong>ROUTEZONE.DisplayCount</strong>
+<a id="#(ACT_ROUTE).ClassName" >
+<strong>ACT_ROUTE.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -288,8 +374,8 @@ There are 2 moments when state transition functions will be called by the state
 <dt>
 
 		<em>#number</em>
-<a id="#(ROUTEZONE).DisplayInterval" >
-<strong>ROUTEZONE.DisplayInterval</strong>
+<a id="#(ACT_ROUTE).DisplayCount" >
+<strong>ACT_ROUTE.DisplayCount</strong>
 </a>
 </dt>
 <dd>
@@ -301,39 +387,8 @@ There are 2 moments when state transition functions will be called by the state
 		<dl class="function">
 <dt>
 
-		<em>#boolean</em>
-<a id="#(ROUTEZONE).DisplayMessage" >
-<strong>ROUTEZONE.DisplayMessage</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em>#number</em>
-<a id="#(ROUTEZONE).DisplayTime" >
-<strong>ROUTEZONE.DisplayTime</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-	
-<p> 10 seconds is the default</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(ROUTEZONE).New" >
-<strong>ROUTEZONE:New(Task, Unit, ProcessUnit, TargetZone)</strong>
+<a id="#(ACT_ROUTE).New" >
+<strong>ACT_ROUTE:New()</strong>
 </a>
 </dt>
 <dd>
@@ -341,34 +396,11 @@ There are 2 moments when state transition functions will be called by the state
 <p>Creates a new routing state machine.</p>
 
 	
-<p>The task will route a CLIENT to a ZONE until the CLIENT is within that ZONE.</p>
+<p>The process will route a CLIENT to a ZONE until the CLIENT is within that ZONE.</p>
 
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Task.html##(TASK)">Task#TASK</a> Task </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> Unit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em> ProcessUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em> TargetZone </em></code>: </p>
-
-				</li>
-		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(ROUTEZONE)">#ROUTEZONE</a>:</em>
+<p><em><a href="##(ACT_ROUTE)">#ACT_ROUTE</a>:</em>
 self</p>
 
 </dd>
@@ -376,9 +408,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
-<a id="#(ROUTEZONE).ProcessUnit" >
-<strong>ROUTEZONE.ProcessUnit</strong>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
+<a id="#(ACT_ROUTE).ProcessUnit" >
+<strong>ACT_ROUTE.ProcessUnit</strong>
 </a>
 </dt>
 <dd>
@@ -390,9 +422,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Task.html##(TASK)">Task#TASK</a></em>
-<a id="#(ROUTEZONE).TASK" >
-<strong>ROUTEZONE.TASK</strong>
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(ACT_ROUTE).TASK" >
+<strong>ACT_ROUTE.TASK</strong>
 </a>
 </dt>
 <dd>
@@ -404,9 +436,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></em>
-<a id="#(ROUTEZONE).TargetZone" >
-<strong>ROUTEZONE.TargetZone</strong>
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(ACT_ROUTE).TargetZone" >
+<strong>ACT_ROUTE.TargetZone</strong>
 </a>
 </dt>
 <dd>
@@ -418,8 +450,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(ROUTEZONE).onleaveUnArrived" >
-<strong>ROUTEZONE:onleaveUnArrived(ProcessUnit, Event, From, To)</strong>
+<a id="#(ACT_ROUTE).onafterStart" >
+<strong>ACT_ROUTE:onafterStart(ProcessUnit, Event, From, To)</strong>
 </a>
 </dt>
 <dd>
@@ -430,7 +462,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -449,6 +481,296 @@ self</p>
 
 				</li>
 		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ROUTE).onbeforeRoute" >
+<strong>ACT_ROUTE:onbeforeRoute(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ROUTE).onfuncHasArrived" >
+<strong>ACT_ROUTE:onfuncHasArrived(ProcessUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Check if the controllable has arrived.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em></p>
+
+
+</dd>
+</dl>
+
+			<h2><a id="#(ACT_ROUTE_ZONE)" >Type <code>ACT_ROUTE_ZONE</code></a></h2>
+				
+<p>ACT<em>ROUTE</em>ZONE class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(ACT_ROUTE_ZONE).ClassName" >
+<strong>ACT_ROUTE_ZONE.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#number</em>
+<a id="#(ACT_ROUTE_ZONE).DisplayCount" >
+<strong>ACT_ROUTE_ZONE.DisplayCount</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#number</em>
+<a id="#(ACT_ROUTE_ZONE).DisplayInterval" >
+<strong>ACT_ROUTE_ZONE.DisplayInterval</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#boolean</em>
+<a id="#(ACT_ROUTE_ZONE).DisplayMessage" >
+<strong>ACT_ROUTE_ZONE.DisplayMessage</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#number</em>
+<a id="#(ACT_ROUTE_ZONE).DisplayTime" >
+<strong>ACT_ROUTE_ZONE.DisplayTime</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+	
+<p> 10 seconds is the default</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ROUTE_ZONE).Init" >
+<strong>ACT_ROUTE_ZONE:Init(FsmRoute)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> FsmRoute </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ROUTE_ZONE).New" >
+<strong>ACT_ROUTE_ZONE:New(TargetZone)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new routing state machine.</p>
+
+	
+<p>The task will route a controllable to a ZONE until the controllable is within that ZONE.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
+<a id="#(ACT_ROUTE_ZONE).ProcessUnit" >
+<strong>ACT_ROUTE_ZONE.ProcessUnit</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></em>
+<a id="#(ACT_ROUTE_ZONE).TASK" >
+<strong>ACT_ROUTE_ZONE.TASK</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(ACT_ROUTE_ZONE).TargetZone" >
+<strong>ACT_ROUTE_ZONE.TargetZone</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ROUTE_ZONE).onenterReporting" >
+<strong>ACT_ROUTE_ZONE:onenterReporting(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ROUTE_ZONE).onfuncHasArrived" >
+<strong>ACT_ROUTE_ZONE:onfuncHasArrived(ProcessUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Method override to check if the controllable has arrived.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em></p>
+
+
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/ScheduleDispatcher.html b/Moose Training/Documentation/ScheduleDispatcher.html
new file mode 100644
index 000000000..4bf4c0e56
--- /dev/null
+++ b/Moose Training/Documentation/ScheduleDispatcher.html	
@@ -0,0 +1,449 @@
+<!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="AI_Balancer.html">AI_Balancer</a></li>
+					<li><a href="Account.html">Account</a></li>
+					<li><a href="Airbase.html">Airbase</a></li>
+					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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="CommandCenter.html">CommandCenter</a></li>
+					<li><a href="Controllable.html">Controllable</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="DCScountry.html">DCScountry</a></li>
+					<li><a href="DCStimer.html">DCStimer</a></li>
+					<li><a href="DCStrigger.html">DCStrigger</a></li>
+					<li><a href="Database.html">Database</a></li>
+					<li><a href="Detection.html">Detection</a></li>
+					<li><a href="Escort.html">Escort</a></li>
+					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
+					<li><a href="Group.html">Group</a></li>
+					<li><a href="Identifiable.html">Identifiable</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="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
+					<li><a href="Point.html">Point</a></li>
+					<li><a href="Positionable.html">Positionable</a></li>
+					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
+					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li>ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
+					<li><a href="Spawn.html">Spawn</a></li>
+					<li><a href="Static.html">Static</a></li>
+					<li><a href="StaticObject.html">StaticObject</a></li>
+					<li><a href="Task.html">Task</a></li>
+					<li><a href="Task_A2G.html">Task_A2G</a></li>
+					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
+					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
+					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>ScheduleDispatcher</code></h1>
+   
+<p>This module defines the SCHEDULEDISPATCHER class, which is used by a central object called _SCHEDULEDISPATCHER.</p>
+
+   
+
+<hr/>
+
+<p>Takes care of the creation and dispatching of scheduled functions for SCHEDULER objects.</p>
+
+<p>This class is tricky and needs some thorought explanation.
+SCHEDULE classes are used to schedule functions for objects, or as persistent objects.
+The SCHEDULEDISPATCHER class ensures that:</p>
+
+<ul>
+    <li>Scheduled functions are planned according the SCHEDULER object parameters.</li>
+    <li>Scheduled functions are repeated when requested, according the SCHEDULER object parameters.</li>
+    <li>Scheduled functions are automatically removed when the schedule is finished, according the SCHEDULER object parameters.</li>
+</ul>
+
+<p>The SCHEDULEDISPATCHER class will manage SCHEDULER object in memory during garbage collection:
+  - When a SCHEDULER object is not attached to another object (that is, it's first :Schedule() parameter is nil), then the SCHEDULER  </p>
+<pre><code>object is _persistent_ within memory.
+</code></pre>
+<p>  - When a SCHEDULER object <em>is</em> attached to another object, then the SCHEDULER object is <em>not persistent</em> within memory after a garbage collection!
+The none persistency of SCHEDULERS attached to objects is required to allow SCHEDULER objects to be garbage collectged, when the parent object is also desroyed or nillified and garbage collected.
+Even when there are pending timer scheduled functions to be executed for the SCHEDULER object, <br/>
+these will not be executed anymore when the SCHEDULER object has been destroyed.</p>
+
+<p>The SCHEDULEDISPATCHER allows multiple scheduled functions to be planned and executed for one SCHEDULER object.
+The SCHEDULER object therefore keeps a table of "CallID's", which are returned after each planning of a new scheduled function by the SCHEDULEDISPATCHER.
+The SCHEDULER object plans new scheduled functions through the <a href="Core.Scheduler.html##(SCHEDULER).Schedule">Core.Scheduler#SCHEDULER.Schedule</a>() method. 
+The Schedule() method returns the CallID that is the reference ID for each planned schedule.</p>
+
+<hr/>
+
+<hr/>
+
+<h3>Contributions: -</h3>
+<h3>Authors: FlightControl : Design &amp; Programming</h3>
+
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#SCHEDULEDISPATCHER">SCHEDULEDISPATCHER</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(SCHEDULEDISPATCHER)">Type <code>SCHEDULEDISPATCHER</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).AddSchedule">SCHEDULEDISPATCHER:AddSchedule(Scheduler, ScheduleFunction, ScheduleArguments, Start, Repeat, Randomize, Stop)</a></td>
+		<td class="summary">
+<p>Add a Schedule to the ScheduleDispatcher.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).CallID">SCHEDULEDISPATCHER.CallID</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).ClassName">SCHEDULEDISPATCHER.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).New">SCHEDULEDISPATCHER:New()</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).ObjectSchedulers">SCHEDULEDISPATCHER.ObjectSchedulers</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).PersistentSchedulers">SCHEDULEDISPATCHER.PersistentSchedulers</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).RemoveSchedule">SCHEDULEDISPATCHER:RemoveSchedule(Scheduler, CallID)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).Schedule">SCHEDULEDISPATCHER.Schedule</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).Start">SCHEDULEDISPATCHER:Start(Scheduler, CallID)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULEDISPATCHER).Stop">SCHEDULEDISPATCHER:Stop(Scheduler, CallID)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(SCHEDULEDISPATCHER)">#SCHEDULEDISPATCHER</a></em>
+<a id="SCHEDULEDISPATCHER" >
+<strong>SCHEDULEDISPATCHER</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(ScheduleDispatcher)" >Type <code>ScheduleDispatcher</code></a></h2>
+	
+			<h2><a id="#(SCHEDULEDISPATCHER)" >Type <code>SCHEDULEDISPATCHER</code></a></h2>
+				
+<p>The SCHEDULEDISPATCHER structure</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).AddSchedule" >
+<strong>SCHEDULEDISPATCHER:AddSchedule(Scheduler, ScheduleFunction, ScheduleArguments, Start, Repeat, Randomize, Stop)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add a Schedule to the ScheduleDispatcher.</p>
+
+	
+<p>The development of this method was really tidy.
+It is constructed as such that a garbage collection is executed on the weak tables, when the Scheduler is nillified.
+Nothing of this code should be modified without testing it thoroughly.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Core.Scheduler.html##(SCHEDULER)">Core.Scheduler#SCHEDULER</a> Scheduler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> ScheduleFunction </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> ScheduleArguments </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Start </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Repeat </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Randomize </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Stop </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).CallID" >
+<strong>SCHEDULEDISPATCHER.CallID</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(SCHEDULEDISPATCHER).ClassName" >
+<strong>SCHEDULEDISPATCHER.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).New" >
+<strong>SCHEDULEDISPATCHER:New()</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).ObjectSchedulers" >
+<strong>SCHEDULEDISPATCHER.ObjectSchedulers</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+	
+<p> Initialize the ObjectSchedulers array, which is a weakly coupled table.
+ If the object used as the key is nil, then the garbage collector will remove the item from the Functions array.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).PersistentSchedulers" >
+<strong>SCHEDULEDISPATCHER.PersistentSchedulers</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+	
+<p> Initialize the ObjectSchedulers array, which is a weakly coupled table.
+ If the object used as the key is nil, then the garbage collector will remove the item from the Functions array.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).RemoveSchedule" >
+<strong>SCHEDULEDISPATCHER:RemoveSchedule(Scheduler, CallID)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Scheduler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> CallID </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).Schedule" >
+<strong>SCHEDULEDISPATCHER.Schedule</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).Start" >
+<strong>SCHEDULEDISPATCHER:Start(Scheduler, CallID)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Scheduler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> CallID </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(SCHEDULEDISPATCHER).Stop" >
+<strong>SCHEDULEDISPATCHER:Stop(Scheduler, CallID)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Scheduler </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> CallID </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Scheduler.html b/Moose Training/Documentation/Scheduler.html
index 6ea2906a8..79b753d32 100644
--- a/Moose Training/Documentation/Scheduler.html	
+++ b/Moose Training/Documentation/Scheduler.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</a></li>
 					<li>Scheduler</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,33 +89,40 @@
 
    
 
-<h1>1) <a href="Scheduler.html##(SCHEDULER)">Scheduler#SCHEDULER</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<p>The <a href="Scheduler.html##(SCHEDULER)">Scheduler#SCHEDULER</a> class models time events calling given event handling functions.</p>
+<h1>1) <a href="Core.Scheduler.html##(SCHEDULER)">Core.Scheduler#SCHEDULER</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+
+<p>The <a href="Core.Scheduler.html##(SCHEDULER)">Core.Scheduler#SCHEDULER</a> class creates schedule.</p>
 
 <h2>1.1) SCHEDULER constructor</h2>
-<p>The SCHEDULER class is quite easy to use:</p>
+
+<p>The SCHEDULER class is quite easy to use, but note that the New constructor has variable parameters:</p>
 
 <ul>
-    <li><a href="Scheduler.html##(SCHEDULER).New">Scheduler#SCHEDULER.New</a>: Setup a new scheduler and start it with the specified parameters.</li>
+    <li><a href="Core.Scheduler.html##(SCHEDULER).New">Core.Scheduler#SCHEDULER.New</a>( nil ): Setup a new SCHEDULER object, which is persistently executed after garbage collection.</li>
+    <li><a href="Core.Scheduler.html##(SCHEDULER).New">Core.Scheduler#SCHEDULER.New</a>( Object ): Setup a new SCHEDULER object, which is linked to the Object. When the Object is nillified or destroyed, the SCHEDULER object will also be destroyed and stopped after garbage collection.</li>
+    <li><a href="Core.Scheduler.html##(SCHEDULER).New">Core.Scheduler#SCHEDULER.New</a>( nil, Function, FunctionArguments, Start, ... ): Setup a new persistent SCHEDULER object, and start a new schedule for the Function with the defined FunctionArguments according the Start and sequent parameters.</li>
+    <li><a href="Core.Scheduler.html##(SCHEDULER).New">Core.Scheduler#SCHEDULER.New</a>( Object, Function, FunctionArguments, Start, ... ): Setup a new SCHEDULER object, linked to Object, and start a new schedule for the Function with the defined FunctionArguments according the Start and sequent parameters.</li>
 </ul>
 
-<h2>1.2) SCHEDULER timer stop and start</h2>
+<h2>1.2) SCHEDULER timer stopping and (re-)starting.</h2>
+
 <p>The SCHEDULER can be stopped and restarted with the following methods:</p>
 
 <ul>
-    <li><a href="Scheduler.html##(SCHEDULER).Start">Scheduler#SCHEDULER.Start</a>: (Re-)Start the scheduler.</li>
-    <li><a href="Scheduler.html##(SCHEDULER).Stop">Scheduler#SCHEDULER.Stop</a>: Stop the scheduler.</li>
+    <li><a href="Core.Scheduler.html##(SCHEDULER).Start">Core.Scheduler#SCHEDULER.Start</a>(): (Re-)Start the schedules within the SCHEDULER object. If a CallID is provided to :Start(), only the schedule referenced by CallID will be (re-)started.</li>
+    <li><a href="Core.Scheduler.html##(SCHEDULER).Stop">Core.Scheduler#SCHEDULER.Stop</a>(): Stop the schedules within the SCHEDULER object. If a CallID is provided to :Stop(), then only the schedule referenced by CallID will be stopped.</li>
 </ul>
 
-<h2>1.3) Reschedule new time event</h2>
-<p>With <a href="Scheduler.html##(SCHEDULER).Schedule">Scheduler#SCHEDULER.Schedule</a> a new time event can be scheduled.</p>
+<h2>1.3) Create a new schedule</h2>
+
+<p>With <a href="Core.Scheduler.html##(SCHEDULER).Schedule">Core.Scheduler#SCHEDULER.Schedule</a>() a new time event can be scheduled. This function is used by the :New() constructor when a new schedule is planned.</p>
 
 <hr/>
 
 <h3>Contributions:</h3>
 
 <ul>
-    <li>Mechanist : Concept &amp; Testing</li>
+    <li>FlightControl : Concept &amp; Testing</li>
 </ul>
 
 <h3>Authors:</h3>
@@ -122,6 +131,12 @@
     <li>FlightControl : Design &amp; Programming</li>
 </ul>
 
+<h3>Test Missions:</h3>
+
+<ul>
+    <li>SCH - Scheduler</li>
+</ul>
+
 <hr/>
 
 
@@ -143,31 +158,19 @@
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).New">SCHEDULER:New(TimeEventObject, TimeEventFunction, TimeEventFunctionArguments, StartSeconds, RepeatSecondsInterval, RandomizationFactor, StopSeconds)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).New">SCHEDULER:New(SchedulerObject, SchedulerFunction, SchedulerArguments, Start, Repeat, RandomizeFactor, Stop)</a></td>
 		<td class="summary">
 <p>SCHEDULER constructor.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).RandomizationFactor">SCHEDULER.RandomizationFactor</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Remove">SCHEDULER:Remove(ScheduleID)</a></td>
 		<td class="summary">
-
+<p>Removes a specific schedule if a valid ScheduleID is provided.</p>
 </td>
 		</tr>
 		<tr>
-		<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).RepeatSecondsInterval">SCHEDULER.RepeatSecondsInterval</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Schedule">SCHEDULER:Schedule(TimeEventObject, TimeEventFunction, TimeEventFunctionArguments, StartSeconds, RepeatSecondsInterval, RandomizationFactor, StopSeconds)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Schedule">SCHEDULER:Schedule(SchedulerObject, SchedulerFunction, SchedulerArguments, Start, Repeat, RandomizeFactor, Stop)</a></td>
 		<td class="summary">
 <p>Schedule a new time event.</p>
 </td>
@@ -179,57 +182,27 @@
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Start">SCHEDULER:Start()</a></td>
-		<td class="summary">
-<p>(Re-)Starts the scheduler.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).StartSeconds">SCHEDULER.StartSeconds</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).SchedulerObject">SCHEDULER.SchedulerObject</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).StartTime">SCHEDULER.StartTime</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Schedules">SCHEDULER.Schedules</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Stop">SCHEDULER:Stop()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Start">SCHEDULER:Start(ScheduleID)</a></td>
 		<td class="summary">
-<p>Stops the scheduler.</p>
+<p>(Re-)Starts the schedules or a specific schedule if a valid ScheduleID is provided.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).StopSeconds">SCHEDULER.StopSeconds</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).Stop">SCHEDULER:Stop(ScheduleID)</a></td>
 		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).TimeEventFunction">SCHEDULER.TimeEventFunction</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).TimeEventFunctionArguments">SCHEDULER.TimeEventFunctionArguments</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER).TimeEventObject">SCHEDULER.TimeEventObject</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(SCHEDULER)._Scheduler">SCHEDULER:_Scheduler()</a></td>
-		<td class="summary">
-
+<p>Stops the schedules or a specific schedule if a valid ScheduleID is provided.</p>
 </td>
 		</tr>
 	</table>
@@ -274,7 +247,7 @@
 <dt>
 
 <a id="#(SCHEDULER).New" >
-<strong>SCHEDULER:New(TimeEventObject, TimeEventFunction, TimeEventFunctionArguments, StartSeconds, RepeatSecondsInterval, RandomizationFactor, StopSeconds)</strong>
+<strong>SCHEDULER:New(SchedulerObject, SchedulerFunction, SchedulerArguments, Start, Repeat, RandomizeFactor, Stop)</strong>
 </a>
 </dt>
 <dd>
@@ -285,99 +258,91 @@
 		<ul>
 				<li>
 				
-<p><code><em>#table TimeEventObject </em></code>: 
+<p><code><em>#table SchedulerObject </em></code>: 
 Specified for which Moose object the timer is setup. If a value of nil is provided, a scheduler will be setup without an object reference.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#function TimeEventFunction </em></code>: 
-The event function to be called when a timer event occurs. The event function needs to accept the parameters specified in TimeEventFunctionArguments.</p>
+<p><code><em>#function SchedulerFunction </em></code>: 
+The event function to be called when a timer event occurs. The event function needs to accept the parameters specified in SchedulerArguments.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#table TimeEventFunctionArguments </em></code>: 
+<p><code><em>#table SchedulerArguments </em></code>: 
 Optional arguments that can be given as part of scheduler. The arguments need to be given as a table { param1, param 2, ... }.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number StartSeconds </em></code>: 
+<p><code><em>#number Start </em></code>: 
 Specifies the amount of seconds that will be waited before the scheduling is started, and the event function is called.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number RepeatSecondsInterval </em></code>: 
+<p><code><em>#number Repeat </em></code>: 
 Specifies the interval in seconds when the scheduler will call the event function.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number RandomizationFactor </em></code>: 
-Specifies a randomization factor between 0 and 1 to randomize the RepeatSecondsInterval.</p>
+<p><code><em>#number RandomizeFactor </em></code>: 
+Specifies a randomization factor between 0 and 1 to randomize the Repeat.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number StopSeconds </em></code>: 
+<p><code><em>#number Stop </em></code>: 
 Specifies the amount of seconds when the scheduler will be stopped.</p>
 
 				</li>
 		</ul>
-		<h3>Return value</h3>
+		<h3>Return values</h3>
+			<ol>
+				<li>
 				
 <p><em><a href="##(SCHEDULER)">#SCHEDULER</a>:</em>
 self</p>
 
+				</li>
+				<li>
+				
+<p><em>#number:</em>
+The ScheduleID of the planned schedule.</p>
+
+				</li>
+			</ol>
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(SCHEDULER).RandomizationFactor" >
-<strong>SCHEDULER.RandomizationFactor</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em>#boolean</em>
-<a id="#(SCHEDULER).Repeat" >
-<strong>SCHEDULER.Repeat</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SCHEDULER).RepeatSecondsInterval" >
-<strong>SCHEDULER.RepeatSecondsInterval</strong>
+<a id="#(SCHEDULER).Remove" >
+<strong>SCHEDULER:Remove(ScheduleID)</strong>
 </a>
 </dt>
 <dd>
 	
+<p>Removes a specific schedule if a valid ScheduleID is provided.</p>
 
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#number ScheduleID </em></code>: 
+(optional) The ScheduleID of the planned (repeating) schedule.</p>
 
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 <a id="#(SCHEDULER).Schedule" >
-<strong>SCHEDULER:Schedule(TimeEventObject, TimeEventFunction, TimeEventFunctionArguments, StartSeconds, RepeatSecondsInterval, RandomizationFactor, StopSeconds)</strong>
+<strong>SCHEDULER:Schedule(SchedulerObject, SchedulerFunction, SchedulerArguments, Start, Repeat, RandomizeFactor, Stop)</strong>
 </a>
 </dt>
 <dd>
@@ -391,51 +356,51 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em>#table TimeEventObject </em></code>: 
+<p><code><em>#table SchedulerObject </em></code>: 
 Specified for which Moose object the timer is setup. If a value of nil is provided, a scheduler will be setup without an object reference.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#function TimeEventFunction </em></code>: 
-The event function to be called when a timer event occurs. The event function needs to accept the parameters specified in TimeEventFunctionArguments.</p>
+<p><code><em>#function SchedulerFunction </em></code>: 
+The event function to be called when a timer event occurs. The event function needs to accept the parameters specified in SchedulerArguments.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#table TimeEventFunctionArguments </em></code>: 
+<p><code><em>#table SchedulerArguments </em></code>: 
 Optional arguments that can be given as part of scheduler. The arguments need to be given as a table { param1, param 2, ... }.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number StartSeconds </em></code>: 
+<p><code><em>#number Start </em></code>: 
 Specifies the amount of seconds that will be waited before the scheduling is started, and the event function is called.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number RepeatSecondsInterval </em></code>: 
+<p><code><em>#number Repeat </em></code>: 
 Specifies the interval in seconds when the scheduler will call the event function.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number RandomizationFactor </em></code>: 
-Specifies a randomization factor between 0 and 1 to randomize the RepeatSecondsInterval.</p>
+<p><code><em>#number RandomizeFactor </em></code>: 
+Specifies a randomization factor between 0 and 1 to randomize the Repeat.</p>
 
 				</li>
 				<li>
 				
-<p><code><em>#number StopSeconds </em></code>: 
+<p><code><em>#number Stop </em></code>: 
 Specifies the amount of seconds when the scheduler will be stopped.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(SCHEDULER)">#SCHEDULER</a>:</em>
-self</p>
+<p><em>#number:</em>
+The ScheduleID of the planned schedule.</p>
 
 </dd>
 </dl>
@@ -451,139 +416,78 @@ self</p>
 	
 <p>the ID of the scheduler.</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(SCHEDULER).SchedulerObject" >
+<strong>SCHEDULER.SchedulerObject</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(SCHEDULER).Schedules" >
+<strong>SCHEDULER.Schedules</strong>
+</a>
+</dt>
+<dd>
+	
+
+
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 <a id="#(SCHEDULER).Start" >
-<strong>SCHEDULER:Start()</strong>
+<strong>SCHEDULER:Start(ScheduleID)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>(Re-)Starts the scheduler.</p>
+<p>(Re-)Starts the schedules or a specific schedule if a valid ScheduleID is provided.</p>
 
-		<h3>Return value</h3>
+		<h3>Parameter</h3>
+		<ul>
+				<li>
 				
-<p><em><a href="##(SCHEDULER)">#SCHEDULER</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SCHEDULER).StartSeconds" >
-<strong>SCHEDULER.StartSeconds</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SCHEDULER).StartTime" >
-<strong>SCHEDULER.StartTime</strong>
-</a>
-</dt>
-<dd>
-	
-
+<p><code><em>#number ScheduleID </em></code>: 
+(optional) The ScheduleID of the planned (repeating) schedule.</p>
 
+				</li>
+		</ul>
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 <a id="#(SCHEDULER).Stop" >
-<strong>SCHEDULER:Stop()</strong>
+<strong>SCHEDULER:Stop(ScheduleID)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Stops the scheduler.</p>
+<p>Stops the schedules or a specific schedule if a valid ScheduleID is provided.</p>
 
-		<h3>Return value</h3>
+		<h3>Parameter</h3>
+		<ul>
+				<li>
 				
-<p><em><a href="##(SCHEDULER)">#SCHEDULER</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SCHEDULER).StopSeconds" >
-<strong>SCHEDULER.StopSeconds</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SCHEDULER).TimeEventFunction" >
-<strong>SCHEDULER.TimeEventFunction</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SCHEDULER).TimeEventFunctionArguments" >
-<strong>SCHEDULER.TimeEventFunctionArguments</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(SCHEDULER).TimeEventObject" >
-<strong>SCHEDULER.TimeEventObject</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(SCHEDULER)._Scheduler" >
-<strong>SCHEDULER:_Scheduler()</strong>
-</a>
-</dt>
-<dd>
-	
-
+<p><code><em>#number ScheduleID </em></code>: 
+(optional) The ScheduleID of the planned (repeating) schedule.</p>
 
+				</li>
+		</ul>
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/Scoring.html b/Moose Training/Documentation/Scoring.html
index f96f573a5..5cdd4d7a0 100644
--- a/Moose Training/Documentation/Scoring.html	
+++ b/Moose Training/Documentation/Scoring.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</a></li>
 					<li><a href="Scheduler.html">Scheduler</a></li>
 					<li>Scoring</li>
 					<li><a href="Sead.html">Sead</a></li>
 					<li><a href="Set.html">Set</a></li>
+					<li><a href="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -680,12 +682,12 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> Mission </em></code>: </p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> PlayerUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -716,12 +718,12 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> Mission </em></code>: </p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> PlayerUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -773,7 +775,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -794,7 +796,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
diff --git a/Moose Training/Documentation/Sead.html b/Moose Training/Documentation/Sead.html
index 8e6110ea4..663297118 100644
--- a/Moose Training/Documentation/Sead.html	
+++ b/Moose Training/Documentation/Sead.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</a></li>
 					<li><a href="Scheduler.html">Scheduler</a></li>
 					<li><a href="Scoring.html">Scoring</a></li>
 					<li>Sead</li>
 					<li><a href="Set.html">Set</a></li>
+					<li><a href="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/Set.html b/Moose Training/Documentation/Set.html
index a0445b1c8..770681900 100644
--- a/Moose Training/Documentation/Set.html	
+++ b/Moose Training/Documentation/Set.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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>Set</li>
+					<li><a href="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -89,24 +91,24 @@
 
 <hr/>
 
-<h1>1) <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<p>The <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> class defines the core functions that define a collection of objects.
+<h1>1) <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+<p>The <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> class defines the core functions that define a collection of objects.
 A SET provides iterators to iterate the SET, but will <strong>temporarily</strong> yield the ForEach interator loop at defined <strong>"intervals"</strong> to the mail simulator loop.
 In this way, large loops can be done while not blocking the simulator main processing loop.
 The default <strong>"yield interval"</strong> is after 10 objects processed.
 The default <strong>"time interval"</strong> is after 0.001 seconds.</p>
 
 <h2>1.1) Add or remove objects from the SET</h2>
-<p>Some key core functions are <a href="Set.html##(SET_BASE).Add">Set#SET_BASE.Add</a> and <a href="Set.html##(SET_BASE).Remove">Set#SET_BASE.Remove</a> to add or remove objects from the SET in your logic.</p>
+<p>Some key core functions are <a href="Core.Set.html##(SET_BASE).Add">Core.Set#SET_BASE.Add</a> and <a href="Core.Set.html##(SET_BASE).Remove">Core.Set#SET_BASE.Remove</a> to add or remove objects from the SET in your logic.</p>
 
 <h2>1.2) Define the SET iterator <strong>"yield interval"</strong> and the <strong>"time interval"</strong></h2>
-<p>Modify the iterator intervals with the <a href="Set.html##(SET_BASE).SetInteratorIntervals">Set#SET_BASE.SetInteratorIntervals</a> method.
+<p>Modify the iterator intervals with the <a href="Core.Set.html##(SET_BASE).SetInteratorIntervals">Core.Set#SET_BASE.SetInteratorIntervals</a> method.
 You can set the <strong>"yield interval"</strong>, and the <strong>"time interval"</strong>. (See above).</p>
 
 <hr/>
 
-<h1>2) <a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a> class, extends <a href="Set.html##(SET_BASE)">Set#SET_BASE</a></h1>
-<p>Mission designers can use the <a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a> class to build sets of groups belonging to certain:</p>
+<h1>2) <a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> class, extends <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a></h1>
+<p>Mission designers can use the <a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> class to build sets of groups belonging to certain:</p>
 
 <ul>
     <li>Coalitions</li>
@@ -123,7 +125,7 @@ You can set the <strong>"yield interval"</strong>, and the <strong>"time interva
 </ul>
 
 <h2>2.2) Add or Remove GROUP(s) from SET_GROUP: </h2>
-<p>GROUPS can be added and removed using the <a href="Set.html##(SET_GROUP).AddGroupsByName">Set#SET_GROUP.AddGroupsByName</a> and <a href="Set.html##(SET_GROUP).RemoveGroupsByName">Set#SET_GROUP.RemoveGroupsByName</a> respectively. 
+<p>GROUPS can be added and removed using the <a href="Core.Set.html##(SET_GROUP).AddGroupsByName">Core.Set#SET_GROUP.AddGroupsByName</a> and <a href="Core.Set.html##(SET_GROUP).RemoveGroupsByName">Core.Set#SET_GROUP.RemoveGroupsByName</a> respectively. 
 These methods take a single GROUP name or an array of GROUP names to be added or removed from SET_GROUP.</p>
 
 <h2>2.3) SET_GROUP filter criteria: </h2>
@@ -146,7 +148,7 @@ Filter criteria are defined by:</p>
 <p>Planned filter criteria within development are (so these are not yet available):</p>
 
 <ul>
-    <li><a href="##(SET_GROUP).FilterZones">SET_GROUP.FilterZones</a>: Builds the SET_GROUP with the groups within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
+    <li><a href="##(SET_GROUP).FilterZones">SET_GROUP.FilterZones</a>: Builds the SET_GROUP with the groups within a <a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a>.</li>
 </ul>
 
 <h2>2.4) SET_GROUP iterators:</h2>
@@ -163,8 +165,8 @@ The following iterator methods are currently available within the SET</em>GROUP:
 
 <hr/>
 
-<h1>3) <a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> class, extends <a href="Set.html##(SET_BASE)">Set#SET_BASE</a></h1>
-<p>Mission designers can use the <a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> class to build sets of units belonging to certain:</p>
+<h1>3) <a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> class, extends <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a></h1>
+<p>Mission designers can use the <a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a> class to build sets of units belonging to certain:</p>
 
 <ul>
     <li>Coalitions</li>
@@ -182,7 +184,7 @@ The following iterator methods are currently available within the SET</em>GROUP:
 </ul>
 
 <h2>3.2) Add or Remove UNIT(s) from SET_UNIT: </h2>
-<p>UNITs can be added and removed using the <a href="Set.html##(SET_UNIT).AddUnitsByName">Set#SET_UNIT.AddUnitsByName</a> and <a href="Set.html##(SET_UNIT).RemoveUnitsByName">Set#SET_UNIT.RemoveUnitsByName</a> respectively. 
+<p>UNITs can be added and removed using the <a href="Core.Set.html##(SET_UNIT).AddUnitsByName">Core.Set#SET_UNIT.AddUnitsByName</a> and <a href="Core.Set.html##(SET_UNIT).RemoveUnitsByName">Core.Set#SET_UNIT.RemoveUnitsByName</a> respectively. 
 These methods take a single UNIT name or an array of UNIT names to be added or removed from SET_UNIT.</p>
 
 <h2>3.3) SET_UNIT filter criteria: </h2>
@@ -206,7 +208,7 @@ Filter criteria are defined by:</p>
 <p>Planned filter criteria within development are (so these are not yet available):</p>
 
 <ul>
-    <li><a href="##(SET_UNIT).FilterZones">SET_UNIT.FilterZones</a>: Builds the SET_UNIT with the units within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
+    <li><a href="##(SET_UNIT).FilterZones">SET_UNIT.FilterZones</a>: Builds the SET_UNIT with the units within a <a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a>.</li>
 </ul>
 
 <h2>3.4) SET_UNIT iterators:</h2>
@@ -230,8 +232,8 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 
 <hr/>
 
-<h1>4) <a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a> class, extends <a href="Set.html##(SET_BASE)">Set#SET_BASE</a></h1>
-<p>Mission designers can use the <a href="Set.html##(SET_CLIENT)">Set#SET_CLIENT</a> class to build sets of units belonging to certain:</p>
+<h1>4) <a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a> class, extends <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a></h1>
+<p>Mission designers can use the <a href="Core.Set.html##(SET_CLIENT)">Core.Set#SET_CLIENT</a> class to build sets of units belonging to certain:</p>
 
 <ul>
     <li>Coalitions</li>
@@ -249,7 +251,7 @@ The following iterator methods are currently available within the SET</em>UNIT:<
 </ul>
 
 <h2>4.2) Add or Remove CLIENT(s) from SET_CLIENT: </h2>
-<p>CLIENTs can be added and removed using the <a href="Set.html##(SET_CLIENT).AddClientsByName">Set#SET_CLIENT.AddClientsByName</a> and <a href="Set.html##(SET_CLIENT).RemoveClientsByName">Set#SET_CLIENT.RemoveClientsByName</a> respectively. 
+<p>CLIENTs can be added and removed using the <a href="Core.Set.html##(SET_CLIENT).AddClientsByName">Core.Set#SET_CLIENT.AddClientsByName</a> and <a href="Core.Set.html##(SET_CLIENT).RemoveClientsByName">Core.Set#SET_CLIENT.RemoveClientsByName</a> respectively. 
 These methods take a single CLIENT name or an array of CLIENT names to be added or removed from SET_CLIENT.</p>
 
 <h2>4.3) SET_CLIENT filter criteria: </h2>
@@ -273,7 +275,7 @@ Filter criteria are defined by:</p>
 <p>Planned filter criteria within development are (so these are not yet available):</p>
 
 <ul>
-    <li><a href="##(SET_CLIENT).FilterZones">SET_CLIENT.FilterZones</a>: Builds the SET_CLIENT with the clients within a <a href="Zone.html##(ZONE)">Zone#ZONE</a>.</li>
+    <li><a href="##(SET_CLIENT).FilterZones">SET_CLIENT.FilterZones</a>: Builds the SET_CLIENT with the clients within a <a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a>.</li>
 </ul>
 
 <h2>4.4) SET_CLIENT iterators:</h2>
@@ -287,8 +289,8 @@ The following iterator methods are currently available within the SET</em>CLIENT
 
 <hr/>
 
-<h1>5) <a href="Set.html##(SET_AIRBASE)">Set#SET_AIRBASE</a> class, extends <a href="Set.html##(SET_BASE)">Set#SET_BASE</a></h1>
-<p>Mission designers can use the <a href="Set.html##(SET_AIRBASE)">Set#SET_AIRBASE</a> class to build sets of airbases optionally belonging to certain:</p>
+<h1>5) <a href="Core.Set.html##(SET_AIRBASE)">Core.Set#SET_AIRBASE</a> class, extends <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a></h1>
+<p>Mission designers can use the <a href="Core.Set.html##(SET_AIRBASE)">Core.Set#SET_AIRBASE</a> class to build sets of airbases optionally belonging to certain:</p>
 
 <ul>
     <li>Coalitions</li>
@@ -302,7 +304,7 @@ The following iterator methods are currently available within the SET</em>CLIENT
 </ul>
 
 <h2>5.2) Add or Remove AIRBASEs from SET_AIRBASE </h2>
-<p>AIRBASEs can be added and removed using the <a href="Set.html##(SET_AIRBASE).AddAirbasesByName">Set#SET_AIRBASE.AddAirbasesByName</a> and <a href="Set.html##(SET_AIRBASE).RemoveAirbasesByName">Set#SET_AIRBASE.RemoveAirbasesByName</a> respectively. 
+<p>AIRBASEs can be added and removed using the <a href="Core.Set.html##(SET_AIRBASE).AddAirbasesByName">Core.Set#SET_AIRBASE.AddAirbasesByName</a> and <a href="Core.Set.html##(SET_AIRBASE).RemoveAirbasesByName">Core.Set#SET_AIRBASE.RemoveAirbasesByName</a> respectively. 
 These methods take a single AIRBASE name or an array of AIRBASE names to be added or removed from SET_AIRBASE.</p>
 
 <h2>5.3) SET_AIRBASE filter criteria </h2>
@@ -444,7 +446,7 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_AIRBASE).FindNearestAirbaseFromPointVec2">SET_AIRBASE:FindNearestAirbaseFromPointVec2(PointVec2)</a></td>
 		<td class="summary">
-<p>Iterate the SET_AIRBASE while identifying the nearest <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> from a <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>.</p>
+<p>Iterate the SET_AIRBASE while identifying the nearest <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> from a <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>.</p>
 </td>
 		</tr>
 		<tr>
@@ -478,13 +480,13 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).Add">SET_BASE:Add(ObjectName, Object)</a></td>
 		<td class="summary">
-<p>Adds a <a href="Base.html##(BASE)">Base#BASE</a> object in the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>, using a given ObjectName as the index.</p>
+<p>Adds a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object in the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>, using a given ObjectName as the index.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).AddObject">SET_BASE:AddObject(Object)</a></td>
 		<td class="summary">
-<p>Adds a <a href="Base.html##(BASE)">Base#BASE</a> object in the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>, using the Object Name as the index.</p>
+<p>Adds a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object in the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>, using the Object Name as the index.</p>
 </td>
 		</tr>
 		<tr>
@@ -496,7 +498,7 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).Count">SET_BASE:Count()</a></td>
 		<td class="summary">
-<p>Retrieves the amount of objects in the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> and derived classes.</p>
+<p>Retrieves the amount of objects in the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> and derived classes.</p>
 </td>
 		</tr>
 		<tr>
@@ -526,7 +528,7 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).FindNearestObjectFromPointVec2">SET_BASE:FindNearestObjectFromPointVec2(PointVec2)</a></td>
 		<td class="summary">
-<p>Iterate the SET_BASE while identifying the nearest object from a <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>.</p>
+<p>Iterate the SET_BASE while identifying the nearest object from a <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>.</p>
 </td>
 		</tr>
 		<tr>
@@ -544,7 +546,7 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).Get">SET_BASE:Get(ObjectName)</a></td>
 		<td class="summary">
-<p>Gets a <a href="Base.html##(BASE)">Base#BASE</a> object from the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
+<p>Gets a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object from the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
 </td>
 		</tr>
 		<tr>
@@ -574,7 +576,7 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE).Remove">SET_BASE:Remove(ObjectName)</a></td>
 		<td class="summary">
-<p>Removes a <a href="Base.html##(BASE)">Base#BASE</a> object from the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
+<p>Removes a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object from the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
 </td>
 		</tr>
 		<tr>
@@ -640,7 +642,7 @@ The following iterator methods are currently available within the SET</em>AIRBAS
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(SET_BASE)._Find">SET_BASE:_Find(ObjectName)</a></td>
 		<td class="summary">
-<p>Finds an <a href="Base.html##(BASE)">Base#BASE</a> object based on the object Name.</p>
+<p>Finds an <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object based on the object Name.</p>
 </td>
 		</tr>
 	</table>
@@ -1194,7 +1196,7 @@ A single name or an array of AIRBASE names.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1370,7 +1372,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em>
+<p><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>:</em>
 The found Airbase.</p>
 
 </dd>
@@ -1393,7 +1395,7 @@ The found Airbase.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1423,21 +1425,21 @@ The AIRBASE</p>
 </dt>
 <dd>
 	
-<p>Iterate the SET_AIRBASE while identifying the nearest <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> from a <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>.</p>
+<p>Iterate the SET_AIRBASE while identifying the nearest <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> from a <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> PointVec2 </em></code>: 
-A <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> object from where to evaluate the closest <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>.</p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> PointVec2 </em></code>: 
+A <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> object from where to evaluate the closest <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>:</em>
-The closest <a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a>.</p>
+<p><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>:</em>
+The closest <a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a>.</p>
 
 </dd>
 </dl>
@@ -1488,7 +1490,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> MAirbase </em></code>: </p>
+<p><code><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> MAirbase </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1536,7 +1538,7 @@ DatabaseSet = SET_AIRBASE:New()</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Airbase.html##(AIRBASE)">Airbase#AIRBASE</a> RemoveAirbaseNames </em></code>: 
+<p><code><em><a href="Wrapper.Airbase.html##(AIRBASE)">Wrapper.Airbase#AIRBASE</a> RemoveAirbaseNames </em></code>: 
 A single name or an array of AIRBASE names.</p>
 
 				</li>
@@ -1563,7 +1565,7 @@ A single name or an array of AIRBASE names.</p>
 </dt>
 <dd>
 	
-<p>Adds a <a href="Base.html##(BASE)">Base#BASE</a> object in the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>, using a given ObjectName as the index.</p>
+<p>Adds a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object in the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>, using a given ObjectName as the index.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -1574,13 +1576,13 @@ A single name or an array of AIRBASE names.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Base.html##(BASE)">Base#BASE</a> Object </em></code>: </p>
+<p><code><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a> Object </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Base.html##(BASE)">Base#BASE</a>:</em>
+<p><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a>:</em>
 The added BASE Object.</p>
 
 </dd>
@@ -1594,19 +1596,19 @@ The added BASE Object.</p>
 </dt>
 <dd>
 	
-<p>Adds a <a href="Base.html##(BASE)">Base#BASE</a> object in the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a>, using the Object Name as the index.</p>
+<p>Adds a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object in the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a>, using the Object Name as the index.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Object.html##(OBJECT)">Object#OBJECT</a> Object </em></code>: </p>
+<p><code><em><a href="Wrapper.Object.html##(OBJECT)">Wrapper.Object#OBJECT</a> Object </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Base.html##(BASE)">Base#BASE</a>:</em>
+<p><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a>:</em>
 The added BASE Object.</p>
 
 </dd>
@@ -1634,7 +1636,7 @@ The added BASE Object.</p>
 </dt>
 <dd>
 	
-<p>Retrieves the amount of objects in the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> and derived classes.</p>
+<p>Retrieves the amount of objects in the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> and derived classes.</p>
 
 		<h3>Return value</h3>
 				
@@ -1719,20 +1721,20 @@ self</p>
 </dt>
 <dd>
 	
-<p>Iterate the SET_BASE while identifying the nearest object from a <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a>.</p>
+<p>Iterate the SET_BASE while identifying the nearest object from a <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a>.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> PointVec2 </em></code>: 
-A <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> object from where to evaluate the closest object in the set.</p>
+<p><code><em><a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> PointVec2 </em></code>: 
+A <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> object from where to evaluate the closest object in the set.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Base.html##(BASE)">Base#BASE</a>:</em>
+<p><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a>:</em>
 The closest object.</p>
 
 </dd>
@@ -1814,7 +1816,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Gets a <a href="Base.html##(BASE)">Base#BASE</a> object from the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
+<p>Gets a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object from the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -1826,7 +1828,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Base.html##(BASE)">Base#BASE</a>:</em></p>
+<p><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a>:</em></p>
 
 
 </dd>
@@ -1928,7 +1930,7 @@ DBObject = SET_BASE:New()</code></pre>
 </dt>
 <dd>
 	
-<p>Removes a <a href="Base.html##(BASE)">Base#BASE</a> object from the <a href="Set.html##(SET_BASE)">Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
+<p>Removes a <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object from the <a href="Core.Set.html##(SET_BASE)">Core.Set#SET_BASE</a> and derived classes, based on the Object Name.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -2056,7 +2058,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2077,7 +2079,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2098,7 +2100,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2119,7 +2121,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2152,7 +2154,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>Finds an <a href="Base.html##(BASE)">Base#BASE</a> object based on the object Name.</p>
+<p>Finds an <a href="Core.Base.html##(BASE)">Core.Base#BASE</a> object based on the object Name.</p>
 
 		<h3>Parameter</h3>
 		<ul>
@@ -2164,7 +2166,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Base.html##(BASE)">Base#BASE</a>:</em>
+<p><em><a href="Core.Base.html##(BASE)">Core.Base#BASE</a>:</em>
 The Object found.</p>
 
 </dd>
@@ -2220,7 +2222,7 @@ A single name or an array of CLIENT names.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2486,7 +2488,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Client.html##(CLIENT)">Client#CLIENT</a>:</em>
+<p><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a>:</em>
 The found Client.</p>
 
 </dd>
@@ -2509,7 +2511,7 @@ The found Client.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2577,7 +2579,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -2615,7 +2617,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -2653,7 +2655,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> MClient </em></code>: </p>
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> MClient </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2701,7 +2703,7 @@ DBObject = SET_CLIENT:New()</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Client.html##(CLIENT)">Client#CLIENT</a> RemoveClientNames </em></code>: 
+<p><code><em><a href="Wrapper.Client.html##(CLIENT)">Wrapper.Client#CLIENT</a> RemoveClientNames </em></code>: 
 A single name or an array of CLIENT names.</p>
 
 				</li>
@@ -2764,7 +2766,7 @@ A single name or an array of GROUP names.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2986,7 +2988,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The found Group.</p>
 
 </dd>
@@ -3009,7 +3011,7 @@ The found Group.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -3077,7 +3079,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -3115,7 +3117,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -3153,7 +3155,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -3191,7 +3193,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> MooseGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> MooseGroup </em></code>: </p>
 
 				</li>
 		</ul>
@@ -3239,7 +3241,7 @@ DBObject = SET_GROUP:New()</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> RemoveGroupNames </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> RemoveGroupNames </em></code>: 
 A single name or an array of GROUP names.</p>
 
 				</li>
@@ -3275,7 +3277,7 @@ A single name or an array of GROUP names.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -3626,7 +3628,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -3668,7 +3670,7 @@ The UNIT</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+<p><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>:</em>
 The found Unit.</p>
 
 </dd>
@@ -3720,7 +3722,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -3758,7 +3760,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> ZoneObject </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> ZoneObject </em></code>: 
 The Zone to be tested for.</p>
 
 				</li>
@@ -3894,7 +3896,7 @@ The amount of ground targets in the Set.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSUnit.html##(Unit.RadarType)">DCSUnit#Unit.RadarType</a> RadarType </em></code>: </p>
+<p><code><em><a href="Dcs.DCSWrapper.Unit.html##(Unit.RadarType)">Dcs.DCSWrapper.Unit#Unit.RadarType</a> RadarType </em></code>: </p>
 
 				</li>
 		</ul>
@@ -3938,7 +3940,7 @@ The amount of SEADable units in the Set</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> MUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> MUnit </em></code>: </p>
 
 				</li>
 		</ul>
@@ -3986,7 +3988,7 @@ DBObject = SET_UNIT:New()</code></pre>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> RemoveUnitNames </em></code>: 
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> RemoveUnitNames </em></code>: 
 A single name or an array of UNIT names.</p>
 
 				</li>
diff --git a/Moose Training/Documentation/Smoke.html b/Moose Training/Documentation/Smoke.html
new file mode 100644
index 000000000..dc6289bbb
--- /dev/null
+++ b/Moose Training/Documentation/Smoke.html	
@@ -0,0 +1,649 @@
+<!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="AI_Balancer.html">AI_Balancer</a></li>
+					<li><a href="Account.html">Account</a></li>
+					<li><a href="Airbase.html">Airbase</a></li>
+					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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="CommandCenter.html">CommandCenter</a></li>
+					<li><a href="Controllable.html">Controllable</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="DCScountry.html">DCScountry</a></li>
+					<li><a href="DCStimer.html">DCStimer</a></li>
+					<li><a href="DCStrigger.html">DCStrigger</a></li>
+					<li><a href="Database.html">Database</a></li>
+					<li><a href="Detection.html">Detection</a></li>
+					<li><a href="Escort.html">Escort</a></li>
+					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
+					<li><a href="Group.html">Group</a></li>
+					<li><a href="Identifiable.html">Identifiable</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="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
+					<li><a href="Point.html">Point</a></li>
+					<li><a href="Positionable.html">Positionable</a></li>
+					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
+					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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>Smoke</li>
+					<li><a href="Spawn.html">Spawn</a></li>
+					<li><a href="Static.html">Static</a></li>
+					<li><a href="StaticObject.html">StaticObject</a></li>
+					<li><a href="Task.html">Task</a></li>
+					<li><a href="Task_A2G.html">Task_A2G</a></li>
+					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
+					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
+					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
+					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>Smoke</code></h1>
+   
+<p>(SP) (MP) (FSM) Route AI or players through waypoints or to zones.</p>
+
+   
+
+<hr/>
+
+<h1><a href="##(ACT_ASSIST)">#ACT_ASSIST</a> FSM class, extends <a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a></h1>
+
+<h2>ACT_ASSIST state machine:</h2>
+
+<p>This class is a state machine: it manages a process that is triggered by events causing state transitions to occur.
+All derived classes from this class will start with the class name, followed by a _. See the relevant derived class descriptions below.
+Each derived class follows exactly the same process, using the same events and following the same state transitions, 
+but will have <strong>different implementation behaviour</strong> upon each event or state transition.</p>
+
+<h3>ACT_ASSIST <strong>Events</strong>:</h3>
+
+<p>These are the events defined in this class:</p>
+
+<ul>
+    <li><strong>Start</strong>:  The process is started.</li>
+    <li><strong>Next</strong>: The process is smoking the targets in the given zone.</li>
+</ul>
+
+<h3>ACT_ASSIST <strong>Event methods</strong>:</h3>
+
+<p>Event methods are available (dynamically allocated by the state machine), that accomodate for state transitions occurring in the process.
+There are two types of event methods, which you can use to influence the normal mechanisms in the state machine:</p>
+
+<ul>
+    <li><strong>Immediate</strong>: The event method has exactly the name of the event.</li>
+    <li><strong>Delayed</strong>: The event method starts with a __ + the name of the event. The first parameter of the event method is a number value, expressing the delay in seconds when the event will be executed. </li>
+</ul>
+
+<h3>ACT_ASSIST <strong>States</strong>:</h3>
+
+<ul>
+    <li><strong>None</strong>: The controllable did not receive route commands.</li>
+    <li><strong>AwaitSmoke (*)</strong>: The process is awaiting to smoke the targets in the zone.</li>
+    <li><strong>Smoking (*)</strong>: The process is smoking the targets in the zone.</li>
+    <li><strong>Failed (*)</strong>: The process has failed.</li>
+</ul>
+
+<p>(*) End states of the process.</p>
+
+<h3>ACT_ASSIST state transition methods:</h3>
+
+<p>State transition functions can be set <strong>by the mission designer</strong> customizing or improving the behaviour of the state.
+There are 2 moments when state transition methods will be called by the state machine:</p>
+
+<ul>
+    <li><p><strong>Before</strong> the state transition. 
+    The state transition method needs to start with the name <strong>OnBefore + the name of the state</strong>. 
+    If the state transition method returns false, then the processing of the state transition will not be done!
+    If you want to change the behaviour of the AIControllable at this event, return false, 
+    but then you'll need to specify your own logic using the AIControllable!</p></li>
+    <li><p><strong>After</strong> the state transition. 
+    The state transition method needs to start with the name <strong>OnAfter + the name of the state</strong>. 
+    These state transition methods need to provide a return value, which is specified at the function description.</p></li>
+</ul>
+
+<hr/>
+
+<h1>1) <a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE)">#ACT<em>ASSIST</em>SMOKE<em>TARGETS</em>ZONE</a> class, extends <a href="Fsm.Route.html##(ACT_ASSIST)">Fsm.Route#ACT_ASSIST</a></h1>
+
+<p>The ACT<em>ASSIST</em>SMOKE<em>TARGETS</em>ZONE class implements the core functions to smoke targets in a <a href="Zone.html">Zone</a>.
+The targets are smoked within a certain range around each target, simulating a realistic smoking behaviour. 
+At random intervals, a new target is smoked.</p>
+
+<h1>1.1) ACT<em>ASSIST</em>SMOKE<em>TARGETS</em>ZONE constructor:</h1>
+
+<ul>
+    <li><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).New">ACT<em>ASSIST</em>SMOKE<em>TARGETS</em>ZONE.New</a>(): Creates a new ACT<em>ASSIST</em>SMOKE<em>TARGETS</em>ZONE object.</li>
+</ul>
+
+<hr/>
+
+
+	<h2>Global(s)</h2>
+	<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ASSIST">ACT_ASSIST</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#ACT_ASSIST_SMOKE_TARGETS_ZONE">ACT_ASSIST_SMOKE_TARGETS_ZONE</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+	</table>
+			<h2><a id="#(ACT_ASSIST)">Type <code>ACT_ASSIST</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).ClassName">ACT_ASSIST.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).Menu">ACT_ASSIST.Menu</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).MenuSmokeBlue">ACT_ASSIST.MenuSmokeBlue</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).MenuSmokeGreen">ACT_ASSIST.MenuSmokeGreen</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).MenuSmokeOrange">ACT_ASSIST.MenuSmokeOrange</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).MenuSmokeRed">ACT_ASSIST.MenuSmokeRed</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).MenuSmokeWhite">ACT_ASSIST.MenuSmokeWhite</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).New">ACT_ASSIST:New()</a></td>
+		<td class="summary">
+<p>Creates a new target smoking state machine.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).TargetSetUnit">ACT_ASSIST.TargetSetUnit</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).TargetZone">ACT_ASSIST.TargetZone</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST).onafterStart">ACT_ASSIST:onafterStart(ProcessUnit, Event, From, To)</a></td>
+		<td class="summary">
+<p>StateMachine callback function</p>
+</td>
+		</tr>
+	</table>
+
+			<h2><a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE)">Type <code>ACT_ASSIST_SMOKE_TARGETS_ZONE</code></a></h2>
+				<table class="function_list">
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).ClassName">ACT_ASSIST_SMOKE_TARGETS_ZONE.ClassName</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).Init">ACT_ASSIST_SMOKE_TARGETS_ZONE:Init(FsmSmoke)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).New">ACT_ASSIST_SMOKE_TARGETS_ZONE:New(TargetSetUnit, TargetZone)</a></td>
+		<td class="summary">
+<p>Creates a new target smoking state machine.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).TargetSetUnit">ACT_ASSIST_SMOKE_TARGETS_ZONE.TargetSetUnit</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).TargetZone">ACT_ASSIST_SMOKE_TARGETS_ZONE.TargetZone</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE).onenterSmoking">ACT_ASSIST_SMOKE_TARGETS_ZONE:onenterSmoking(ProcessUnit, Event, From, To)</a></td>
+		<td class="summary">
+<p>StateMachine callback function</p>
+</td>
+		</tr>
+	</table>
+
+	<h2>Global(s)</h2>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(ACT_ASSIST)">#ACT_ASSIST</a></em>
+<a id="ACT_ASSIST" >
+<strong>ACT_ASSIST</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(ACT_ASSIST_SMOKE_TARGETS_ZONE)">#ACT_ASSIST_SMOKE_TARGETS_ZONE</a></em>
+<a id="ACT_ASSIST_SMOKE_TARGETS_ZONE" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+	<h2><a id="#(Smoke)" >Type <code>Smoke</code></a></h2>
+	
+			<h2><a id="#(ACT_ASSIST)" >Type <code>ACT_ASSIST</code></a></h2>
+				
+<p>ACT_ASSIST class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(ACT_ASSIST).ClassName" >
+<strong>ACT_ASSIST.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).Menu" >
+<strong>ACT_ASSIST.Menu</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).MenuSmokeBlue" >
+<strong>ACT_ASSIST.MenuSmokeBlue</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).MenuSmokeGreen" >
+<strong>ACT_ASSIST.MenuSmokeGreen</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).MenuSmokeOrange" >
+<strong>ACT_ASSIST.MenuSmokeOrange</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).MenuSmokeRed" >
+<strong>ACT_ASSIST.MenuSmokeRed</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).MenuSmokeWhite" >
+<strong>ACT_ASSIST.MenuSmokeWhite</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIST).New" >
+<strong>ACT_ASSIST:New()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new target smoking state machine.</p>
+
+	
+<p>The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="##(ACT_ASSIST)">#ACT_ASSIST</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).TargetSetUnit" >
+<strong>ACT_ASSIST.TargetSetUnit</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(ACT_ASSIST).TargetZone" >
+<strong>ACT_ASSIST.TargetZone</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIST).onafterStart" >
+<strong>ACT_ASSIST:onafterStart(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+			<h2><a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE)" >Type <code>ACT_ASSIST_SMOKE_TARGETS_ZONE</code></a></h2>
+				
+<p>ACT<em>ASSIST</em>SMOKE<em>TARGETS</em>ZONE class</p>
+
+	<h3>Field(s)</h3>
+		<dl class="function">
+<dt>
+
+		<em>#string</em>
+<a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE).ClassName" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE.ClassName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE).Init" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE:Init(FsmSmoke)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> FsmSmoke </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE).New" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE:New(TargetSetUnit, TargetZone)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Creates a new target smoking state machine.</p>
+
+	
+<p>The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a> TargetSetUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
+<a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE).TargetSetUnit" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE.TargetSetUnit</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></em>
+<a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE).TargetZone" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE.TargetZone</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(ACT_ASSIST_SMOKE_TARGETS_ZONE).onenterSmoking" >
+<strong>ACT_ASSIST_SMOKE_TARGETS_ZONE:onenterSmoking(ProcessUnit, Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>StateMachine callback function</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a> ProcessUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/Moose Training/Documentation/Spawn.html b/Moose Training/Documentation/Spawn.html
index 2ea2eb130..fd1011baf 100644
--- a/Moose Training/Documentation/Spawn.html	
+++ b/Moose Training/Documentation/Spawn.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li>Spawn</li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,7 +89,7 @@
 
    
 
-<h1>1) <a href="Spawn.html##(SPAWN)">Spawn#SPAWN</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
+<h1>1) <a href="Functional.Spawn.html##(SPAWN)">Functional.Spawn#SPAWN</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
 <p>The <a href="##(SPAWN)">#SPAWN</a> class allows to spawn dynamically new groups, based on pre-defined initialization settings, modifying the behaviour when groups are spawned.
 For each group to be spawned, within the mission editor, a group has to be created with the "late activation flag" set. We call this group the <em>"Spawn Template"</em> of the SPAWN object.
 A reference to this Spawn Template needs to be provided when constructing the SPAWN object, by indicating the name of the group within the mission editor in the constructor methods.</p>
@@ -946,7 +948,7 @@ A coding example is provided at the description of the <a href="##(SPAWN).OnSpaw
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>, #number:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>, #number:</em>
 The <a href="Group.html">Group</a> object found, the new Index where the group was found.</p>
 
 				</li>
@@ -993,7 +995,7 @@ The index of the group to return.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 self</p>
 
 </dd>
@@ -1013,7 +1015,7 @@ self</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>, #number:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>, #number:</em>
 The last alive <a href="Group.html">Group</a> object found, the last Index where the last alive <a href="Group.html">Group</a> object was found.</p>
 
 				</li>
@@ -1057,7 +1059,7 @@ A Index holding the start position to search from. This method can also be used
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>, #number:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>, #number:</em>
 The next alive <a href="Group.html">Group</a> object found, the next Index where the next alive <a href="Group.html">Group</a> object was found.</p>
 
 				</li>
@@ -1361,13 +1363,13 @@ If true, SPAWN will perform the randomization of the <a href="UNIT.html">UNIT</a
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> OuterRadius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> OuterRadius </em></code>: 
 (optional) The outer radius in meters where the new group will be spawned.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> InnerRadius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> InnerRadius </em></code>: 
 (optional) The inner radius in meters where the new group will NOT be spawned.</p>
 
 				</li>
@@ -1618,7 +1620,7 @@ Spawn_BE_KA50 = SPAWN:NewWithAlias( 'BE KA-50@RAMP-Ground Defense', 'Helicopter
 
 	
 <p>The provided method will be called when a new group is spawned, including its given parameters.
-The first parameter of the SpawnFunction is the <a href="Group.html##(GROUP)">Group#GROUP</a> that was spawned.</p>
+The first parameter of the SpawnFunction is the <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> that was spawned.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -1684,7 +1686,7 @@ The index of the group to be spawned.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The group that was spawned. You can use this group for further actions.</p>
 
 </dd>
@@ -1747,7 +1749,7 @@ The group that was spawned. You can use this group for further actions.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The group that was spawned. You can use this group for further actions.</p>
 
 </dd>
@@ -1830,7 +1832,7 @@ You can use the returned group to further define the route to be followed.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Static.html##(STATIC)">Static#STATIC</a> HostStatic </em></code>: 
+<p><code><em><a href="Wrapper.Static.html##(STATIC)">Wrapper.Static#STATIC</a> HostStatic </em></code>: 
 The static dropping or unloading the group.</p>
 
 				</li>
@@ -1845,7 +1847,7 @@ The static dropping or unloading the group.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 that was spawned.</p>
 
 				</li>
@@ -1878,7 +1880,7 @@ You can use the returned group to further define the route to be followed.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> HostUnit </em></code>: 
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> HostUnit </em></code>: 
 The air or ground unit dropping or unloading the group.</p>
 
 				</li>
@@ -1893,7 +1895,7 @@ The air or ground unit dropping or unloading the group.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 that was spawned.</p>
 
 				</li>
@@ -1926,7 +1928,7 @@ You can use the returned group to further define the route to be followed.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The Vec2 coordinates where to spawn the group.</p>
 
 				</li>
@@ -1941,7 +1943,7 @@ The Vec2 coordinates where to spawn the group.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 that was spawned.</p>
 
 				</li>
@@ -1974,7 +1976,7 @@ You can use the returned group to further define the route to be followed.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 The Vec3 coordinates where to spawn the group.</p>
 
 				</li>
@@ -1989,7 +1991,7 @@ The Vec3 coordinates where to spawn the group.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 that was spawned.</p>
 
 				</li>
@@ -2086,7 +2088,7 @@ SpawnGroupName</p>
 <p>Will spawn a Group within a given <a href="Zone.html">Zone</a>.</p>
 
 	
-<p>The <a href="Zone.html">Zone</a> can be of any type derived from <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>.
+<p>The <a href="Zone.html">Zone</a> can be of any type derived from <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>.
 Once the <a href="Group.html">Group</a> is spawned within the zone, the <a href="Group.html">Group</a> will continue on its route.
 The <strong>first waypoint</strong> (where the group is spawned) is replaced with the zone location coordinates.</p>
 
@@ -2094,7 +2096,7 @@ The <strong>first waypoint</strong> (where the group is spawned) is replaced wit
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE)">Zone#ZONE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> Zone </em></code>: 
 The zone where the group is to be spawned.</p>
 
 				</li>
@@ -2115,7 +2117,7 @@ The zone where the group is to be spawned.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 that was spawned.</p>
 
 				</li>
@@ -2175,7 +2177,7 @@ when nothing was spawned.</p>
 		<dl class="function">
 <dt>
 
-		<em>#number</em>
+		<em></em>
 <a id="#(SPAWN).SpawnMaxGroups" >
 <strong>SPAWN.SpawnMaxGroups</strong>
 </a>
@@ -2192,7 +2194,7 @@ when nothing was spawned.</p>
 		<dl class="function">
 <dt>
 
-		<em>#number</em>
+		<em></em>
 <a id="#(SPAWN).SpawnMaxUnitsAlive" >
 <strong>SPAWN.SpawnMaxUnitsAlive</strong>
 </a>
@@ -2524,7 +2526,7 @@ The index of the group to be spawned.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The group that was spawned. You can use this group for further actions.</p>
 
 </dd>
@@ -2638,7 +2640,7 @@ The group that was spawned. You can use this group for further actions.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> DCSUnit </em></code>: 
 The <a href="DCSUnit.html">DCSUnit</a> to be searched.</p>
 
 				</li>
@@ -2647,7 +2649,7 @@ The <a href="DCSUnit.html">DCSUnit</a> to be searched.</p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The Group</p>
 
 				</li>
@@ -2679,7 +2681,7 @@ It will return nil of no prefix was found.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> DCSUnit </em></code>: 
 The <a href="DCSUnit.html">DCSUnit</a> to be searched.</p>
 
 				</li>
@@ -2733,7 +2735,7 @@ It will return nil of no prefix was found.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSUnit.html##(UNIT)">DCSUnit#UNIT</a> DCSUnit </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Unit.html##(UNIT)">Dcs.DCSWrapper.Unit#UNIT</a> DCSUnit </em></code>: 
 The <a href="DCSUnit.html">DCSUnit</a> to be searched.</p>
 
 				</li>
@@ -2844,7 +2846,7 @@ Nothing found</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
@@ -2865,7 +2867,7 @@ Nothing found</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em><a href="Core.Event.html##(EVENTDATA)">Core.Event#EVENTDATA</a> Event </em></code>: </p>
 
 				</li>
 		</ul>
diff --git a/Moose Training/Documentation/Static.html b/Moose Training/Documentation/Static.html
index 9208e954b..548946939 100644
--- a/Moose Training/Documentation/Static.html	
+++ b/Moose Training/Documentation/Static.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li>Static</li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,10 +89,10 @@
 
    
 
-<h1>1) <a href="Static.html##(STATIC)">Static#STATIC</a> class, extends <a href="Positionable.html##(POSITIONABLE)">Positionable#POSITIONABLE</a></h1>
+<h1>1) <a href="Wrapper.Static.html##(STATIC)">Wrapper.Static#STATIC</a> class, extends <a href="Wrapper.Positionable.html##(POSITIONABLE)">Wrapper.Positionable#POSITIONABLE</a></h1>
 <p>Statics are <strong>Static Units</strong> defined within the Mission Editor.
 Note that Statics are almost the same as Units, but they don't have a controller.
-The <a href="Static.html##(STATIC)">Static#STATIC</a> class is a wrapper class to handle the DCS Static objects:</p>
+The <a href="Wrapper.Static.html##(STATIC)">Wrapper.Static#STATIC</a> class is a wrapper class to handle the DCS Static objects:</p>
 
 <ul>
     <li>Wraps the DCS Static objects.</li>
diff --git a/Moose Training/Documentation/StaticObject.html b/Moose Training/Documentation/StaticObject.html
index 6033a6c3f..6c4667c2e 100644
--- a/Moose Training/Documentation/StaticObject.html	
+++ b/Moose Training/Documentation/StaticObject.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li>StaticObject</li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
diff --git a/Moose Training/Documentation/TASK.html b/Moose Training/Documentation/TASK.html
index 7b091b9fd..0aba94927 100644
--- a/Moose Training/Documentation/TASK.html	
+++ b/Moose Training/Documentation/TASK.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li>Task</li>
@@ -75,31 +75,33 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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>Task</code></h1>
    
-<p>This module contains the TASK_BASE class.</p>
+<p>This module contains the TASK class.</p>
 
    
 
-<h1>1) <a href="##(TASK_BASE)">#TASK_BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
-<h2>1.1) The <a href="##(TASK_BASE)">#TASK_BASE</a> class implements the methods for task orchestration within MOOSE. </h2>
+<h1>1) <a href="##(TASK)">#TASK</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
+<h2>1.1) The <a href="##(TASK)">#TASK</a> class implements the methods for task orchestration within MOOSE. </h2>
 <p>The class provides a couple of methods to:</p>
 
 <ul>
-    <li><a href="##(TASK_BASE).AssignToGroup">TASK_BASE.AssignToGroup</a>():Assign a task to a group (of players).</li>
-    <li><a href="##(TASK_BASE).AddProcess">TASK_BASE.AddProcess</a>():Add a <a href="Process.html">Process</a> to a task.</li>
-    <li><a href="##(TASK_BASE).RemoveProcesses">TASK_BASE.RemoveProcesses</a>():Remove a running <a href="Process.html">Process</a> from a running task.</li>
-    <li><a href="##(TASK_BASE).AddStateMachine">TASK_BASE.AddStateMachine</a>():Add a <a href="StateMachine.html">StateMachine</a> to a task.</li>
-    <li><a href="##(TASK_BASE).RemoveStateMachines">TASK_BASE.RemoveStateMachines</a>():Remove <a href="StateMachine.html">StateMachine</a>s from a task.</li>
-    <li><a href="##(TASK_BASE).HasStateMachine">TASK_BASE.HasStateMachine</a>():Enquire if the task has a <a href="StateMachine.html">StateMachine</a></li>
-    <li><a href="##(TASK_BASE).AssignToUnit">TASK_BASE.AssignToUnit</a>(): Assign a task to a unit. (Needs to be implemented in the derived classes from <a href="##(TASK_BASE)">#TASK_BASE</a>.</li>
-    <li><a href="##(TASK_BASE).UnAssignFromUnit">TASK_BASE.UnAssignFromUnit</a>(): Unassign the task from a unit.</li>
+    <li><a href="##(TASK).AssignToGroup">TASK.AssignToGroup</a>():Assign a task to a group (of players).</li>
+    <li><a href="##(TASK).AddProcess">TASK.AddProcess</a>():Add a <a href="Process.html">Process</a> to a task.</li>
+    <li><a href="##(TASK).RemoveProcesses">TASK.RemoveProcesses</a>():Remove a running <a href="Process.html">Process</a> from a running task.</li>
+    <li><a href="##(TASK).SetStateMachine">TASK.SetStateMachine</a>():Set a <a href="Fsm.html">Fsm</a> to a task.</li>
+    <li><a href="##(TASK).RemoveStateMachine">TASK.RemoveStateMachine</a>():Remove <a href="Fsm.html">Fsm</a> from a task.</li>
+    <li><a href="##(TASK).HasStateMachine">TASK.HasStateMachine</a>():Enquire if the task has a <a href="Fsm.html">Fsm</a></li>
+    <li><a href="##(TASK).AssignToUnit">TASK.AssignToUnit</a>(): Assign a task to a unit. (Needs to be implemented in the derived classes from <a href="##(TASK)">#TASK</a>.</li>
+    <li><a href="##(TASK).UnAssignFromUnit">TASK.UnAssignFromUnit</a>(): Unassign the task from a unit.</li>
 </ul>
 
 <h2>1.2) Set and enquire task status (beyond the task state machine processing).</h2>
@@ -126,7 +128,7 @@ The status of tasks can be enquired by the methods <strong>IsState</strong> foll
 
 <h2>1.3) Add scoring when reaching a certain task status:</h2>
 <p>Upon reaching a certain task status in a task, additional scoring can be given. If the Mission has a scoring system attached, the scores will be added to the mission scoring.
-Use the method <a href="##(TASK_BASE).AddScore">TASK_BASE.AddScore</a>() to add scores when a status is reached.</p>
+Use the method <a href="##(TASK).AddScore">TASK.AddScore</a>() to add scores when a status is reached.</p>
 
 <h2>1.4) Task briefing:</h2>
 <p>A task briefing can be given that is shown to the player when he is assigned to the task.</p>
@@ -139,456 +141,552 @@ Use the method <a href="##(TASK_BASE).AddScore">TASK_BASE.AddScore</a>() to add
 	<h2>Global(s)</h2>
 	<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="#TASK_BASE">TASK_BASE</a></td>
+		<td class="name" nowrap="nowrap"><a href="#PlayerNameText">PlayerNameText</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="#TASK">TASK</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 	</table>
-			<h2><a id="#(TASK_BASE)">Type <code>TASK_BASE</code></a></h2>
+			<h2><a id="#(TASK)">Type <code>TASK</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).AddProcess">TASK_BASE:AddProcess(TaskUnit, Process)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Abort">TASK:Abort()</a></td>
 		<td class="summary">
-<p>Add Process to <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a>.</p>
+<p>FSM Abort synchronous event function for TASK.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).AddScore">TASK_BASE:AddScore(TaskStatus, ScoreText, Score)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).AbortUnit">TASK:AbortUnit(PlayerUnit)</a></td>
 		<td class="summary">
-<p>Adds a score for the TASK to be achieved.</p>
+<p>Abort a PlayerUnit from a Task.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).AddStateMachine">TASK_BASE:AddStateMachine(TaskUnit, Fsm)</a></td>
-		<td class="summary">
-<p>Add a FiniteStateMachine to <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).AssignToGroup">TASK_BASE:AssignToGroup(TaskGroup)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).AssignToGroup">TASK:AssignToGroup(TaskGroup)</a></td>
 		<td class="summary">
 <p>Assign the <a href="Task.html">Task</a>to a <a href="Group.html">Group</a>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).AssignToUnit">TASK_BASE:AssignToUnit(TaskUnit)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).AssignToUnit">TASK:AssignToUnit(TaskUnit)</a></td>
 		<td class="summary">
-<p>Assign the <a href="Task.html">Task</a>to an alive <a href="Unit.html">Unit</a>.</p>
+<p>Assign the <a href="Task.html">Task</a> to an alive <a href="Unit.html">Unit</a>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).ClassName">TASK_BASE.ClassName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Cancel">TASK:Cancel()</a></td>
+		<td class="summary">
+<p>FSM Cancel synchronous event function for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).ClassName">TASK.ClassName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).CleanUp">TASK_BASE:CleanUp()</a></td>
-		<td class="summary">
-<p>Cleans all references of a TASK_BASE.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).FailProcesses">TASK_BASE:FailProcesses(TaskUnitName)</a></td>
-		<td class="summary">
-<p>Fail processes from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).Fsm">TASK_BASE.Fsm</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).CommandCenter">TASK.CommandCenter</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetCategory">TASK_BASE:GetCategory()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).CrashUnit">TASK:CrashUnit(PlayerUnit)</a></td>
 		<td class="summary">
-<p>Gets the Category of the Task</p>
+<p>A PlayerUnit crashed in a Task.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetID">TASK_BASE:GetID()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Fail">TASK:Fail()</a></td>
+		<td class="summary">
+<p>FSM Fail synchronous event function for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).FailProcesses">TASK:FailProcesses(TaskUnitName)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).FsmTemplate">TASK.FsmTemplate</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetGroups">TASK:GetGroups()</a></td>
+		<td class="summary">
+<p>Gets the SET_GROUP assigned to the TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetID">TASK:GetID()</a></td>
 		<td class="summary">
 <p>Gets the ID of the Task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetName">TASK_BASE:GetName()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetMission">TASK:GetMission()</a></td>
+		<td class="summary">
+<p>Gets the Mission to where the TASK belongs.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetName">TASK:GetName()</a></td>
 		<td class="summary">
 <p>Gets the Name of the Task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetScoring">TASK_BASE:GetScoring()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetProcessTemplate">TASK:GetProcessTemplate(ProcessName)</a></td>
+		<td class="summary">
+<p>Get the default or currently assigned <a href="Process.html">Process</a> template with key ProcessName.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetScoring">TASK:GetScoring()</a></td>
 		<td class="summary">
 <p>Gets the Scoring of the task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetStateString">TASK_BASE:GetStateString()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetStateString">TASK:GetStateString()</a></td>
 		<td class="summary">
 <p>Gets the <a href="Task.html">Task</a> status.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetTaskIndex">TASK_BASE:GetTaskIndex()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetTaskIndex">TASK:GetTaskIndex()</a></td>
 		<td class="summary">
-<p>Gets the Task Index, which is a combination of the Task category, the Task type, the Task name.</p>
+<p>Gets the Task Index, which is a combination of the Task type, the Task name.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetTaskName">TASK_BASE:GetTaskName()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetTaskName">TASK:GetTaskName()</a></td>
 		<td class="summary">
 <p>Returns the <a href="Task.html">Task</a> name.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).GetType">TASK_BASE:GetType()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetType">TASK:GetType()</a></td>
 		<td class="summary">
 <p>Gets the Type of the Task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).HasStateMachine">TASK_BASE:HasStateMachine(TaskUnitName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).GetUnitProcess">TASK:GetUnitProcess()</a></td>
 		<td class="summary">
-<p>Checks if there is a FiniteStateMachine assigned to <a href="Unit.html">Unit</a> for <a href="Task.html">Task</a></p>
+<p>Get the Task FSM Process Template</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsAssignedToGroup">TASK_BASE:IsAssignedToGroup(TaskGroup)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).HasAliveUnits">TASK:HasAliveUnits()</a></td>
+		<td class="summary">
+<p>Returns if the <a href="Task.html">Task</a> has still alive and assigned Units.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).HasGroup">TASK:HasGroup(FindGroup)</a></td>
+		<td class="summary">
+
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).HasStateMachine">TASK:HasStateMachine(TaskUnit)</a></td>
+		<td class="summary">
+<p>Checks if there is a FiniteStateMachine assigned to Task<a href="Unit.html">Unit</a> for <a href="Task.html">Task</a></p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsAssignedToGroup">TASK:IsAssignedToGroup(TaskGroup)</a></td>
 		<td class="summary">
 <p>Returns if the <a href="Task.html">Task</a> is assigned to the Group.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsStateAssigned">TASK_BASE:IsStateAssigned()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsStateAssigned">TASK:IsStateAssigned()</a></td>
 		<td class="summary">
 <p>Is the <a href="Task.html">Task</a> status <strong>Assigned</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsStateFailed">TASK_BASE:IsStateFailed()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsStateFailed">TASK:IsStateFailed()</a></td>
 		<td class="summary">
 <p>Is the <a href="Task.html">Task</a> status <strong>Failed</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsStateHold">TASK_BASE:IsStateHold()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsStateHold">TASK:IsStateHold()</a></td>
 		<td class="summary">
 <p>Is the <a href="Task.html">Task</a> status <strong>Hold</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsStatePlanned">TASK_BASE:IsStatePlanned()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsStatePlanned">TASK:IsStatePlanned()</a></td>
 		<td class="summary">
 <p>Is the <a href="Task.html">Task</a> status <strong>Planned</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsStateReplanned">TASK_BASE:IsStateReplanned()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsStateReplanned">TASK:IsStateReplanned()</a></td>
 		<td class="summary">
 <p>Is the <a href="Task.html">Task</a> status <strong>Replanned</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).IsStateSuccess">TASK_BASE:IsStateSuccess()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).IsStateSuccess">TASK:IsStateSuccess()</a></td>
 		<td class="summary">
 <p>Is the <a href="Task.html">Task</a> status <strong>Success</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).Menu">TASK_BASE.Menu</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).JoinUnit">TASK:JoinUnit(PlayerUnit)</a></td>
+		<td class="summary">
+<p>Add a PlayerUnit to join the Task.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Menu">TASK.Menu</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).MenuAbort">TASK_BASE.MenuAbort</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).MenuAssignToGroup">TASK.MenuAssignToGroup(MenuParam)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).MenuAssignToGroup">TASK_BASE.MenuAssignToGroup(MenuParam)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).MenuTaskAbort">TASK.MenuTaskAbort(MenuParam)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).MenuStatus">TASK_BASE.MenuStatus</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).MenuTaskStatus">TASK.MenuTaskStatus(MenuParam)</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).MenuTaskAbort">TASK_BASE.MenuTaskAbort(MenuParam)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).MessageToGroups">TASK:MessageToGroups(Message)</a></td>
+		<td class="summary">
+<p>Send a message of the <a href="Task.html">Task</a> to the assigned <a href="Group.html">Group</a>s.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Mission">TASK.Mission</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).MenuTaskStatus">TASK_BASE.MenuTaskStatus(MenuParam)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).New">TASK:New(Mission, SetGroupAssign, TaskName, TaskType)</a></td>
+		<td class="summary">
+<p>Instantiates a new TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).OnAfterPlayerAborted">TASK:OnAfterPlayerAborted(PlayerUnit, PlayerName)</a></td>
+		<td class="summary">
+<p>FSM PlayerAborted event handler prototype for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).OnAfterPlayerCrashed">TASK:OnAfterPlayerCrashed(PlayerUnit, PlayerName)</a></td>
+		<td class="summary">
+<p>FSM PlayerCrashed event handler prototype for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).OnAfterPlayerDead">TASK:OnAfterPlayerDead(PlayerUnit, PlayerName)</a></td>
+		<td class="summary">
+<p>FSM PlayerDead event handler prototype for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Players">TASK.Players</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).Mission">TASK_BASE.Mission</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).ProcessClasses">TASK.ProcessClasses</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).New">TASK_BASE:New(The, SetGroup, TaskName, TaskType, TaskCategory, Mission)</a></td>
-		<td class="summary">
-<p>Instantiates a new TASK_BASE.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).OnAssigned">TASK_BASE:OnAssigned(TaskUnit, Fsm, Event, From, To, Event)</a></td>
-		<td class="summary">
-<p>StateMachine callback function for a TASK</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).OnFailed">TASK_BASE:OnFailed(TaskUnit, Fsm, Event, From, To, Event)</a></td>
-		<td class="summary">
-<p>StateMachine callback function for a TASK</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).OnStateChange">TASK_BASE:OnStateChange(TaskUnit, Fsm, Event, From, To, Event)</a></td>
-		<td class="summary">
-<p>StateMachine callback function for a TASK</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).OnSuccess">TASK_BASE:OnSuccess(TaskUnit, Fsm, Event, From, To, Event)</a></td>
-		<td class="summary">
-<p>StateMachine callback function for a TASK</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).Players">TASK_BASE.Players</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Processes">TASK.Processes</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).Processes">TASK_BASE.Processes</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).RemoveMenu">TASK_BASE:RemoveMenu()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).RemoveMenu">TASK:RemoveMenu()</a></td>
 		<td class="summary">
 <p>Remove the menu options of the <a href="Task.html">Task</a> to all the groups in the SetGroup.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).RemoveMenuForGroup">TASK_BASE:RemoveMenuForGroup(TaskGroup)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).RemoveMenuForGroup">TASK:RemoveMenuForGroup(TaskGroup)</a></td>
 		<td class="summary">
 <p>Remove the menu option of the <a href="Task.html">Task</a> for a <a href="Group.html">Group</a>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).RemoveProcesses">TASK_BASE:RemoveProcesses(TaskUnitName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).RemoveStateMachine">TASK:RemoveStateMachine(TaskUnit)</a></td>
 		<td class="summary">
-<p>Remove Processes from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
+<p>Remove FiniteStateMachines from <a href="Task.html">Task</a> with key Task<a href="Unit.html">Unit</a></p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).RemoveStateMachines">TASK_BASE:RemoveStateMachines(TaskUnitName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Replan">TASK:Replan()</a></td>
 		<td class="summary">
-<p>Remove FiniteStateMachines from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
+<p>FSM Replan synchronous event function for TASK.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).Scores">TASK_BASE.Scores</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).ReportDetails">TASK:ReportDetails()</a></td>
+		<td class="summary">
+<p>Create a detailed report of the Task.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).ReportSummary">TASK:ReportSummary()</a></td>
+		<td class="summary">
+<p>Create a summary report of the Task.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Scores">TASK.Scores</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SendBriefingToAssignedGroups">TASK_BASE:SendBriefingToAssignedGroups()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SendBriefingToAssignedGroups">TASK:SendBriefingToAssignedGroups()</a></td>
 		<td class="summary">
 <p>Send the briefng message of the <a href="Task.html">Task</a> to the assigned <a href="Group.html">Group</a>s.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetAssignedMenu">TASK_BASE:SetAssignedMenu()</a></td>
-		<td class="summary">
-<p>Set the menu options of the <a href="Task.html">Task</a> to all the groups in the SetGroup.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetAssignedMenuForGroup">TASK_BASE:SetAssignedMenuForGroup(TaskGroup)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetAssignedMenuForGroup">TASK:SetAssignedMenuForGroup(TaskGroup)</a></td>
 		<td class="summary">
 <p>Set the assigned menu options of the <a href="Task.html">Task</a>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetBriefing">TASK_BASE:SetBriefing(TaskBriefing)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetBriefing">TASK:SetBriefing(TaskBriefing)</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> briefing.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetCategory">TASK_BASE:SetCategory(TaskCategory)</a></td>
-		<td class="summary">
-<p>Sets the Category of the Task</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetGroup">TASK_BASE.SetGroup</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetGroup">TASK.SetGroup</a></td>
 		<td class="summary">
 <p>The Set of Groups assigned to the Task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetID">TASK_BASE:SetID(TaskID)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetID">TASK:SetID(TaskID)</a></td>
 		<td class="summary">
 <p>Sets the ID of the Task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetName">TASK_BASE:SetName(TaskName)</a></td>
-		<td class="summary">
-<p>Sets the Name of the Task</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetPlannedMenu">TASK_BASE:SetPlannedMenu()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetMenu">TASK:SetMenu()</a></td>
 		<td class="summary">
 <p>Set the menu options of the <a href="Task.html">Task</a> to all the groups in the SetGroup.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetPlannedMenuForGroup">TASK_BASE:SetPlannedMenuForGroup(TaskGroup, MenuText)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetMenuForGroup">TASK:SetMenuForGroup(TaskGroup)</a></td>
+		<td class="summary">
+<p>Set the Menu for a Group</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetName">TASK:SetName(TaskName)</a></td>
+		<td class="summary">
+<p>Sets the Name of the Task</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetPlannedMenuForGroup">TASK:SetPlannedMenuForGroup(TaskGroup, MenuText)</a></td>
 		<td class="summary">
 <p>Set the planned menu option of the <a href="Task.html">Task</a>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).SetType">TASK_BASE:SetType(TaskType)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetStateMachine">TASK:SetStateMachine(TaskUnit, Fsm)</a></td>
+		<td class="summary">
+<p>Add a FiniteStateMachine to <a href="Task.html">Task</a> with key Task<a href="Unit.html">Unit</a></p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetType">TASK:SetType(TaskType)</a></td>
 		<td class="summary">
 <p>Sets the Type of the Task</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).StateAssigned">TASK_BASE:StateAssigned()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).SetUnitProcess">TASK:SetUnitProcess(Core, FsmTemplate)</a></td>
+		<td class="summary">
+<p>Sets the Task FSM Process Template</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).StateAssigned">TASK:StateAssigned()</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Assigned</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).StateFailed">TASK_BASE:StateFailed()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).StateFailed">TASK:StateFailed()</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Failed</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).StateHold">TASK_BASE:StateHold()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).StateHold">TASK:StateHold()</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Hold</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).StatePlanned">TASK_BASE:StatePlanned()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).StatePlanned">TASK:StatePlanned()</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Planned</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).StateReplanned">TASK_BASE:StateReplanned()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).StateReplanned">TASK:StateReplanned()</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Replanned</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).StateSuccess">TASK_BASE:StateSuccess()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).StateSuccess">TASK:StateSuccess()</a></td>
 		<td class="summary">
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Success</strong>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).TaskBriefing">TASK_BASE.TaskBriefing</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).Success">TASK:Success()</a></td>
+		<td class="summary">
+<p>FSM Success synchronous event function for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).TaskBriefing">TASK.TaskBriefing</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).TaskCategory">TASK_BASE.TaskCategory</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).TaskID">TASK.TaskID</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).TaskID">TASK_BASE.TaskID</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).TaskName">TASK.TaskName</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).TaskName">TASK_BASE.TaskName</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).TaskScheduler">TASK.TaskScheduler</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).TaskScheduler">TASK_BASE.TaskScheduler</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).TaskType">TASK.TaskType</a></td>
 		<td class="summary">
 
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).TaskType">TASK_BASE.TaskType</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).UnAssignFromGroups">TASK_BASE:UnAssignFromGroups()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).UnAssignFromGroups">TASK:UnAssignFromGroups()</a></td>
 		<td class="summary">
 <p>Assign the <a href="Task.html">Task</a> from the <a href="Group.html">Group</a>s.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE).UnAssignFromUnit">TASK_BASE:UnAssignFromUnit(TaskUnit, TaskUnitName)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).UnAssignFromUnit">TASK:UnAssignFromUnit(TaskUnit)</a></td>
 		<td class="summary">
 <p>UnAssign the <a href="Task.html">Task</a> from an alive <a href="Unit.html">Unit</a>.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE)._EventAssignUnit">TASK_BASE:_EventAssignUnit(Event)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).__Abort">TASK:__Abort()</a></td>
 		<td class="summary">
-<p>Register a potential new assignment for a new spawned <a href="Unit.html">Unit</a>.</p>
+<p>FSM Abort asynchronous event function for TASK.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE)._EventDead">TASK_BASE:_EventDead(Event)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).__Cancel">TASK:__Cancel()</a></td>
 		<td class="summary">
-<p>UnAssigns a <a href="Unit.html">Unit</a> that is left by a player, crashed, dead, ....</p>
+<p>FSM Cancel asynchronous event function for TASK.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE)._EventPlayerLeaveUnit">TASK_BASE:_EventPlayerLeaveUnit(Event)</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).__Fail">TASK:__Fail()</a></td>
 		<td class="summary">
-<p>Catches the "player leave unit" event for a <a href="Unit.html">Unit</a>  ....</p>
+<p>FSM Fail asynchronous event function for TASK.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE)._Schedule">TASK_BASE:_Schedule()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).__Replan">TASK:__Replan()</a></td>
 		<td class="summary">
-
+<p>FSM Replan asynchronous event function for TASK.</p>
 </td>
 		</tr>
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_BASE)._Scheduler">TASK_BASE:_Scheduler()</a></td>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).__Success">TASK:__Success()</a></td>
 		<td class="summary">
-
+<p>FSM Success asynchronous event function for TASK.</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).onenterAborted">TASK:onenterAborted(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a TASK</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).onenterAssigned">TASK:onenterAssigned(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a TASK</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).onenterFailed">TASK:onenterFailed(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a TASK</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).onenterSuccess">TASK:onenterSuccess(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a TASK</p>
+</td>
+		</tr>
+		<tr>
+		<td class="name" nowrap="nowrap"><a href="##(TASK).onstatechange">TASK:onstatechange(Event, From, To)</a></td>
+		<td class="summary">
+<p>FSM function for a TASK</p>
 </td>
 		</tr>
 	</table>
@@ -597,9 +695,23 @@ Use the method <a href="##(TASK_BASE).AddScore">TASK_BASE.AddScore</a>() to add
 		<dl class="function">
 <dt>
 
-		<em><a href="##(TASK_BASE)">#TASK_BASE</a></em>
-<a id="TASK_BASE" >
-<strong>TASK_BASE</strong>
+		<em></em>
+<a id="PlayerNameText" >
+<strong>PlayerNameText</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="##(TASK)">#TASK</a></em>
+<a id="TASK" >
+<strong>TASK</strong>
 </a>
 </dt>
 <dd>
@@ -610,117 +722,63 @@ Use the method <a href="##(TASK_BASE).AddScore">TASK_BASE.AddScore</a>() to add
 </dl>
 	<h2><a id="#(Task)" >Type <code>Task</code></a></h2>
 	
-			<h2><a id="#(TASK_BASE)" >Type <code>TASK_BASE</code></a></h2>
+			<h2><a id="#(TASK)" >Type <code>TASK</code></a></h2>
 				
-<p>The TASK_BASE class</p>
+<p>The TASK class</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).AddProcess" >
-<strong>TASK_BASE:AddProcess(TaskUnit, Process)</strong>
+<a id="#(TASK).Abort" >
+<strong>TASK:Abort()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Add Process to <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a>.</p>
+<p>FSM Abort synchronous event function for TASK.</p>
 
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em> Process </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="Process.html##(PROCESS)">Process#PROCESS</a>:</em>
-The process that was added.</p>
+	
+<p>Use this event to Abort the Task.</p>
 
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).AddScore" >
-<strong>TASK_BASE:AddScore(TaskStatus, ScoreText, Score)</strong>
+<a id="#(TASK).AbortUnit" >
+<strong>TASK:AbortUnit(PlayerUnit)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Adds a score for the TASK to be achieved.</p>
+<p>Abort a PlayerUnit from a Task.</p>
 
-		<h3>Parameters</h3>
+	
+<p>If the Unit was not part of the Task, false is returned.
+If the Unit is part of the Task, true is returned.</p>
+
+		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em>#string TaskStatus </em></code>: 
-is the status of the TASK when the score needs to be given.</p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string ScoreText </em></code>: 
-is a text describing the score that is given according the status.</p>
-
-				</li>
-				<li>
-				
-<p><code><em>#number Score </em></code>: 
-is a number providing the score of the status.</p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The CLIENT or UNIT of the Player aborting the Task.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
+<p><em>#boolean:</em>
+true if Unit is part of the Task.</p>
 
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).AddStateMachine" >
-<strong>TASK_BASE:AddStateMachine(TaskUnit, Fsm)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Add a FiniteStateMachine to <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em> Fsm </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).AssignToGroup" >
-<strong>TASK_BASE:AssignToGroup(TaskGroup)</strong>
+<a id="#(TASK).AssignToGroup" >
+<strong>TASK:AssignToGroup(TaskGroup)</strong>
 </a>
 </dt>
 <dd>
@@ -731,44 +789,65 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> TaskGroup </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).AssignToUnit" >
-<strong>TASK_BASE:AssignToUnit(TaskUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Assign the <a href="Task.html">Task</a>to an alive <a href="Unit.html">Unit</a>.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> TaskGroup </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).AssignToUnit" >
+<strong>TASK:AssignToUnit(TaskUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Assign the <a href="Task.html">Task</a> to an alive <a href="Unit.html">Unit</a>.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).Cancel" >
+<strong>TASK:Cancel()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Cancel synchronous event function for TASK.</p>
+
+	
+<p>Use this event to Cancel the Task.</p>
+
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 		<em>#string</em>
-<a id="#(TASK_BASE).ClassName" >
-<strong>TASK_BASE.ClassName</strong>
+<a id="#(TASK).ClassName" >
+<strong>TASK.ClassName</strong>
 </a>
 </dt>
 <dd>
@@ -780,17 +859,13 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).CleanUp" >
-<strong>TASK_BASE:CleanUp()</strong>
+		<em><a href="Tasking.CommandCenter.html##(COMMANDCENTER)">Tasking.CommandCenter#COMMANDCENTER</a></em>
+<a id="#(TASK).CommandCenter" >
+<strong>TASK.CommandCenter</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Cleans all references of a TASK_BASE.</p>
-
-		<h3>Return value</h3>
-				
-<p><em>#nil:</em></p>
 
 
 </dd>
@@ -798,35 +873,85 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).FailProcesses" >
-<strong>TASK_BASE:FailProcesses(TaskUnitName)</strong>
+<a id="#(TASK).CrashUnit" >
+<strong>TASK:CrashUnit(PlayerUnit)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Fail processes from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
+<p>A PlayerUnit crashed in a Task.</p>
+
+	
+<p>Abort the Player.
+If the Unit was not part of the Task, false is returned.
+If the Unit is part of the Task, true is returned.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em>#string TaskUnitName </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The CLIENT or UNIT of the Player aborting the Task.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
+<p><em>#boolean:</em>
+true if Unit is part of the Task.</p>
 
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-		<em><a href="StateMachine.html##(STATEMACHINE)">StateMachine#STATEMACHINE</a></em>
-<a id="#(TASK_BASE).Fsm" >
-<strong>TASK_BASE.Fsm</strong>
+<a id="#(TASK).Fail" >
+<strong>TASK:Fail()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Fail synchronous event function for TASK.</p>
+
+	
+<p>Use this event to Fail the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).FailProcesses" >
+<strong>TASK:FailProcesses(TaskUnitName)</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+	
+<p> TODO: Obscolete?
+- Fail processes from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a>
+ @param #TASK self
+ @param #string TaskUnitName
+ @return #TASK self</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> TaskUnitName </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a></em>
+<a id="#(TASK).FsmTemplate" >
+<strong>TASK.FsmTemplate</strong>
 </a>
 </dt>
 <dd>
@@ -838,26 +963,26 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetCategory" >
-<strong>TASK_BASE:GetCategory()</strong>
+<a id="#(TASK).GetGroups" >
+<strong>TASK:GetGroups()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Gets the Category of the Task</p>
+<p>Gets the SET_GROUP assigned to the TASK.</p>
 
 		<h3>Return value</h3>
 				
-<p><em>#string:</em>
-TaskCategory</p>
+<p><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a>:</em></p>
+
 
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetID" >
-<strong>TASK_BASE:GetID()</strong>
+<a id="#(TASK).GetID" >
+<strong>TASK:GetID()</strong>
 </a>
 </dt>
 <dd>
@@ -874,8 +999,26 @@ TaskID</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetName" >
-<strong>TASK_BASE:GetName()</strong>
+<a id="#(TASK).GetMission" >
+<strong>TASK:GetMission()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Gets the Mission to where the TASK belongs.</p>
+
+		<h3>Return value</h3>
+				
+<p><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).GetName" >
+<strong>TASK:GetName()</strong>
 </a>
 </dt>
 <dd>
@@ -892,8 +1035,34 @@ The Task Name</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetScoring" >
-<strong>TASK_BASE:GetScoring()</strong>
+<a id="#(TASK).GetProcessTemplate" >
+<strong>TASK:GetProcessTemplate(ProcessName)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Get the default or currently assigned <a href="Process.html">Process</a> template with key ProcessName.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em>#string ProcessName </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a>:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).GetScoring" >
+<strong>TASK:GetScoring()</strong>
 </a>
 </dt>
 <dd>
@@ -902,7 +1071,7 @@ The Task Name</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="Scoring.html##(SCORING)">Scoring#SCORING</a>:</em>
+<p><em><a href="Functional.Scoring.html##(SCORING)">Functional.Scoring#SCORING</a>:</em>
 Scoring</p>
 
 </dd>
@@ -910,8 +1079,8 @@ Scoring</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetStateString" >
-<strong>TASK_BASE:GetStateString()</strong>
+<a id="#(TASK).GetStateString" >
+<strong>TASK:GetStateString()</strong>
 </a>
 </dt>
 <dd>
@@ -923,13 +1092,13 @@ Scoring</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetTaskIndex" >
-<strong>TASK_BASE:GetTaskIndex()</strong>
+<a id="#(TASK).GetTaskIndex" >
+<strong>TASK:GetTaskIndex()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Gets the Task Index, which is a combination of the Task category, the Task type, the Task name.</p>
+<p>Gets the Task Index, which is a combination of the Task type, the Task name.</p>
 
 		<h3>Return value</h3>
 				
@@ -941,8 +1110,8 @@ The Task ID</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetTaskName" >
-<strong>TASK_BASE:GetTaskName()</strong>
+<a id="#(TASK).GetTaskName" >
+<strong>TASK:GetTaskName()</strong>
 </a>
 </dt>
 <dd>
@@ -959,8 +1128,8 @@ TaskName</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).GetType" >
-<strong>TASK_BASE:GetType()</strong>
+<a id="#(TASK).GetType" >
+<strong>TASK:GetType()</strong>
 </a>
 </dt>
 <dd>
@@ -977,45 +1146,55 @@ TaskType</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).HasStateMachine" >
-<strong>TASK_BASE:HasStateMachine(TaskUnitName)</strong>
+<a id="#(TASK).GetUnitProcess" >
+<strong>TASK:GetUnitProcess()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Checks if there is a FiniteStateMachine assigned to <a href="Unit.html">Unit</a> for <a href="Task.html">Task</a></p>
+<p>Get the Task FSM Process Template</p>
 
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string TaskUnitName </em></code>: </p>
-
-				</li>
-		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
+<p><em><a href="Core.Fsm.html##(FSM_PROCESS)">Core.Fsm#FSM_PROCESS</a>:</em></p>
+
 
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsAssignedToGroup" >
-<strong>TASK_BASE:IsAssignedToGroup(TaskGroup)</strong>
+<a id="#(TASK).HasAliveUnits" >
+<strong>TASK:HasAliveUnits()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Returns if the <a href="Task.html">Task</a> is assigned to the Group.</p>
+<p>Returns if the <a href="Task.html">Task</a> has still alive and assigned Units.</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).HasGroup" >
+<strong>TASK:HasGroup(FindGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> TaskGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> FindGroup </em></code>: </p>
 
 				</li>
 		</ul>
@@ -1029,8 +1208,60 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsStateAssigned" >
-<strong>TASK_BASE:IsStateAssigned()</strong>
+<a id="#(TASK).HasStateMachine" >
+<strong>TASK:HasStateMachine(TaskUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Checks if there is a FiniteStateMachine assigned to Task<a href="Unit.html">Unit</a> for <a href="Task.html">Task</a></p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(TASK)">#TASK</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).IsAssignedToGroup" >
+<strong>TASK:IsAssignedToGroup(TaskGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Returns if the <a href="Task.html">Task</a> is assigned to the Group.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> TaskGroup </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).IsStateAssigned" >
+<strong>TASK:IsStateAssigned()</strong>
 </a>
 </dt>
 <dd>
@@ -1042,8 +1273,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsStateFailed" >
-<strong>TASK_BASE:IsStateFailed()</strong>
+<a id="#(TASK).IsStateFailed" >
+<strong>TASK:IsStateFailed()</strong>
 </a>
 </dt>
 <dd>
@@ -1055,8 +1286,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsStateHold" >
-<strong>TASK_BASE:IsStateHold()</strong>
+<a id="#(TASK).IsStateHold" >
+<strong>TASK:IsStateHold()</strong>
 </a>
 </dt>
 <dd>
@@ -1068,8 +1299,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsStatePlanned" >
-<strong>TASK_BASE:IsStatePlanned()</strong>
+<a id="#(TASK).IsStatePlanned" >
+<strong>TASK:IsStatePlanned()</strong>
 </a>
 </dt>
 <dd>
@@ -1081,8 +1312,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsStateReplanned" >
-<strong>TASK_BASE:IsStateReplanned()</strong>
+<a id="#(TASK).IsStateReplanned" >
+<strong>TASK:IsStateReplanned()</strong>
 </a>
 </dt>
 <dd>
@@ -1094,8 +1325,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).IsStateSuccess" >
-<strong>TASK_BASE:IsStateSuccess()</strong>
+<a id="#(TASK).IsStateSuccess" >
+<strong>TASK:IsStateSuccess()</strong>
 </a>
 </dt>
 <dd>
@@ -1107,8 +1338,41 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).Menu" >
-<strong>TASK_BASE.Menu</strong>
+<a id="#(TASK).JoinUnit" >
+<strong>TASK:JoinUnit(PlayerUnit)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add a PlayerUnit to join the Task.</p>
+
+	
+<p>For each Group within the Task, the Unit is check if it can join the Task.
+If the Unit was not part of the Task, false is returned.
+If the Unit is part of the Task, true is returned.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The CLIENT or UNIT of the Player joining the Mission.</p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em>#boolean:</em>
+true if Unit is part of the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em></em>
+<a id="#(TASK).Menu" >
+<strong>TASK.Menu</strong>
 </a>
 </dt>
 <dd>
@@ -1120,21 +1384,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).MenuAbort" >
-<strong>TASK_BASE.MenuAbort</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).MenuAssignToGroup" >
-<strong>TASK_BASE.MenuAssignToGroup(MenuParam)</strong>
+<a id="#(TASK).MenuAssignToGroup" >
+<strong>TASK.MenuAssignToGroup(MenuParam)</strong>
 </a>
 </dt>
 <dd>
@@ -1154,21 +1405,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).MenuStatus" >
-<strong>TASK_BASE.MenuStatus</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).MenuTaskAbort" >
-<strong>TASK_BASE.MenuTaskAbort(MenuParam)</strong>
+<a id="#(TASK).MenuTaskAbort" >
+<strong>TASK.MenuTaskAbort(MenuParam)</strong>
 </a>
 </dt>
 <dd>
@@ -1188,8 +1426,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).MenuTaskStatus" >
-<strong>TASK_BASE.MenuTaskStatus(MenuParam)</strong>
+<a id="#(TASK).MenuTaskStatus" >
+<strong>TASK.MenuTaskStatus(MenuParam)</strong>
 </a>
 </dt>
 <dd>
@@ -1209,9 +1447,30 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Mission.html##(MISSION)">Mission#MISSION</a></em>
-<a id="#(TASK_BASE).Mission" >
-<strong>TASK_BASE.Mission</strong>
+<a id="#(TASK).MessageToGroups" >
+<strong>TASK:MessageToGroups(Message)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Send a message of the <a href="Task.html">Task</a> to the assigned <a href="Group.html">Group</a>s.</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Message </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a></em>
+<a id="#(TASK).Mission" >
+<strong>TASK.Mission</strong>
 </a>
 </dt>
 <dd>
@@ -1223,13 +1482,13 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).New" >
-<strong>TASK_BASE:New(The, SetGroup, TaskName, TaskType, TaskCategory, Mission)</strong>
+<a id="#(TASK).New" >
+<strong>TASK:New(Mission, SetGroupAssign, TaskName, TaskType)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Instantiates a new TASK_BASE.</p>
+<p>Instantiates a new TASK.</p>
 
 	
 <p>Should never be used. Interface Class.</p>
@@ -1238,13 +1497,13 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> The </em></code>: 
-mission wherein the Task is registered.</p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: 
+The mission wherein the Task is registered.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a> SetGroup </em></code>: 
+<p><code><em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a> SetGroupAssign </em></code>: 
 The set of groups for which the Task can be assigned.</p>
 
 				</li>
@@ -1259,22 +1518,11 @@ The name of the Task</p>
 <p><code><em>#string TaskType </em></code>: 
 The type of the Task</p>
 
-				</li>
-				<li>
-				
-<p><code><em>#string TaskCategory </em></code>: 
-The category of the Task (A2G, A2A, Transport, ... )</p>
-
-				</li>
-				<li>
-				
-<p><code><em> Mission </em></code>: </p>
-
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1282,44 +1530,26 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).OnAssigned" >
-<strong>TASK_BASE:OnAssigned(TaskUnit, Fsm, Event, From, To, Event)</strong>
+<a id="#(TASK).OnAfterPlayerAborted" >
+<strong>TASK:OnAfterPlayerAborted(PlayerUnit, PlayerName)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>StateMachine callback function for a TASK</p>
+<p>FSM PlayerAborted event handler prototype for TASK.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The Unit of the Player when he went back to spectators or left the mission.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em>#string PlayerName </em></code>: 
+The name of the Player.</p>
 
 				</li>
 		</ul>
@@ -1328,44 +1558,26 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).OnFailed" >
-<strong>TASK_BASE:OnFailed(TaskUnit, Fsm, Event, From, To, Event)</strong>
+<a id="#(TASK).OnAfterPlayerCrashed" >
+<strong>TASK:OnAfterPlayerCrashed(PlayerUnit, PlayerName)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>StateMachine callback function for a TASK</p>
+<p>FSM PlayerCrashed event handler prototype for TASK.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The Unit of the Player when he crashed in the mission.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em>#string PlayerName </em></code>: 
+The name of the Player.</p>
 
 				</li>
 		</ul>
@@ -1374,44 +1586,26 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).OnStateChange" >
-<strong>TASK_BASE:OnStateChange(TaskUnit, Fsm, Event, From, To, Event)</strong>
+<a id="#(TASK).OnAfterPlayerDead" >
+<strong>TASK:OnAfterPlayerDead(PlayerUnit, PlayerName)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>StateMachine callback function for a TASK</p>
+<p>FSM PlayerDead event handler prototype for TASK.</p>
 
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> PlayerUnit </em></code>: 
+The Unit of the Player when he died in the mission.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em>#string PlayerName </em></code>: 
+The name of the Player.</p>
 
 				</li>
 		</ul>
@@ -1420,54 +1614,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).OnSuccess" >
-<strong>TASK_BASE:OnSuccess(TaskUnit, Fsm, Event, From, To, Event)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function for a TASK</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-				<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="#(TASK_BASE).Players" >
-<strong>TASK_BASE.Players</strong>
+<a id="#(TASK).Players" >
+<strong>TASK.Players</strong>
 </a>
 </dt>
 <dd>
@@ -1479,8 +1627,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).Processes" >
-<strong>TASK_BASE.Processes</strong>
+		<em></em>
+<a id="#(TASK).ProcessClasses" >
+<strong>TASK.ProcessClasses</strong>
 </a>
 </dt>
 <dd>
@@ -1492,8 +1641,22 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).RemoveMenu" >
-<strong>TASK_BASE:RemoveMenu()</strong>
+		<em></em>
+<a id="#(TASK).Processes" >
+<strong>TASK.Processes</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).RemoveMenu" >
+<strong>TASK:RemoveMenu()</strong>
 </a>
 </dt>
 <dd>
@@ -1502,7 +1665,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1510,8 +1673,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).RemoveMenuForGroup" >
-<strong>TASK_BASE:RemoveMenuForGroup(TaskGroup)</strong>
+<a id="#(TASK).RemoveMenuForGroup" >
+<strong>TASK:RemoveMenuForGroup(TaskGroup)</strong>
 </a>
 </dt>
 <dd>
@@ -1522,13 +1685,13 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> TaskGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> TaskGroup </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1536,25 +1699,25 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).RemoveProcesses" >
-<strong>TASK_BASE:RemoveProcesses(TaskUnitName)</strong>
+<a id="#(TASK).RemoveStateMachine" >
+<strong>TASK:RemoveStateMachine(TaskUnit)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Remove Processes from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
+<p>Remove FiniteStateMachines from <a href="Task.html">Task</a> with key Task<a href="Unit.html">Unit</a></p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em>#string TaskUnitName </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1562,26 +1725,58 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).RemoveStateMachines" >
-<strong>TASK_BASE:RemoveStateMachines(TaskUnitName)</strong>
+<a id="#(TASK).Replan" >
+<strong>TASK:Replan()</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Remove FiniteStateMachines from <a href="Task.html">Task</a> with key <a href="Unit.html">Unit</a></p>
+<p>FSM Replan synchronous event function for TASK.</p>
 
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string TaskUnitName </em></code>: </p>
+	
+<p>Use this event to Replan the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).ReportDetails" >
+<strong>TASK:ReportDetails()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a detailed report of the Task.</p>
+
+	
+<p>List the Task Status, and the Players assigned to the Task.</p>
 
-				</li>
-		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
+<p><em>#string:</em></p>
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).ReportSummary" >
+<strong>TASK:ReportSummary()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Create a summary report of the Task.</p>
+
+	
+<p>List the Task Name and Status</p>
+
+		<h3>Return value</h3>
+				
+<p><em>#string:</em></p>
+
 
 </dd>
 </dl>
@@ -1589,8 +1784,8 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(TASK_BASE).Scores" >
-<strong>TASK_BASE.Scores</strong>
+<a id="#(TASK).Scores" >
+<strong>TASK.Scores</strong>
 </a>
 </dt>
 <dd>
@@ -1602,8 +1797,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SendBriefingToAssignedGroups" >
-<strong>TASK_BASE:SendBriefingToAssignedGroups()</strong>
+<a id="#(TASK).SendBriefingToAssignedGroups" >
+<strong>TASK:SendBriefingToAssignedGroups()</strong>
 </a>
 </dt>
 <dd>
@@ -1615,26 +1810,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetAssignedMenu" >
-<strong>TASK_BASE:SetAssignedMenu()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Set the menu options of the <a href="Task.html">Task</a> to all the groups in the SetGroup.</p>
-
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).SetAssignedMenuForGroup" >
-<strong>TASK_BASE:SetAssignedMenuForGroup(TaskGroup)</strong>
+<a id="#(TASK).SetAssignedMenuForGroup" >
+<strong>TASK:SetAssignedMenuForGroup(TaskGroup)</strong>
 </a>
 </dt>
 <dd>
@@ -1645,13 +1822,13 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> TaskGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> TaskGroup </em></code>: </p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1659,8 +1836,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetBriefing" >
-<strong>TASK_BASE:SetBriefing(TaskBriefing)</strong>
+<a id="#(TASK).SetBriefing" >
+<strong>TASK:SetBriefing(TaskBriefing)</strong>
 </a>
 </dt>
 <dd>
@@ -1677,7 +1854,7 @@ self</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1685,30 +1862,9 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetCategory" >
-<strong>TASK_BASE:SetCategory(TaskCategory)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Sets the Category of the Task</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em>#string TaskCategory </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="Set.html##(SET_GROUP)">Set#SET_GROUP</a></em>
-<a id="#(TASK_BASE).SetGroup" >
-<strong>TASK_BASE.SetGroup</strong>
+		<em><a href="Core.Set.html##(SET_GROUP)">Core.Set#SET_GROUP</a></em>
+<a id="#(TASK).SetGroup" >
+<strong>TASK.SetGroup</strong>
 </a>
 </dt>
 <dd>
@@ -1720,8 +1876,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetID" >
-<strong>TASK_BASE:SetID(TaskID)</strong>
+<a id="#(TASK).SetID" >
+<strong>TASK:SetID(TaskID)</strong>
 </a>
 </dt>
 <dd>
@@ -1741,8 +1897,42 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetName" >
-<strong>TASK_BASE:SetName(TaskName)</strong>
+<a id="#(TASK).SetMenu" >
+<strong>TASK:SetMenu()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Set the menu options of the <a href="Task.html">Task</a> to all the groups in the SetGroup.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).SetMenuForGroup" >
+<strong>TASK:SetMenuForGroup(TaskGroup)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Set the Menu for a Group</p>
+
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em> TaskGroup </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).SetName" >
+<strong>TASK:SetName(TaskName)</strong>
 </a>
 </dt>
 <dd>
@@ -1762,26 +1952,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetPlannedMenu" >
-<strong>TASK_BASE:SetPlannedMenu()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Set the menu options of the <a href="Task.html">Task</a> to all the groups in the SetGroup.</p>
-
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).SetPlannedMenuForGroup" >
-<strong>TASK_BASE:SetPlannedMenuForGroup(TaskGroup, MenuText)</strong>
+<a id="#(TASK).SetPlannedMenuForGroup" >
+<strong>TASK:SetPlannedMenuForGroup(TaskGroup, MenuText)</strong>
 </a>
 </dt>
 <dd>
@@ -1792,7 +1964,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> TaskGroup </em></code>: </p>
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> TaskGroup </em></code>: </p>
 
 				</li>
 				<li>
@@ -1804,7 +1976,7 @@ The menu text.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
+<p><em><a href="##(TASK)">#TASK</a>:</em>
 self</p>
 
 </dd>
@@ -1812,8 +1984,39 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).SetType" >
-<strong>TASK_BASE:SetType(TaskType)</strong>
+<a id="#(TASK).SetStateMachine" >
+<strong>TASK:SetStateMachine(TaskUnit, Fsm)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Add a FiniteStateMachine to <a href="Task.html">Task</a> with key Task<a href="Unit.html">Unit</a></p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em> Fsm </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(TASK)">#TASK</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).SetType" >
+<strong>TASK:SetType(TaskType)</strong>
 </a>
 </dt>
 <dd>
@@ -1833,8 +2036,35 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).StateAssigned" >
-<strong>TASK_BASE:StateAssigned()</strong>
+<a id="#(TASK).SetUnitProcess" >
+<strong>TASK:SetUnitProcess(Core, FsmTemplate)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>Sets the Task FSM Process Template</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
+				
+<p><code><em> Core </em></code>: 
+Fsm#FSM_PROCESS</p>
+
+				</li>
+				<li>
+				
+<p><code><em> FsmTemplate </em></code>: </p>
+
+				</li>
+		</ul>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).StateAssigned" >
+<strong>TASK:StateAssigned()</strong>
 </a>
 </dt>
 <dd>
@@ -1846,8 +2076,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).StateFailed" >
-<strong>TASK_BASE:StateFailed()</strong>
+<a id="#(TASK).StateFailed" >
+<strong>TASK:StateFailed()</strong>
 </a>
 </dt>
 <dd>
@@ -1859,8 +2089,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).StateHold" >
-<strong>TASK_BASE:StateHold()</strong>
+<a id="#(TASK).StateHold" >
+<strong>TASK:StateHold()</strong>
 </a>
 </dt>
 <dd>
@@ -1872,8 +2102,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).StatePlanned" >
-<strong>TASK_BASE:StatePlanned()</strong>
+<a id="#(TASK).StatePlanned" >
+<strong>TASK:StatePlanned()</strong>
 </a>
 </dt>
 <dd>
@@ -1885,8 +2115,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).StateReplanned" >
-<strong>TASK_BASE:StateReplanned()</strong>
+<a id="#(TASK).StateReplanned" >
+<strong>TASK:StateReplanned()</strong>
 </a>
 </dt>
 <dd>
@@ -1898,22 +2128,38 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).StateSuccess" >
-<strong>TASK_BASE:StateSuccess()</strong>
+<a id="#(TASK).StateSuccess" >
+<strong>TASK:StateSuccess()</strong>
 </a>
 </dt>
 <dd>
 	
 <p>Sets a <a href="Task.html">Task</a> to status <strong>Success</strong>.</p>
 
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).Success" >
+<strong>TASK:Success()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Success synchronous event function for TASK.</p>
+
+	
+<p>Use this event to make the Task a Success.</p>
+
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
 		<em></em>
-<a id="#(TASK_BASE).TaskBriefing" >
-<strong>TASK_BASE.TaskBriefing</strong>
+<a id="#(TASK).TaskBriefing" >
+<strong>TASK.TaskBriefing</strong>
 </a>
 </dt>
 <dd>
@@ -1926,8 +2172,8 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(TASK_BASE).TaskCategory" >
-<strong>TASK_BASE.TaskCategory</strong>
+<a id="#(TASK).TaskID" >
+<strong>TASK.TaskID</strong>
 </a>
 </dt>
 <dd>
@@ -1940,8 +2186,22 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(TASK_BASE).TaskID" >
-<strong>TASK_BASE.TaskID</strong>
+<a id="#(TASK).TaskName" >
+<strong>TASK.TaskName</strong>
+</a>
+</dt>
+<dd>
+	
+
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+		<em><a href="Core.Scheduler.html##(SCHEDULER)">Core.Scheduler#SCHEDULER</a></em>
+<a id="#(TASK).TaskScheduler" >
+<strong>TASK.TaskScheduler</strong>
 </a>
 </dt>
 <dd>
@@ -1954,8 +2214,8 @@ self</p>
 <dt>
 
 		<em></em>
-<a id="#(TASK_BASE).TaskName" >
-<strong>TASK_BASE.TaskName</strong>
+<a id="#(TASK).TaskType" >
+<strong>TASK.TaskType</strong>
 </a>
 </dt>
 <dd>
@@ -1967,36 +2227,8 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Scheduler.html##(SCHEDULER)">Scheduler#SCHEDULER</a></em>
-<a id="#(TASK_BASE).TaskScheduler" >
-<strong>TASK_BASE.TaskScheduler</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(TASK_BASE).TaskType" >
-<strong>TASK_BASE.TaskType</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE).UnAssignFromGroups" >
-<strong>TASK_BASE:UnAssignFromGroups()</strong>
+<a id="#(TASK).UnAssignFromGroups" >
+<strong>TASK:UnAssignFromGroups()</strong>
 </a>
 </dt>
 <dd>
@@ -2008,151 +2240,262 @@ self</p>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE).UnAssignFromUnit" >
-<strong>TASK_BASE:UnAssignFromUnit(TaskUnit, TaskUnitName)</strong>
+<a id="#(TASK).UnAssignFromUnit" >
+<strong>TASK:UnAssignFromUnit(TaskUnit)</strong>
 </a>
 </dt>
 <dd>
 	
 <p>UnAssign the <a href="Task.html">Task</a> from an alive <a href="Unit.html">Unit</a>.</p>
 
+		<h3>Parameter</h3>
+		<ul>
+				<li>
+				
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
+
+				</li>
+		</ul>
+		<h3>Return value</h3>
+				
+<p><em><a href="##(TASK)">#TASK</a>:</em>
+self</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).__Abort" >
+<strong>TASK:__Abort()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Abort asynchronous event function for TASK.</p>
+
+	
+<p>Use this event to Abort the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).__Cancel" >
+<strong>TASK:__Cancel()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Cancel asynchronous event function for TASK.</p>
+
+	
+<p>Use this event to Cancel the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).__Fail" >
+<strong>TASK:__Fail()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Fail asynchronous event function for TASK.</p>
+
+	
+<p>Use this event to Fail the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).__Replan" >
+<strong>TASK:__Replan()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Replan asynchronous event function for TASK.</p>
+
+	
+<p>Use this event to Replan the Task.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).__Success" >
+<strong>TASK:__Success()</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM Success asynchronous event function for TASK.</p>
+
+	
+<p>Use this event to make the Task a Success.</p>
+
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).onenterAborted" >
+<strong>TASK:onenterAborted(Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM function for a TASK</p>
+
 		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em>#string Event </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em> TaskUnitName </em></code>: </p>
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
 
 				</li>
 		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
-
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE)._EventAssignUnit" >
-<strong>TASK_BASE:_EventAssignUnit(Event)</strong>
+<a id="#(TASK).onenterAssigned" >
+<strong>TASK:onenterAssigned(Event, From, To)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Register a potential new assignment for a new spawned <a href="Unit.html">Unit</a>.</p>
+<p>FSM function for a TASK</p>
 
-	
-<p>Tasks only get assigned if there are players in it.</p>
-
-		<h3>Parameter</h3>
+		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
 
 				</li>
 		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
-
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE)._EventDead" >
-<strong>TASK_BASE:_EventDead(Event)</strong>
+<a id="#(TASK).onenterFailed" >
+<strong>TASK:onenterFailed(Event, From, To)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>UnAssigns a <a href="Unit.html">Unit</a> that is left by a player, crashed, dead, ....</p>
+<p>FSM function for a TASK</p>
 
-	
-<p>There are only assignments if there are players in it.</p>
-
-		<h3>Parameter</h3>
+		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
 
 				</li>
 		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
-
 </dd>
 </dl>
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_BASE)._EventPlayerLeaveUnit" >
-<strong>TASK_BASE:_EventPlayerLeaveUnit(Event)</strong>
+<a id="#(TASK).onenterSuccess" >
+<strong>TASK:onenterSuccess(Event, From, To)</strong>
 </a>
 </dt>
 <dd>
 	
-<p>Catches the "player leave unit" event for a <a href="Unit.html">Unit</a>  ....</p>
+<p>FSM function for a TASK</p>
 
-	
-<p>When a player is an air unit, and leaves the unit:</p>
-
-<ul>
-    <li>and he is not at an airbase runway on the ground, he will fail its task.</li>
-    <li>and he is on an airbase and on the ground, the process for him will just continue to work, he can switch airplanes, and take-off again.
-    This is important to model the change from plane types for a player during mission assignment.</li>
-</ul>
-
-		<h3>Parameter</h3>
+		<h3>Parameters</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
+<p><code><em>#string Event </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
+
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
 
 				</li>
 		</ul>
-		<h3>Return value</h3>
+</dd>
+</dl>
+		<dl class="function">
+<dt>
+
+<a id="#(TASK).onstatechange" >
+<strong>TASK:onstatechange(Event, From, To)</strong>
+</a>
+</dt>
+<dd>
+	
+<p>FSM function for a TASK</p>
+
+		<h3>Parameters</h3>
+		<ul>
+				<li>
 				
-<p><em><a href="##(TASK_BASE)">#TASK_BASE</a>:</em>
-self</p>
+<p><code><em>#string Event </em></code>: </p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE)._Schedule" >
-<strong>TASK_BASE:_Schedule()</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_BASE)._Scheduler" >
-<strong>TASK_BASE:_Scheduler()</strong>
-</a>
-</dt>
-<dd>
-	
+				</li>
+				<li>
+				
+<p><code><em>#string From </em></code>: </p>
 
+				</li>
+				<li>
+				
+<p><code><em>#string To </em></code>: </p>
 
+				</li>
+		</ul>
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/Task_A2G.html b/Moose Training/Documentation/Task_A2G.html
index 7273829e6..9737bad70 100644
--- a/Moose Training/Documentation/Task_A2G.html	
+++ b/Moose Training/Documentation/Task_A2G.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,15 +89,15 @@
 
    
 
-<h1>1) <a href="##(TASK_A2G)">#TASK_A2G</a> class, extends <a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a></h1>
+<h1>1) <a href="##(TASK_A2G)">#TASK_A2G</a> class, extends <a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></h1>
 <p>The <a href="##(TASK_A2G)">#TASK_A2G</a> class defines a CAS or BAI task of a <a href="Set.html">Set</a> of Target Units, 
-located at a Target Zone, based on the tasking capabilities defined in <a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a>.
-The TASK_A2G is implemented using a <a href="Statemachine.html##(STATEMACHINE_TASK)">Statemachine#STATEMACHINE_TASK</a>, and has the following statuses:</p>
+located at a Target Zone, based on the tasking capabilities defined in <a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>.
+The TASK_A2G is implemented using a <a href="Statemachine.html##(FSM_TASK)">Statemachine#FSM_TASK</a>, and has the following statuses:</p>
 
 <ul>
     <li><strong>None</strong>: Start of the process</li>
-    <li><strong>Planned</strong>: The SEAD task is planned. Upon Planned, the sub-process <a href="Process_Assign.html##(PROCESS_ASSIGN_ACCEPT)">Process<em>Assign#PROCESS</em>ASSIGN_ACCEPT</a> is started to accept the task.</li>
-    <li><strong>Assigned</strong>: The SEAD task is assigned to a <a href="Group.html##(GROUP)">Group#GROUP</a>. Upon Assigned, the sub-process <a href="Process_Route.html##(PROCESS_ROUTE)">Process<em>Route#PROCESS</em>ROUTE</a> is started to route the active Units in the Group to the attack zone.</li>
+    <li><strong>Planned</strong>: The SEAD task is planned. Upon Planned, the sub-process <a href="Process_Fsm.Assign.html##(ACT_ASSIGN_ACCEPT)">Process<em>Fsm.Assign#ACT</em>ASSIGN_ACCEPT</a> is started to accept the task.</li>
+    <li><strong>Assigned</strong>: The SEAD task is assigned to a <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>. Upon Assigned, the sub-process <a href="Process_Fsm.Route.html##(ACT_ROUTE)">Process<em>Fsm.Route#ACT</em>ROUTE</a> is started to route the active Units in the Group to the attack zone.</li>
     <li><strong>Success</strong>: The SEAD task is successfully completed. Upon Success, the sub-process <a href="Process_SEAD.html##(PROCESS_SEAD)">Process<em>SEAD#PROCESS</em>SEAD</a> is started to follow-up successful SEADing of the targets assigned in the task.</li>
     <li><strong>Failed</strong>: The SEAD task has failed. This will happen if the player exists the task early, without communicating a possible cancellation to HQ.</li>
 </ul>
@@ -117,21 +119,9 @@ The TASK_A2G is implemented using a <a href="Statemachine.html##(STATEMACHINE_TA
 			<h2><a id="#(TASK_A2G)">Type <code>TASK_A2G</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G).AssignToUnit">TASK_A2G:AssignToUnit(TaskUnit)</a></td>
-		<td class="summary">
-<p>Assign the <a href="Task.html">Task</a> to a <a href="Unit.html">Unit</a>.</p>
-</td>
-		</tr>
-		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G).ClassName">TASK_A2G.ClassName</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G).CleanUp">TASK_A2G:CleanUp()</a></td>
-		<td class="summary">
-<p>Removes a TASK_A2G.</p>
 </td>
 		</tr>
 		<tr>
@@ -144,30 +134,6 @@ The TASK_A2G is implemented using a <a href="Statemachine.html##(STATEMACHINE_TA
 		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G).New">TASK_A2G:New(Mission, SetGroup, TaskName, TaskType, UnitSetTargets, TargetZone, TargetSetUnit, FACUnit)</a></td>
 		<td class="summary">
 <p>Instantiates a new TASK_A2G.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G).OnNext">TASK_A2G:OnNext(Fsm, Event, From, To, Event)</a></td>
-		<td class="summary">
-<p>StateMachine callback function for a TASK</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G).TaskScheduler">TASK_A2G.TaskScheduler</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G)._Schedule">TASK_A2G:_Schedule()</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_A2G)._Scheduler">TASK_A2G:_Scheduler()</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 	</table>
@@ -197,32 +163,6 @@ The TASK_A2G is implemented using a <a href="Statemachine.html##(STATEMACHINE_TA
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_A2G).AssignToUnit" >
-<strong>TASK_A2G:AssignToUnit(TaskUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Assign the <a href="Task.html">Task</a> to a <a href="Unit.html">Unit</a>.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_A2G)">#TASK_A2G</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
 		<em>#string</em>
 <a id="#(TASK_A2G).ClassName" >
 <strong>TASK_A2G.ClassName</strong>
@@ -232,24 +172,6 @@ self</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_A2G).CleanUp" >
-<strong>TASK_A2G:CleanUp()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Removes a TASK_A2G.</p>
-
-		<h3>Return value</h3>
-				
-<p><em>#nil:</em></p>
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -280,7 +202,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> Mission </em></code>: </p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
 
 				</li>
 				<li>
@@ -308,7 +230,7 @@ BAI or CAS</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
 
 				</li>
 				<li>
@@ -327,87 +249,6 @@ BAI or CAS</p>
 <p><em><a href="##(TASK_A2G)">#TASK_A2G</a>:</em>
 self</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_A2G).OnNext" >
-<strong>TASK_A2G:OnNext(Fsm, Event, From, To, Event)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function for a TASK</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
-
-				</li>
-		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em></em>
-<a id="#(TASK_A2G).TaskScheduler" >
-<strong>TASK_A2G.TaskScheduler</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_A2G)._Schedule" >
-<strong>TASK_A2G:_Schedule()</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_A2G)._Scheduler" >
-<strong>TASK_A2G:_Scheduler()</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/Task_Client_Menu.html b/Moose Training/Documentation/Task_Client_Menu.html
index 3d1bd3e84..5fd5fc3d4 100644
--- a/Moose Training/Documentation/Task_Client_Menu.html	
+++ b/Moose Training/Documentation/Task_Client_Menu.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -244,7 +246,7 @@
 		<dl class="function">
 <dt>
 
-		<em><a href="Menu.html##(MENU_CLIENT_COMMAND)">Menu#MENU_CLIENT_COMMAND</a></em>
+		<em><a href="Core.Menu.html##(MENU_CLIENT_COMMAND)">Core.Menu#MENU_CLIENT_COMMAND</a></em>
 <a id="#(TASK2_MENU_CLIENT).MenuTask" >
 <strong>TASK2_MENU_CLIENT.MenuTask</strong>
 </a>
@@ -284,12 +286,12 @@
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> Mission </em></code>: </p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
 
 				</li>
 				<li>
@@ -321,7 +323,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_TASK)">Core.Fsm#FSM_TASK</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -357,7 +359,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_TASK)">Core.Fsm#FSM_TASK</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
@@ -381,7 +383,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Set.html##(SET_UNIT)">Set#SET_UNIT</a></em>
+		<em><a href="Core.Set.html##(SET_UNIT)">Core.Set#SET_UNIT</a></em>
 <a id="#(TASK2_MENU_CLIENT).TargetSet" >
 <strong>TASK2_MENU_CLIENT.TargetSet</strong>
 </a>
@@ -395,7 +397,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(TASK2_MENU_CLIENT).TaskUnit" >
 <strong>TASK2_MENU_CLIENT.TaskUnit</strong>
 </a>
diff --git a/Moose Training/Documentation/Task_PICKUP.html b/Moose Training/Documentation/Task_PICKUP.html
index d9e9376cd..db5837309 100644
--- a/Moose Training/Documentation/Task_PICKUP.html	
+++ b/Moose Training/Documentation/Task_PICKUP.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li>Task_PICKUP</li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,15 +89,15 @@
 
    
 
-<h1>1) <a href="##(TASK_PICKUP)">#TASK_PICKUP</a> class, extends <a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a></h1>
+<h1>1) <a href="##(TASK_PICKUP)">#TASK_PICKUP</a> class, extends <a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></h1>
 <p>The <a href="##(TASK_PICKUP)">#TASK_PICKUP</a> class defines a pickup task of a <a href="Set.html">Set</a> of <a href="CARGO.html">CARGO</a> objects defined within the mission. 
-based on the tasking capabilities defined in <a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a>.
-The TASK_PICKUP is implemented using a <a href="Statemachine.html##(STATEMACHINE_TASK)">Statemachine#STATEMACHINE_TASK</a>, and has the following statuses:</p>
+based on the tasking capabilities defined in <a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>.
+The TASK_PICKUP is implemented using a <a href="Statemachine.html##(FSM_TASK)">Statemachine#FSM_TASK</a>, and has the following statuses:</p>
 
 <ul>
     <li><strong>None</strong>: Start of the process</li>
-    <li><strong>Planned</strong>: The SEAD task is planned. Upon Planned, the sub-process <a href="Process_Assign.html##(PROCESS_ASSIGN_ACCEPT)">Process<em>Assign#PROCESS</em>ASSIGN_ACCEPT</a> is started to accept the task.</li>
-    <li><strong>Assigned</strong>: The SEAD task is assigned to a <a href="Group.html##(GROUP)">Group#GROUP</a>. Upon Assigned, the sub-process <a href="Process_Route.html##(PROCESS_ROUTE)">Process<em>Route#PROCESS</em>ROUTE</a> is started to route the active Units in the Group to the attack zone.</li>
+    <li><strong>Planned</strong>: The SEAD task is planned. Upon Planned, the sub-process <a href="Process_Fsm.Assign.html##(ACT_ASSIGN_ACCEPT)">Process<em>Fsm.Assign#ACT</em>ASSIGN_ACCEPT</a> is started to accept the task.</li>
+    <li><strong>Assigned</strong>: The SEAD task is assigned to a <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>. Upon Assigned, the sub-process <a href="Process_Fsm.Route.html##(ACT_ROUTE)">Process<em>Fsm.Route#ACT</em>ROUTE</a> is started to route the active Units in the Group to the attack zone.</li>
     <li><strong>Success</strong>: The SEAD task is successfully completed. Upon Success, the sub-process <a href="Process_SEAD.html##(PROCESS_SEAD)">Process<em>SEAD#PROCESS</em>SEAD</a> is started to follow-up successful SEADing of the targets assigned in the task.</li>
     <li><strong>Failed</strong>: The SEAD task has failed. This will happen if the player exists the task early, without communicating a possible cancellation to HQ.</li>
 </ul>
@@ -209,7 +211,7 @@ The TASK_PICKUP is implemented using a <a href="Statemachine.html##(STATEMACHINE
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> TaskUnit </em></code>: </p>
 
 				</li>
 		</ul>
@@ -280,7 +282,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> Mission </em></code>: </p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
 
 				</li>
 				<li>
@@ -308,7 +310,7 @@ BAI or CAS</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
 
 				</li>
 		</ul>
@@ -334,7 +336,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
+<p><code><em><a href="Core.Fsm.html##(FSM_TASK)">Core.Fsm#FSM_TASK</a> Fsm </em></code>: </p>
 
 				</li>
 				<li>
diff --git a/Moose Training/Documentation/Task_SEAD.html b/Moose Training/Documentation/Task_SEAD.html
index c734a3f23..a645f9be7 100644
--- a/Moose Training/Documentation/Task_SEAD.html	
+++ b/Moose Training/Documentation/Task_SEAD.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li>Task_SEAD</li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,15 +89,15 @@
 
    
 
-<h1>1) <a href="##(TASK_SEAD)">#TASK_SEAD</a> class, extends <a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a></h1>
+<h1>1) <a href="##(TASK_SEAD)">#TASK_SEAD</a> class, extends <a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a></h1>
 <p>The <a href="##(TASK_SEAD)">#TASK_SEAD</a> class defines a SEAD task for a <a href="Set.html">Set</a> of Target Units, located at a Target Zone, 
-based on the tasking capabilities defined in <a href="Task.html##(TASK_BASE)">Task#TASK_BASE</a>.
-The TASK_SEAD is implemented using a <a href="Statemachine.html##(STATEMACHINE_TASK)">Statemachine#STATEMACHINE_TASK</a>, and has the following statuses:</p>
+based on the tasking capabilities defined in <a href="Tasking.Task.html##(TASK)">Tasking.Task#TASK</a>.
+The TASK_SEAD is implemented using a <a href="Statemachine.html##(FSM_TASK)">Statemachine#FSM_TASK</a>, and has the following statuses:</p>
 
 <ul>
     <li><strong>None</strong>: Start of the process</li>
-    <li><strong>Planned</strong>: The SEAD task is planned. Upon Planned, the sub-process <a href="Process_Assign.html##(PROCESS_ASSIGN_ACCEPT)">Process<em>Assign#PROCESS</em>ASSIGN_ACCEPT</a> is started to accept the task.</li>
-    <li><strong>Assigned</strong>: The SEAD task is assigned to a <a href="Group.html##(GROUP)">Group#GROUP</a>. Upon Assigned, the sub-process <a href="Process_Route.html##(PROCESS_ROUTE)">Process<em>Route#PROCESS</em>ROUTE</a> is started to route the active Units in the Group to the attack zone.</li>
+    <li><strong>Planned</strong>: The SEAD task is planned. Upon Planned, the sub-process <a href="Process_Fsm.Assign.html##(ACT_ASSIGN_ACCEPT)">Process<em>Fsm.Assign#ACT</em>ASSIGN_ACCEPT</a> is started to accept the task.</li>
+    <li><strong>Assigned</strong>: The SEAD task is assigned to a <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>. Upon Assigned, the sub-process <a href="Process_Fsm.Route.html##(ACT_ROUTE)">Process<em>Fsm.Route#ACT</em>ROUTE</a> is started to route the active Units in the Group to the attack zone.</li>
     <li><strong>Success</strong>: The SEAD task is successfully completed. Upon Success, the sub-process <a href="Process_SEAD.html##(PROCESS_SEAD)">Process<em>SEAD#PROCESS</em>SEAD</a> is started to follow-up successful SEADing of the targets assigned in the task.</li>
     <li><strong>Failed</strong>: The SEAD task has failed. This will happen if the player exists the task early, without communicating a possible cancellation to HQ.</li>
 </ul>
@@ -117,21 +119,9 @@ The TASK_SEAD is implemented using a <a href="Statemachine.html##(STATEMACHINE_T
 			<h2><a id="#(TASK_SEAD)">Type <code>TASK_SEAD</code></a></h2>
 				<table class="function_list">
 		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_SEAD).AssignToUnit">TASK_SEAD:AssignToUnit(TaskUnit)</a></td>
-		<td class="summary">
-<p>Assign the <a href="Task.html">Task</a> to a <a href="Unit.html">Unit</a>.</p>
-</td>
-		</tr>
-		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(TASK_SEAD).ClassName">TASK_SEAD.ClassName</a></td>
 		<td class="summary">
 
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_SEAD).CleanUp">TASK_SEAD:CleanUp()</a></td>
-		<td class="summary">
-<p>Removes a TASK_SEAD.</p>
 </td>
 		</tr>
 		<tr>
@@ -144,12 +134,6 @@ The TASK_SEAD is implemented using a <a href="Statemachine.html##(STATEMACHINE_T
 		<td class="name" nowrap="nowrap"><a href="##(TASK_SEAD).New">TASK_SEAD:New(Mission, SetGroup, TaskName, UnitSetTargets, TargetZone, TargetSetUnit)</a></td>
 		<td class="summary">
 <p>Instantiates a new TASK_SEAD.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(TASK_SEAD).OnNext">TASK_SEAD:OnNext(Fsm, Event, From, To, Event)</a></td>
-		<td class="summary">
-<p>StateMachine callback function for a TASK</p>
 </td>
 		</tr>
 		<tr>
@@ -185,32 +169,6 @@ The TASK_SEAD is implemented using a <a href="Statemachine.html##(STATEMACHINE_T
 		<dl class="function">
 <dt>
 
-<a id="#(TASK_SEAD).AssignToUnit" >
-<strong>TASK_SEAD:AssignToUnit(TaskUnit)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Assign the <a href="Task.html">Task</a> to a <a href="Unit.html">Unit</a>.</p>
-
-		<h3>Parameter</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> TaskUnit </em></code>: </p>
-
-				</li>
-		</ul>
-		<h3>Return value</h3>
-				
-<p><em><a href="##(TASK_SEAD)">#TASK_SEAD</a>:</em>
-self</p>
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
 		<em>#string</em>
 <a id="#(TASK_SEAD).ClassName" >
 <strong>TASK_SEAD.ClassName</strong>
@@ -220,24 +178,6 @@ self</p>
 	
 
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_SEAD).CleanUp" >
-<strong>TASK_SEAD:CleanUp()</strong>
-</a>
-</dt>
-<dd>
-	
-<p>Removes a TASK_SEAD.</p>
-
-		<h3>Return value</h3>
-				
-<p><em>#nil:</em></p>
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -268,7 +208,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Mission.html##(MISSION)">Mission#MISSION</a> Mission </em></code>: </p>
+<p><code><em><a href="Tasking.Mission.html##(MISSION)">Tasking.Mission#MISSION</a> Mission </em></code>: </p>
 
 				</li>
 				<li>
@@ -290,7 +230,7 @@ The name of the Task.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> TargetZone </em></code>: </p>
 
 				</li>
 				<li>
@@ -304,47 +244,6 @@ The name of the Task.</p>
 <p><em><a href="##(TASK_SEAD)">#TASK_SEAD</a>:</em>
 self</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(TASK_SEAD).OnNext" >
-<strong>TASK_SEAD:OnNext(Fsm, Event, From, To, Event)</strong>
-</a>
-</dt>
-<dd>
-	
-<p>StateMachine callback function for a TASK</p>
-
-		<h3>Parameters</h3>
-		<ul>
-				<li>
-				
-<p><code><em><a href="StateMachine.html##(STATEMACHINE_TASK)">StateMachine#STATEMACHINE_TASK</a> Fsm </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string Event </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string From </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em>#string To </em></code>: </p>
-
-				</li>
-				<li>
-				
-<p><code><em><a href="Event.html##(EVENTDATA)">Event#EVENTDATA</a> Event </em></code>: </p>
-
-				</li>
-		</ul>
 </dd>
 </dl>
 		<dl class="function">
diff --git a/Moose Training/Documentation/Unit.html b/Moose Training/Documentation/Unit.html
index 34dceef48..4f609ac2b 100644
--- a/Moose Training/Documentation/Unit.html	
+++ b/Moose Training/Documentation/Unit.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li>Unit</li>
+					<li><a href="Utils.html">Utils</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">
@@ -87,8 +89,8 @@
 
    
 
-<h1>1) <a href="Unit.html##(UNIT)">Unit#UNIT</a> class, extends <a href="Controllable.html##(CONTROLLABLE)">Controllable#CONTROLLABLE</a></h1>
-<p>The <a href="Unit.html##(UNIT)">Unit#UNIT</a> class is a wrapper class to handle the DCS Unit objects:</p>
+<h1>1) <a href="##(UNIT)">#UNIT</a> class, extends <a href="Wrapper.Controllable.html##(CONTROLLABLE)">Wrapper.Controllable#CONTROLLABLE</a></h1>
+<p>The <a href="##(UNIT)">#UNIT</a> class is a wrapper class to handle the DCS Unit objects:</p>
 
 <ul>
     <li>Support all DCS Unit APIs.</li>
@@ -121,7 +123,7 @@ If the DCS Unit object does not exist or is nil, the UNIT methods will return ni
 <h2>1.2) DCS UNIT APIs</h2>
 <p>The DCS Unit APIs are used extensively within MOOSE. The UNIT class has for each DCS Unit API a corresponding method.
 To be able to distinguish easily in your code the difference between a UNIT API call and a DCS Unit API call,
-the first letter of the method is also capitalized. So, by example, the DCS Unit method <a href="DCSUnit.html##(Unit).getName">DCSUnit#Unit.getName</a>()
+the first letter of the method is also capitalized. So, by example, the DCS Unit method <a href="Dcs.DCSWrapper.Unit.html##(Unit).getName">Dcs.DCSWrapper.Unit#Unit.getName</a>()
 is implemented in the UNIT class as <a href="##(UNIT).GetName">UNIT.GetName</a>().</p>
 
 <h2>1.3) Smoke, Flare Units</h2>
@@ -144,7 +146,7 @@ If you want to obtain the complete <strong>3D position</strong> including ori�
 <p>The UNIT class contains methods to test the location or proximity against zones or other objects.</p>
 
 <h3>1.6.1) Zones</h3>
-<p>To test whether the Unit is within a <strong>zone</strong>, use the <a href="##(UNIT).IsInZone">UNIT.IsInZone</a>() or the <a href="##(UNIT).IsNotInZone">UNIT.IsNotInZone</a>() methods. Any zone can be tested on, but the zone must be derived from <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>. </p>
+<p>To test whether the Unit is within a <strong>zone</strong>, use the <a href="##(UNIT).IsInZone">UNIT.IsInZone</a>() or the <a href="##(UNIT).IsNotInZone">UNIT.IsNotInZone</a>() methods. Any zone can be tested on, but the zone must be derived from <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>. </p>
 
 <h3>1.6.2) Units</h3>
 <p>Test if another DCS Unit is within a given radius of the current DCS Unit, use the <a href="##(UNIT).OtherUnitInRadius">UNIT.OtherUnitInRadius</a>() method.</p>
@@ -189,12 +191,6 @@ If you want to obtain the complete <strong>3D position</strong> including ori�
 		<td class="name" nowrap="nowrap"><a href="##(UNIT).Flare">UNIT:Flare(FlareColor)</a></td>
 		<td class="summary">
 <p>Signal a flare at the position of the UNIT.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT).FlareColor">UNIT.FlareColor</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -391,12 +387,6 @@ If you want to obtain the complete <strong>3D position</strong> including ori�
 		<td class="name" nowrap="nowrap"><a href="##(UNIT).SmokeBlue">UNIT:SmokeBlue()</a></td>
 		<td class="summary">
 <p>Smoke the UNIT Blue.</p>
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT).SmokeColor">UNIT.SmokeColor</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 		<tr>
@@ -421,68 +411,6 @@ If you want to obtain the complete <strong>3D position</strong> including ori�
 		<td class="name" nowrap="nowrap"><a href="##(UNIT).SmokeWhite">UNIT:SmokeWhite()</a></td>
 		<td class="summary">
 <p>Smoke the UNIT White.</p>
-</td>
-		</tr>
-	</table>
-
-			<h2><a id="#(UNIT.FlareColor)">Type <code>UNIT.FlareColor</code></a></h2>
-				<table class="function_list">
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.FlareColor).Green">UNIT.FlareColor.Green</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.FlareColor).Red">UNIT.FlareColor.Red</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.FlareColor).White">UNIT.FlareColor.White</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.FlareColor).Yellow">UNIT.FlareColor.Yellow</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-	</table>
-
-			<h2><a id="#(UNIT.SmokeColor)">Type <code>UNIT.SmokeColor</code></a></h2>
-				<table class="function_list">
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.SmokeColor).Blue">UNIT.SmokeColor.Blue</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.SmokeColor).Green">UNIT.SmokeColor.Green</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.SmokeColor).Orange">UNIT.SmokeColor.Orange</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.SmokeColor).Red">UNIT.SmokeColor.Red</a></td>
-		<td class="summary">
-
-</td>
-		</tr>
-		<tr>
-		<td class="name" nowrap="nowrap"><a href="##(UNIT.SmokeColor).White">UNIT.SmokeColor.White</a></td>
-		<td class="summary">
-
 </td>
 		</tr>
 	</table>
@@ -583,14 +511,14 @@ If you want to obtain the complete <strong>3D position</strong> including ori�
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a> DCSUnit </em></code>: 
+<p><code><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a> DCSUnit </em></code>: 
 An existing DCS Unit object reference.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+<p><em><a href="##(UNIT)">#UNIT</a>:</em>
 self</p>
 
 </dd>
@@ -617,7 +545,7 @@ The Unit Name.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em>
+<p><em><a href="##(UNIT)">#UNIT</a>:</em>
 self</p>
 
 </dd>
@@ -637,24 +565,10 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em> FlareColor </em></code>: </p>
+<p><code><em><a href="Utilities.Utils.html##(FLARECOLOR)">Utilities.Utils#FLARECOLOR</a> FlareColor </em></code>: </p>
 
 				</li>
 		</ul>
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(UNIT.FlareColor)">#UNIT.FlareColor</a></em>
-<a id="#(UNIT).FlareColor" >
-<strong>UNIT.FlareColor</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -724,7 +638,7 @@ self</p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSUnit.html##(Unit.Ammo)">DCSUnit#Unit.Ammo</a>:</em></p>
+<p><em><a href="Dcs.DCSWrapper.Unit.html##(Unit.Ammo)">Dcs.DCSWrapper.Unit#Unit.Ammo</a>:</em></p>
 
 
 				</li>
@@ -778,7 +692,7 @@ The DCS Unit is not existing or alive.  </p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSUnit.html##(Unit)">DCSUnit#Unit</a>:</em></p>
+<p><em><a href="Dcs.DCSWrapper.Unit.html##(Unit)">Dcs.DCSWrapper.Unit#Unit</a>:</em></p>
 
 
 </dd>
@@ -829,7 +743,7 @@ The DCS Unit is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="Group.html##(GROUP)">Group#GROUP</a>:</em>
+<p><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a>:</em>
 The Group of the Unit.</p>
 
 				</li>
@@ -1025,7 +939,7 @@ The DCS Unit is not existing or alive.  </p>
 				</li>
 				<li>
 				
-<p><em><a href="DCSObject.html##(Object)">DCSObject#Object</a>:</em>
+<p><em><a href="Dcs.DCSWrapper.Object.html##(Object)">Dcs.DCSWrapper.Object#Object</a>:</em>
 The object of the radar's interest. Not nil only if at least one radar of the unit is tracking a target.</p>
 
 				</li>
@@ -1053,7 +967,7 @@ The DCS Unit is not existing or alive.  </p>
 			<ol>
 				<li>
 				
-<p><em><a href="DCSUnit.html##(Unit.Sensors)">DCSUnit#Unit.Sensors</a>:</em></p>
+<p><em><a href="Dcs.DCSWrapper.Unit.html##(Unit.Sensors)">Dcs.DCSWrapper.Unit#Unit.Sensors</a>:</em></p>
 
 
 				</li>
@@ -1271,7 +1185,7 @@ Ground category evaluation result.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> Zone </em></code>: 
 The zone to test.</p>
 
 				</li>
@@ -1279,7 +1193,7 @@ The zone to test.</p>
 		<h3>Return value</h3>
 				
 <p><em>#boolean:</em>
-Returns true if the unit is within the <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></p>
+Returns true if the unit is within the <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></p>
 
 </dd>
 </dl>
@@ -1298,7 +1212,7 @@ Returns true if the unit is within the <a href="Zone.html##(ZONE_BASE)">Zone#ZON
 		<ul>
 				<li>
 				
-<p><code><em><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> Zone </em></code>: 
+<p><code><em><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> Zone </em></code>: 
 The zone to test.</p>
 
 				</li>
@@ -1306,7 +1220,7 @@ The zone to test.</p>
 		<h3>Return value</h3>
 				
 <p><em>#boolean:</em>
-Returns true if the unit is not within the <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></p>
+Returns true if the unit is not within the <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></p>
 
 </dd>
 </dl>
@@ -1364,7 +1278,7 @@ The UNIT name.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> AwaitUnit </em></code>: 
+<p><code><em><a href="##(UNIT)">#UNIT</a> AwaitUnit </em></code>: 
 The other UNIT wrapper object.</p>
 
 				</li>
@@ -1418,7 +1332,7 @@ The DCS Unit is not existing or alive.  </p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> SpawnVec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> SpawnVec3 </em></code>: 
 The position where to Spawn the new Unit at.</p>
 
 				</li>
@@ -1453,7 +1367,7 @@ The name of the DCS unit.</p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="Unit.html##(UNIT)">Unit#UNIT</a>:</em></p>
+<p><em><a href="##(UNIT)">#UNIT</a>:</em></p>
 
 
 </dd>
@@ -1495,20 +1409,6 @@ The name of the DCS unit.</p>
 	
 <p>Smoke the UNIT Blue.</p>
 
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-		<em><a href="##(UNIT.SmokeColor)">#UNIT.SmokeColor</a></em>
-<a id="#(UNIT).SmokeColor" >
-<strong>UNIT.SmokeColor</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 		<dl class="function">
@@ -1561,135 +1461,6 @@ The name of the DCS unit.</p>
 	
 <p>Smoke the UNIT White.</p>
 
-</dd>
-</dl>
-
-			<h2><a id="#(UNIT.FlareColor)" >Type <code>UNIT.FlareColor</code></a></h2>
-				
-<p>FlareColor</p>
-
-	<h3>Field(s)</h3>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.FlareColor).Green" >
-<strong>UNIT.FlareColor.Green</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.FlareColor).Red" >
-<strong>UNIT.FlareColor.Red</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.FlareColor).White" >
-<strong>UNIT.FlareColor.White</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.FlareColor).Yellow" >
-<strong>UNIT.FlareColor.Yellow</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-
-			<h2><a id="#(UNIT.SmokeColor)" >Type <code>UNIT.SmokeColor</code></a></h2>
-				
-<p>SmokeColor</p>
-
-	<h3>Field(s)</h3>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.SmokeColor).Blue" >
-<strong>UNIT.SmokeColor.Blue</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.SmokeColor).Green" >
-<strong>UNIT.SmokeColor.Green</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.SmokeColor).Orange" >
-<strong>UNIT.SmokeColor.Orange</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.SmokeColor).Red" >
-<strong>UNIT.SmokeColor.Red</strong>
-</a>
-</dt>
-<dd>
-	
-
-
-</dd>
-</dl>
-		<dl class="function">
-<dt>
-
-<a id="#(UNIT.SmokeColor).White" >
-<strong>UNIT.SmokeColor.White</strong>
-</a>
-</dt>
-<dd>
-	
-
-
 </dd>
 </dl>
 
diff --git a/Moose Training/Documentation/Utils.html b/Moose Training/Documentation/Utils.html
index 3a78548d6..e521a979b 100644
--- a/Moose Training/Documentation/Utils.html	
+++ b/Moose Training/Documentation/Utils.html	
@@ -17,13 +17,16 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
+					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -40,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -51,28 +54,25 @@
 					<li><a href="MissileTrainer.html">MissileTrainer</a></li>
 					<li><a href="Mission.html">Mission</a></li>
 					<li><a href="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
-					<li><a href="Process_Destroy.html">Process_Destroy</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
-					<li><a href="Process_PatrolZone.html">Process_PatrolZone</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
 					<li><a href="Task_A2G.html">Task_A2G</a></li>
-					<li><a href="Task_Assign.html">Task_Assign</a></li>
 					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
-					<li><a href="Task_Route.html">Task_Route</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
 					<li>Utils</li>
diff --git a/Moose Training/Documentation/Zone.html b/Moose Training/Documentation/Zone.html
index 7b4122923..71d7c5c6c 100644
--- a/Moose Training/Documentation/Zone.html	
+++ b/Moose Training/Documentation/Zone.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,15 +75,17 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</a></li>
 					<li>Zone</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>Zone</code></h1>
    
-<p>This module contains the ZONE classes, inherited from <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>.</p>
+<p>This module contains the ZONE classes, inherited from <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>.</p>
 
    
 <p>There are essentially two core functions that zones accomodate:</p>
@@ -97,7 +99,7 @@
 
 <ul>
     <li>Test if completely within the zone.</li>
-    <li>Test if partly within the zone (for <a href="Group.html##(GROUP)">Group#GROUP</a> objects).</li>
+    <li>Test if partly within the zone (for <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> objects).</li>
     <li>Test if not in the zone.</li>
     <li>Distance to the nearest intersecting point of the zone.</li>
     <li>Distance to the center of the zone.</li>
@@ -107,17 +109,17 @@
 <p>Each of these ZONE classes have a zone name, and specific parameters defining the zone type:</p>
 
 <ul>
-    <li><a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>: The ZONE_BASE class defining the base for all other zone classes.</li>
-    <li><a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a>: The ZONE_RADIUS class defined by a zone name, a location and a radius.</li>
-    <li><a href="Zone.html##(ZONE)">Zone#ZONE</a>: The ZONE class, defined by the zone name as defined within the Mission Editor.</li>
-    <li><a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a>: The ZONE_UNIT class defines by a zone around a <a href="Unit.html##(UNIT)">Unit#UNIT</a> with a radius.</li>
-    <li><a href="Zone.html##(ZONE_GROUP)">Zone#ZONE_GROUP</a>: The ZONE_GROUP class defines by a zone around a <a href="Group.html##(GROUP)">Group#GROUP</a> with a radius.</li>
-    <li><a href="Zone.html##(ZONE_POLYGON)">Zone#ZONE_POLYGON</a>: The ZONE_POLYGON class defines by a sequence of <a href="Group.html##(GROUP)">Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.</li>
+    <li><a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>: The ZONE_BASE class defining the base for all other zone classes.</li>
+    <li><a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a>: The ZONE_RADIUS class defined by a zone name, a location and a radius.</li>
+    <li><a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a>: The ZONE class, defined by the zone name as defined within the Mission Editor.</li>
+    <li><a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a>: The ZONE_UNIT class defines by a zone around a <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> with a radius.</li>
+    <li><a href="Core.Zone.html##(ZONE_GROUP)">Core.Zone#ZONE_GROUP</a>: The ZONE_GROUP class defines by a zone around a <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> with a radius.</li>
+    <li><a href="Core.Zone.html##(ZONE_POLYGON)">Core.Zone#ZONE_POLYGON</a>: The ZONE_POLYGON class defines by a sequence of <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.</li>
 </ul>
 
 <hr/>
 
-<h1>1) <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a> class, extends <a href="Base.html##(BASE)">Base#BASE</a></h1>
+<h1>1) <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a> class, extends <a href="Core.Base.html##(BASE)">Core.Base#BASE</a></h1>
 <p>This class is an abstract BASE class for derived classes, and is not meant to be instantiated.</p>
 
 <h3>1.1) Each zone has a name:</h3>
@@ -126,11 +128,11 @@
     <li><a href="##(ZONE_BASE).GetName">ZONE_BASE.GetName</a>(): Returns the name of the zone.</li>
 </ul>
 
-<h3>1.2) Each zone implements two polymorphic functions defined in <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>:</h3>
+<h3>1.2) Each zone implements two polymorphic functions defined in <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>:</h3>
 
 <ul>
-    <li><a href="##(ZONE_BASE).IsPointVec2InZone">ZONE_BASE.IsPointVec2InZone</a>(): Returns if a <a href="Point.html##(POINT_VEC2)">Point#POINT_VEC2</a> is within the zone.</li>
-    <li><a href="##(ZONE_BASE).IsPointVec3InZone">ZONE_BASE.IsPointVec3InZone</a>(): Returns if a <a href="Point.html##(POINT_VEC3)">Point#POINT_VEC3</a> is within the zone.</li>
+    <li><a href="##(ZONE_BASE).IsPointVec2InZone">ZONE_BASE.IsPointVec2InZone</a>(): Returns if a <a href="Core.Point.html##(POINT_VEC2)">Core.Point#POINT_VEC2</a> is within the zone.</li>
+    <li><a href="##(ZONE_BASE).IsPointVec3InZone">ZONE_BASE.IsPointVec3InZone</a>(): Returns if a <a href="Core.Point.html##(POINT_VEC3)">Core.Point#POINT_VEC3</a> is within the zone.</li>
 </ul>
 
 <h3>1.3) A zone has a probability factor that can be set to randomize a selection between zones:</h3>
@@ -144,8 +146,8 @@
 <h3>1.4) A zone manages Vectors:</h3>
 
 <ul>
-    <li><a href="##(ZONE_BASE).GetVec2">ZONE_BASE.GetVec2</a>(): Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> coordinate of the zone.</li>
-    <li><a href="##(ZONE_BASE).GetRandomVec2">ZONE_BASE.GetRandomVec2</a>(): Define a random <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> within the zone.</li>
+    <li><a href="##(ZONE_BASE).GetVec2">ZONE_BASE.GetVec2</a>(): Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> coordinate of the zone.</li>
+    <li><a href="##(ZONE_BASE).GetRandomVec2">ZONE_BASE.GetRandomVec2</a>(): Define a random <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> within the zone.</li>
 </ul>
 
 <h3>1.5) A zone has a bounding square:</h3>
@@ -163,11 +165,11 @@
 
 <hr/>
 
-<h1>2) <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a> class, extends <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></h1>
+<h1>2) <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a> class, extends <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></h1>
 <p>The ZONE<em>RADIUS class defined by a zone name, a location and a radius.
-This class implements the inherited functions from Zone#ZONE</em>BASE taking into account the own zone format and properties.</p>
+This class implements the inherited functions from Core.Zone#ZONE</em>BASE taking into account the own zone format and properties.</p>
 
-<h3>2.1) <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a> constructor:</h3>
+<h3>2.1) <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a> constructor:</h3>
 
 <ul>
     <li><a href="##(ZONE_BASE).New">ZONE_BASE.New</a>(): Constructor.</li>
@@ -183,41 +185,41 @@ This class implements the inherited functions from Zone#ZONE</em>BASE taking int
 <h3>2.3) Manage the location of the zone:</h3>
 
 <ul>
-    <li><a href="##(ZONE_BASE).SetVec2">ZONE_BASE.SetVec2</a>(): Sets the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> of the zone.</li>
-    <li><a href="##(ZONE_BASE).GetVec2">ZONE_BASE.GetVec2</a>(): Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> of the zone.</li>
-    <li><a href="##(ZONE_BASE).GetVec3">ZONE_BASE.GetVec3</a>(): Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> of the zone, taking an additional height parameter.</li>
+    <li><a href="##(ZONE_BASE).SetVec2">ZONE_BASE.SetVec2</a>(): Sets the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> of the zone.</li>
+    <li><a href="##(ZONE_BASE).GetVec2">ZONE_BASE.GetVec2</a>(): Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> of the zone.</li>
+    <li><a href="##(ZONE_BASE).GetVec3">ZONE_BASE.GetVec3</a>(): Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> of the zone, taking an additional height parameter.</li>
 </ul>
 
 <hr/>
 
-<h1>3) <a href="Zone.html##(ZONE)">Zone#ZONE</a> class, extends <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a></h1>
+<h1>3) <a href="Core.Zone.html##(ZONE)">Core.Zone#ZONE</a> class, extends <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a></h1>
 <p>The ZONE class, defined by the zone name as defined within the Mission Editor.
-This class implements the inherited functions from {Zone#ZONE_RADIUS} taking into account the own zone format and properties.</p>
+This class implements the inherited functions from {Core.Zone#ZONE_RADIUS} taking into account the own zone format and properties.</p>
 
 <hr/>
 
-<h1>4) <a href="Zone.html##(ZONE_UNIT)">Zone#ZONE_UNIT</a> class, extends <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a></h1>
-<p>The ZONE_UNIT class defined by a zone around a <a href="Unit.html##(UNIT)">Unit#UNIT</a> with a radius.
-This class implements the inherited functions from <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.</p>
+<h1>4) <a href="Core.Zone.html##(ZONE_UNIT)">Core.Zone#ZONE_UNIT</a> class, extends <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a></h1>
+<p>The ZONE_UNIT class defined by a zone around a <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> with a radius.
+This class implements the inherited functions from <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.</p>
 
 <hr/>
 
-<h1>5) <a href="Zone.html##(ZONE_GROUP)">Zone#ZONE_GROUP</a> class, extends <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a></h1>
-<p>The ZONE_GROUP class defines by a zone around a <a href="Group.html##(GROUP)">Group#GROUP</a> with a radius. The current leader of the group defines the center of the zone.
-This class implements the inherited functions from <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.</p>
+<h1>5) <a href="Core.Zone.html##(ZONE_GROUP)">Core.Zone#ZONE_GROUP</a> class, extends <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a></h1>
+<p>The ZONE_GROUP class defines by a zone around a <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> with a radius. The current leader of the group defines the center of the zone.
+This class implements the inherited functions from <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.</p>
 
 <hr/>
 
-<h1>6) <a href="Zone.html##(ZONE_POLYGON_BASE)">Zone#ZONE<em>POLYGON</em>BASE</a> class, extends <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a></h1>
-<p>The ZONE<em>POLYGON</em>BASE class defined by a sequence of <a href="Group.html##(GROUP)">Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.
-This class implements the inherited functions from <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.
+<h1>6) <a href="Core.Zone.html##(ZONE_POLYGON_BASE)">Core.Zone#ZONE<em>POLYGON</em>BASE</a> class, extends <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a></h1>
+<p>The ZONE<em>POLYGON</em>BASE class defined by a sequence of <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.
+This class implements the inherited functions from <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.
 This class is an abstract BASE class for derived classes, and is not meant to be instantiated.</p>
 
 <hr/>
 
-<h1>7) <a href="Zone.html##(ZONE_POLYGON)">Zone#ZONE_POLYGON</a> class, extends <a href="Zone.html##(ZONE_POLYGON_BASE)">Zone#ZONE<em>POLYGON</em>BASE</a></h1>
-<p>The ZONE_POLYGON class defined by a sequence of <a href="Group.html##(GROUP)">Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.
-This class implements the inherited functions from <a href="Zone.html##(ZONE_RADIUS)">Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.</p>
+<h1>7) <a href="Core.Zone.html##(ZONE_POLYGON)">Core.Zone#ZONE_POLYGON</a> class, extends <a href="Core.Zone.html##(ZONE_POLYGON_BASE)">Core.Zone#ZONE<em>POLYGON</em>BASE</a></h1>
+<p>The ZONE_POLYGON class defined by a sequence of <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.
+This class implements the inherited functions from <a href="Core.Zone.html##(ZONE_RADIUS)">Core.Zone#ZONE_RADIUS</a> taking into account the own zone format and properties.</p>
 
 <hr/>
 
@@ -327,13 +329,13 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_BASE).GetRandomVec2">ZONE_BASE:GetRandomVec2()</a></td>
 		<td class="summary">
-<p>Define a random <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> within the zone.</p>
+<p>Define a random <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> within the zone.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_BASE).GetVec2">ZONE_BASE:GetVec2()</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> coordinate of the zone.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> coordinate of the zone.</p>
 </td>
 		</tr>
 		<tr>
@@ -443,7 +445,7 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_GROUP).New">ZONE_GROUP:New(ZoneName, ZoneGROUP, Radius)</a></td>
 		<td class="summary">
-<p>Constructor to create a ZONE_GROUP instance, taking the zone name, a zone <a href="Group.html##(GROUP)">Group#GROUP</a> and a radius.</p>
+<p>Constructor to create a ZONE_GROUP instance, taking the zone name, a zone <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> and a radius.</p>
 </td>
 		</tr>
 		<tr>
@@ -465,7 +467,7 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_POLYGON).New">ZONE_POLYGON:New(ZoneName, ZoneGroup)</a></td>
 		<td class="summary">
-<p>Constructor to create a ZONE_POLYGON instance, taking the zone name and the name of the <a href="Group.html##(GROUP)">Group#GROUP</a> defined within the Mission Editor.</p>
+<p>Constructor to create a ZONE_POLYGON instance, taking the zone name and the name of the <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> defined within the Mission Editor.</p>
 </td>
 		</tr>
 	</table>
@@ -493,7 +495,7 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_POLYGON_BASE).GetRandomVec2">ZONE_POLYGON_BASE:GetRandomVec2()</a></td>
 		<td class="summary">
-<p>Define a random <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> within the zone.</p>
+<p>Define a random <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> within the zone.</p>
 </td>
 		</tr>
 		<tr>
@@ -505,13 +507,13 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_POLYGON_BASE).New">ZONE_POLYGON_BASE:New(ZoneName, PointsArray)</a></td>
 		<td class="summary">
-<p>Constructor to create a ZONE<em>POLYGON</em>BASE instance, taking the zone name and an array of <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>, forming a polygon.</p>
+<p>Constructor to create a ZONE<em>POLYGON</em>BASE instance, taking the zone name and an array of <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>, forming a polygon.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_POLYGON_BASE).Polygon">ZONE_POLYGON_BASE.Polygon</a></td>
 		<td class="summary">
-<p>The polygon defined by an array of <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>.</p>
+<p>The polygon defined by an array of <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>.</p>
 </td>
 		</tr>
 		<tr>
@@ -551,13 +553,13 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_RADIUS).GetVec2">ZONE_RADIUS:GetVec2()</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> of the zone.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> of the zone.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_RADIUS).GetVec3">ZONE_RADIUS:GetVec3(Height)</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> of the ZONE_RADIUS.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> of the ZONE_RADIUS.</p>
 </td>
 		</tr>
 		<tr>
@@ -593,7 +595,7 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_RADIUS).SetVec2">ZONE_RADIUS:SetVec2(Vec2)</a></td>
 		<td class="summary">
-<p>Sets the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> of the zone.</p>
+<p>Sets the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> of the zone.</p>
 </td>
 		</tr>
 		<tr>
@@ -627,13 +629,13 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_UNIT).GetVec2">ZONE_UNIT:GetVec2()</a></td>
 		<td class="summary">
-<p>Returns the current location of the <a href="Unit.html##(UNIT)">Unit#UNIT</a>.</p>
+<p>Returns the current location of the <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>.</p>
 </td>
 		</tr>
 		<tr>
 		<td class="name" nowrap="nowrap"><a href="##(ZONE_UNIT).GetVec3">ZONE_UNIT:GetVec3(Height)</a></td>
 		<td class="summary">
-<p>Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> of the ZONE_UNIT.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> of the ZONE_UNIT.</p>
 </td>
 		</tr>
 		<tr>
@@ -757,8 +759,6 @@ This class implements the inherited functions from <a href="Zone.html##(ZONE_RAD
 </dl>
 	<h2><a id="#(Zone)" >Type <code>Zone</code></a></h2>
 	
-			<h2><a id="#(POINT_VEC3.SmokeColor)" >Type <code>POINT_VEC3.SmokeColor</code></a></h2>
-			
 			<h2><a id="#(ZONE)" >Type <code>ZONE</code></a></h2>
 				
 <p>The ZONE class, defined by the zone name as defined within the Mission Editor.</p>
@@ -873,11 +873,11 @@ The name of the zone.</p>
 </dt>
 <dd>
 	
-<p>Define a random <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> within the zone.</p>
+<p>Define a random <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> within the zone.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The Vec2 coordinates.</p>
 
 </dd>
@@ -891,7 +891,7 @@ The Vec2 coordinates.</p>
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> coordinate of the zone.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> coordinate of the zone.</p>
 
 		<h3>Return value</h3>
 				
@@ -961,7 +961,7 @@ A value between 0 and 1. 0 = 0% and 1 = 100% probability.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The location to test.</p>
 
 				</li>
@@ -988,7 +988,7 @@ true if the location is within the zone.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 The point to test.</p>
 
 				</li>
@@ -1064,7 +1064,7 @@ A value between 0 and 1. 0 = 0% and 1 = 100% probability.</p>
 		<ul>
 				<li>
 				
-<p><code><em> SmokeColor </em></code>: 
+<p><code><em><a href="Utilities.Utils.html##(SMOKECOLOR)">Utilities.Utils#SMOKECOLOR</a> SmokeColor </em></code>: 
 The smoke color.</p>
 
 				</li>
@@ -1108,7 +1108,7 @@ The smoke color.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(ZONE_BASE.BoundingSquare).x1" >
 <strong>ZONE_BASE.BoundingSquare.x1</strong>
 </a>
@@ -1122,7 +1122,7 @@ The smoke color.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(ZONE_BASE.BoundingSquare).x2" >
 <strong>ZONE_BASE.BoundingSquare.x2</strong>
 </a>
@@ -1136,7 +1136,7 @@ The smoke color.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(ZONE_BASE.BoundingSquare).y1" >
 <strong>ZONE_BASE.BoundingSquare.y1</strong>
 </a>
@@ -1150,7 +1150,7 @@ The smoke color.</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(ZONE_BASE.BoundingSquare).y2" >
 <strong>ZONE_BASE.BoundingSquare.y2</strong>
 </a>
@@ -1194,7 +1194,7 @@ The smoke color.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The random location of the zone based on the <a href="Group.html">Group</a> location.</p>
 
 </dd>
@@ -1212,7 +1212,7 @@ The random location of the zone based on the <a href="Group.html">Group</a> loca
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The location of the zone based on the <a href="Group.html">Group</a> location.</p>
 
 </dd>
@@ -1226,7 +1226,7 @@ The location of the zone based on the <a href="Group.html">Group</a> location.</
 </dt>
 <dd>
 	
-<p>Constructor to create a ZONE_GROUP instance, taking the zone name, a zone <a href="Group.html##(GROUP)">Group#GROUP</a> and a radius.</p>
+<p>Constructor to create a ZONE_GROUP instance, taking the zone name, a zone <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> and a radius.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -1238,13 +1238,13 @@ Name of the zone.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> ZoneGROUP </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> ZoneGROUP </em></code>: 
 The <a href="Group.html">Group</a> as the center of the zone.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Radius </em></code>: 
 The radius of the zone.</p>
 
 				</li>
@@ -1259,7 +1259,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Group.html##(GROUP)">Group#GROUP</a></em>
+		<em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a></em>
 <a id="#(ZONE_GROUP).ZoneGROUP" >
 <strong>ZONE_GROUP.ZoneGROUP</strong>
 </a>
@@ -1273,7 +1273,7 @@ self</p>
 
 			<h2><a id="#(ZONE_POLYGON)" >Type <code>ZONE_POLYGON</code></a></h2>
 				
-<p>The ZONE_POLYGON class defined by a sequence of <a href="Group.html##(GROUP)">Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.</p>
+<p>The ZONE_POLYGON class defined by a sequence of <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> waypoints within the Mission Editor, forming a polygon.</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
@@ -1299,10 +1299,10 @@ self</p>
 </dt>
 <dd>
 	
-<p>Constructor to create a ZONE_POLYGON instance, taking the zone name and the name of the <a href="Group.html##(GROUP)">Group#GROUP</a> defined within the Mission Editor.</p>
+<p>Constructor to create a ZONE_POLYGON instance, taking the zone name and the name of the <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> defined within the Mission Editor.</p>
 
 	
-<p>The <a href="Group.html##(GROUP)">Group#GROUP</a> waypoints define the polygon corners. The first and the last point are automatically connected by ZONE_POLYGON.</p>
+<p>The <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> waypoints define the polygon corners. The first and the last point are automatically connected by ZONE_POLYGON.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -1314,7 +1314,7 @@ Name of the zone.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Group.html##(GROUP)">Group#GROUP</a> ZoneGroup </em></code>: 
+<p><code><em><a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> ZoneGroup </em></code>: 
 The GROUP waypoints as defined within the Mission Editor define the polygon shape.</p>
 
 				</li>
@@ -1329,7 +1329,7 @@ self</p>
 
 			<h2><a id="#(ZONE_POLYGON_BASE)" >Type <code>ZONE_POLYGON_BASE</code></a></h2>
 				
-<p>The ZONE<em>POLYGON</em>BASE class defined by an array of <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>, forming a polygon.</p>
+<p>The ZONE<em>POLYGON</em>BASE class defined by an array of <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>, forming a polygon.</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
@@ -1391,11 +1391,11 @@ The bounding square.</p>
 </dt>
 <dd>
 	
-<p>Define a random <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> within the zone.</p>
+<p>Define a random <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> within the zone.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The Vec2 coordinate.</p>
 
 </dd>
@@ -1418,7 +1418,7 @@ The Vec2 coordinate.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The location to test.</p>
 
 				</li>
@@ -1439,10 +1439,10 @@ true if the location is within the zone.</p>
 </dt>
 <dd>
 	
-<p>Constructor to create a ZONE<em>POLYGON</em>BASE instance, taking the zone name and an array of <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>, forming a polygon.</p>
+<p>Constructor to create a ZONE<em>POLYGON</em>BASE instance, taking the zone name and an array of <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>, forming a polygon.</p>
 
 	
-<p>The <a href="Group.html##(GROUP)">Group#GROUP</a> waypoints define the polygon corners. The first and the last point are automatically connected.</p>
+<p>The <a href="Wrapper.Group.html##(GROUP)">Wrapper.Group#GROUP</a> waypoints define the polygon corners. The first and the last point are automatically connected.</p>
 
 		<h3>Parameters</h3>
 		<ul>
@@ -1455,7 +1455,7 @@ Name of the zone.</p>
 				<li>
 				
 <p><code><em><a href="##(ZONE_POLYGON_BASE.ListVec2)">#ZONE<em>POLYGON</em>BASE.ListVec2</a> PointsArray </em></code>: 
-An array of <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>, forming a polygon..</p>
+An array of <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>, forming a polygon..</p>
 
 				</li>
 		</ul>
@@ -1476,7 +1476,7 @@ self</p>
 </dt>
 <dd>
 	
-<p>The polygon defined by an array of <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>.</p>
+<p>The polygon defined by an array of <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>.</p>
 
 </dd>
 </dl>
@@ -1495,7 +1495,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="##(POINT_VEC3.SmokeColor)">#POINT_VEC3.SmokeColor</a> SmokeColor </em></code>: 
+<p><code><em><a href="Utilities.Utils.html##(SMOKECOLOR)">Utilities.Utils#SMOKECOLOR</a> SmokeColor </em></code>: 
 The smoke color.</p>
 
 				</li>
@@ -1549,7 +1549,7 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="Utils.html##(FLARECOLOR)">Utils#FLARECOLOR</a> FlareColor </em></code>: 
+<p><code><em><a href="Utilities.Utils.html##(FLARECOLOR)">Utilities.Utils#FLARECOLOR</a> FlareColor </em></code>: 
 The flare color.</p>
 
 				</li>
@@ -1561,7 +1561,7 @@ The flare color.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Azimuth)">DCSTypes#Azimuth</a> Azimuth </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Azimuth)">Dcs.DCSTypes#Azimuth</a> Azimuth </em></code>: 
 (optional) Azimuth The azimuth of the flare.</p>
 
 				</li>
@@ -1586,7 +1586,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
 The radius of the zone.</p>
 
 </dd>
@@ -1604,7 +1604,7 @@ The radius of the zone.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The random location within the zone.</p>
 
 </dd>
@@ -1618,11 +1618,11 @@ The random location within the zone.</p>
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> of the zone.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> of the zone.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The location of the zone.</p>
 
 </dd>
@@ -1636,20 +1636,20 @@ The location of the zone.</p>
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> of the ZONE_RADIUS.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> of the ZONE_RADIUS.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Height </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Height </em></code>: 
 The height to add to the land height where the center of the zone is located.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 The point of the zone.</p>
 
 </dd>
@@ -1669,7 +1669,7 @@ The point of the zone.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The location to test.</p>
 
 				</li>
@@ -1696,7 +1696,7 @@ true if the location is within the zone.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> Vec3 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> Vec3 </em></code>: 
 The point to test.</p>
 
 				</li>
@@ -1729,13 +1729,13 @@ Name of the zone.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The location of the zone.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Radius </em></code>: 
 The radius of the zone.</p>
 
 				</li>
@@ -1750,7 +1750,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a></em>
 <a id="#(ZONE_RADIUS).Radius" >
 <strong>ZONE_RADIUS.Radius</strong>
 </a>
@@ -1776,14 +1776,14 @@ self</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Radius </em></code>: 
 The radius of the zone.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em>
 The radius of the zone.</p>
 
 </dd>
@@ -1797,20 +1797,20 @@ The radius of the zone.</p>
 </dt>
 <dd>
 	
-<p>Sets the <a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> of the zone.</p>
+<p>Sets the <a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> of the zone.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a> Vec2 </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a> Vec2 </em></code>: 
 The new location of the zone.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The new location of the zone.</p>
 
 </dd>
@@ -1830,7 +1830,7 @@ The new location of the zone.</p>
 		<ul>
 				<li>
 				
-<p><code><em><a href="##(POINT_VEC3.SmokeColor)">#POINT_VEC3.SmokeColor</a> SmokeColor </em></code>: 
+<p><code><em><a href="Utilities.Utils.html##(SMOKECOLOR)">Utilities.Utils#SMOKECOLOR</a> SmokeColor </em></code>: 
 The smoke color.</p>
 
 				</li>
@@ -1851,7 +1851,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a></em>
+		<em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a></em>
 <a id="#(ZONE_RADIUS).Vec2" >
 <strong>ZONE_RADIUS.Vec2</strong>
 </a>
@@ -1865,7 +1865,7 @@ self</p>
 
 			<h2><a id="#(ZONE_UNIT)" >Type <code>ZONE_UNIT</code></a></h2>
 				
-<p>The ZONE_UNIT class defined by a zone around a <a href="Unit.html##(UNIT)">Unit#UNIT</a> with a radius.</p>
+<p>The ZONE_UNIT class defined by a zone around a <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> with a radius.</p>
 
 	<h3>Field(s)</h3>
 		<dl class="function">
@@ -1895,7 +1895,7 @@ self</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
 The random location within the zone.</p>
 
 </dd>
@@ -1909,12 +1909,12 @@ The random location within the zone.</p>
 </dt>
 <dd>
 	
-<p>Returns the current location of the <a href="Unit.html##(UNIT)">Unit#UNIT</a>.</p>
+<p>Returns the current location of the <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>.</p>
 
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec2)">DCSTypes#Vec2</a>:</em>
-The location of the zone based on the <a href="Unit.html##(UNIT)">Unit#UNIT</a>location.</p>
+<p><em><a href="Dcs.DCSTypes.html##(Vec2)">Dcs.DCSTypes#Vec2</a>:</em>
+The location of the zone based on the <a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a>location.</p>
 
 </dd>
 </dl>
@@ -1927,20 +1927,20 @@ The location of the zone based on the <a href="Unit.html##(UNIT)">Unit#UNIT</a>l
 </dt>
 <dd>
 	
-<p>Returns the <a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a> of the ZONE_UNIT.</p>
+<p>Returns the <a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a> of the ZONE_UNIT.</p>
 
 		<h3>Parameter</h3>
 		<ul>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Height </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Height </em></code>: 
 The height to add to the land height where the center of the zone is located.</p>
 
 				</li>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Vec3)">DCSTypes#Vec3</a>:</em>
+<p><em><a href="Dcs.DCSTypes.html##(Vec3)">Dcs.DCSTypes#Vec3</a>:</em>
 The point of the zone.</p>
 
 </dd>
@@ -1980,13 +1980,13 @@ Name of the zone.</p>
 				</li>
 				<li>
 				
-<p><code><em><a href="Unit.html##(UNIT)">Unit#UNIT</a> ZoneUNIT </em></code>: 
+<p><code><em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a> ZoneUNIT </em></code>: 
 The unit as the center of the zone.</p>
 
 				</li>
 				<li>
 				
-<p><code><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a> Radius </em></code>: 
+<p><code><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a> Radius </em></code>: 
 The radius of the zone.</p>
 
 				</li>
@@ -2001,7 +2001,7 @@ self</p>
 		<dl class="function">
 <dt>
 
-		<em><a href="Unit.html##(UNIT)">Unit#UNIT</a></em>
+		<em><a href="Wrapper.Unit.html##(UNIT)">Wrapper.Unit#UNIT</a></em>
 <a id="#(ZONE_UNIT).ZoneUNIT" >
 <strong>ZONE_UNIT.ZoneUNIT</strong>
 </a>
diff --git a/Moose Training/Documentation/env.html b/Moose Training/Documentation/env.html
index 05349fbea..726cf3543 100644
--- a/Moose Training/Documentation/env.html	
+++ b/Moose Training/Documentation/env.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</a></li>
 					<li><a href="Zone.html">Zone</a></li>
 					<li>env</li>
 					<li><a href="land.html">land</a></li>
+					<li><a href="routines.html">routines</a></li>
 		</ul>
 	</div>
 	<div id="content">
diff --git a/Moose Training/Documentation/index.html b/Moose Training/Documentation/index.html
index a6cf3cf7d..045f3eaf2 100644
--- a/Moose Training/Documentation/index.html	
+++ b/Moose Training/Documentation/index.html	
@@ -17,7 +17,7 @@
 				index
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,18 +75,20 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</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">
 <h2>Module</h2>
 	<table class="module_list">
 			<tr>
-			<td class="name" nowrap="nowrap"><a href="AIBalancer.html">AIBalancer</a></td>
+			<td class="name" nowrap="nowrap"><a href="AI_Balancer.html">AI_Balancer</a></td>
 			<td class="summary">
-<p>This module contains the AIBALANCER class.</p>
+<p>This module contains the AI_BALANCER class.</p>
 </td>
 			</tr>
 			<tr>
@@ -135,6 +137,12 @@
 			<td class="name" nowrap="nowrap"><a href="Client.html">Client</a></td>
 			<td class="summary">
 <p>This module contains the CLIENT class.</p>
+</td>
+			</tr>
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="CommandCenter.html">CommandCenter</a></td>
+			<td class="summary">
+<p>A COMMANDCENTER is the owner of multiple missions within MOOSE.</p>
 </td>
 			</tr>
 			<tr>
@@ -231,12 +239,6 @@
 			<td class="name" nowrap="nowrap"><a href="Detection.html">Detection</a></td>
 			<td class="summary">
 <p> This module contains the DETECTION classes.</p>
-</td>
-			</tr>
-			<tr>
-			<td class="name" nowrap="nowrap"><a href="DetectionManager.html">DetectionManager</a></td>
-			<td class="summary">
-<p>This module contains the DETECTION_MANAGER class and derived classes.</p>
 </td>
 			</tr>
 			<tr>
@@ -248,7 +250,13 @@
 			<tr>
 			<td class="name" nowrap="nowrap"><a href="Event.html">Event</a></td>
 			<td class="summary">
-<p>The EVENT class models an efficient event handling process between other classes and its units, weapons.</p>
+<p>This module contains the EVENT class.</p>
+</td>
+			</tr>
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="Fsm.html">Fsm</a></td>
+			<td class="summary">
+<p>This module contains the FSM class.</p>
 </td>
 			</tr>
 			<tr>
@@ -315,12 +323,6 @@
 			<td class="name" nowrap="nowrap"><a href="Positionable.html">Positionable</a></td>
 			<td class="summary">
 <p>This module contains the POSITIONABLE class.</p>
-</td>
-			</tr>
-			<tr>
-			<td class="name" nowrap="nowrap"><a href="Process.html">Process</a></td>
-			<td class="summary">
-
 </td>
 			</tr>
 			<tr>
@@ -336,15 +338,15 @@
 </td>
 			</tr>
 			<tr>
-			<td class="name" nowrap="nowrap"><a href="Process_Smoke.html">Process_Smoke</a></td>
+			<td class="name" nowrap="nowrap"><a href="Route.html">Route</a></td>
 			<td class="summary">
-
+<p>(SP) (MP) (FSM) Route AI or players through waypoints or to zones.</p>
 </td>
 			</tr>
 			<tr>
-			<td class="name" nowrap="nowrap"><a href="Route.html">Route</a></td>
+			<td class="name" nowrap="nowrap"><a href="ScheduleDispatcher.html">ScheduleDispatcher</a></td>
 			<td class="summary">
-<p>(SP) (MP) (FSM) Route AI or players to waypoints or zones.</p>
+<p>This module defines the SCHEDULEDISPATCHER class, which is used by a central object called _SCHEDULEDISPATCHER.</p>
 </td>
 			</tr>
 			<tr>
@@ -372,15 +374,15 @@
 </td>
 			</tr>
 			<tr>
-			<td class="name" nowrap="nowrap"><a href="Spawn.html">Spawn</a></td>
+			<td class="name" nowrap="nowrap"><a href="Smoke.html">Smoke</a></td>
 			<td class="summary">
-<p>This module contains the SPAWN class.</p>
+<p>(SP) (MP) (FSM) Route AI or players through waypoints or to zones.</p>
 </td>
 			</tr>
 			<tr>
-			<td class="name" nowrap="nowrap"><a href="StateMachine.html">StateMachine</a></td>
+			<td class="name" nowrap="nowrap"><a href="Spawn.html">Spawn</a></td>
 			<td class="summary">
-<p>This module contains the STATEMACHINE class.</p>
+<p>This module contains the SPAWN class.</p>
 </td>
 			</tr>
 			<tr>
@@ -398,7 +400,7 @@
 			<tr>
 			<td class="name" nowrap="nowrap"><a href="Task.html">Task</a></td>
 			<td class="summary">
-<p>This module contains the TASK_BASE class.</p>
+<p>This module contains the TASK class.</p>
 </td>
 			</tr>
 			<tr>
@@ -429,12 +431,19 @@
 			<td class="name" nowrap="nowrap"><a href="Unit.html">Unit</a></td>
 			<td class="summary">
 <p>This module contains the UNIT class.</p>
+</td>
+			</tr>
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="Utils.html">Utils</a></td>
+			<td class="summary">
+<p>This module contains derived utilities taken from the MIST framework, 
+which are excellent tools to be reused in an OO environment!.</p>
 </td>
 			</tr>
 			<tr>
 			<td class="name" nowrap="nowrap"><a href="Zone.html">Zone</a></td>
 			<td class="summary">
-<p>This module contains the ZONE classes, inherited from <a href="Zone.html##(ZONE_BASE)">Zone#ZONE_BASE</a>.</p>
+<p>This module contains the ZONE classes, inherited from <a href="Core.Zone.html##(ZONE_BASE)">Core.Zone#ZONE_BASE</a>.</p>
 </td>
 			</tr>
 			<tr>
@@ -447,6 +456,12 @@
 			<td class="name" nowrap="nowrap"><a href="land.html">land</a></td>
 			<td class="summary">
 
+</td>
+			</tr>
+			<tr>
+			<td class="name" nowrap="nowrap"><a href="routines.html">routines</a></td>
+			<td class="summary">
+<p>Various routines</p>
 </td>
 			</tr>
 	</table>
diff --git a/Moose Training/Documentation/land.html b/Moose Training/Documentation/land.html
index 17f1a7876..951505f35 100644
--- a/Moose Training/Documentation/land.html	
+++ b/Moose Training/Documentation/land.html	
@@ -17,7 +17,7 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
 					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
@@ -26,6 +26,7 @@
 					<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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -42,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -56,17 +57,16 @@
 					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
 					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
@@ -75,9 +75,11 @@
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
+					<li><a href="Utils.html">Utils</a></li>
 					<li><a href="Zone.html">Zone</a></li>
 					<li><a href="env.html">env</a></li>
 					<li>land</li>
+					<li><a href="routines.html">routines</a></li>
 		</ul>
 	</div>
 	<div id="content">
@@ -203,7 +205,7 @@ point on the ground. </p>
 		</ul>
 		<h3>Return value</h3>
 				
-<p><em><a href="DCSTypes.html##(Distance)">DCSTypes#Distance</a>:</em></p>
+<p><em><a href="Dcs.DCSTypes.html##(Distance)">Dcs.DCSTypes#Distance</a>:</em></p>
 
 
 </dd>
diff --git a/Moose Training/Documentation/routines.html b/Moose Training/Documentation/routines.html
index 09c5cc167..11e68a822 100644
--- a/Moose Training/Documentation/routines.html	
+++ b/Moose Training/Documentation/routines.html	
@@ -17,13 +17,16 @@
 				<a href="index.html">index</a>
 			</li></ul>
 		<ul>
-					<li><a href="AIBalancer.html">AIBalancer</a></li>
+					<li><a href="AI_Balancer.html">AI_Balancer</a></li>
+					<li><a href="Account.html">Account</a></li>
 					<li><a href="Airbase.html">Airbase</a></li>
 					<li><a href="AirbasePolice.html">AirbasePolice</a></li>
+					<li><a href="Assign.html">Assign</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="CommandCenter.html">CommandCenter</a></li>
 					<li><a href="Controllable.html">Controllable</a></li>
 					<li><a href="DCSAirbase.html">DCSAirbase</a></li>
 					<li><a href="DCSCoalitionObject.html">DCSCoalitionObject</a></li>
@@ -40,9 +43,9 @@
 					<li><a href="DCStrigger.html">DCStrigger</a></li>
 					<li><a href="Database.html">Database</a></li>
 					<li><a href="Detection.html">Detection</a></li>
-					<li><a href="DetectionManager.html">DetectionManager</a></li>
 					<li><a href="Escort.html">Escort</a></li>
 					<li><a href="Event.html">Event</a></li>
+					<li><a href="Fsm.html">Fsm</a></li>
 					<li><a href="Group.html">Group</a></li>
 					<li><a href="Identifiable.html">Identifiable</a></li>
 					<li><a href="MOVEMENT.html">MOVEMENT</a></li>
@@ -51,28 +54,25 @@
 					<li><a href="MissileTrainer.html">MissileTrainer</a></li>
 					<li><a href="Mission.html">Mission</a></li>
 					<li><a href="Object.html">Object</a></li>
+					<li><a href="Patrol.html">Patrol</a></li>
 					<li><a href="Point.html">Point</a></li>
 					<li><a href="Positionable.html">Positionable</a></li>
-					<li><a href="Process.html">Process</a></li>
-					<li><a href="Process_Destroy.html">Process_Destroy</a></li>
 					<li><a href="Process_JTAC.html">Process_JTAC</a></li>
-					<li><a href="Process_PatrolZone.html">Process_PatrolZone</a></li>
 					<li><a href="Process_Pickup.html">Process_Pickup</a></li>
-					<li><a href="Process_Smoke.html">Process_Smoke</a></li>
+					<li><a href="Route.html">Route</a></li>
+					<li><a href="ScheduleDispatcher.html">ScheduleDispatcher</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="Smoke.html">Smoke</a></li>
 					<li><a href="Spawn.html">Spawn</a></li>
-					<li><a href="StateMachine.html">StateMachine</a></li>
 					<li><a href="Static.html">Static</a></li>
 					<li><a href="StaticObject.html">StaticObject</a></li>
 					<li><a href="Task.html">Task</a></li>
 					<li><a href="Task_A2G.html">Task_A2G</a></li>
-					<li><a href="Task_Assign.html">Task_Assign</a></li>
 					<li><a href="Task_Client_Menu.html">Task_Client_Menu</a></li>
 					<li><a href="Task_PICKUP.html">Task_PICKUP</a></li>
-					<li><a href="Task_Route.html">Task_Route</a></li>
 					<li><a href="Task_SEAD.html">Task_SEAD</a></li>
 					<li><a href="Unit.html">Unit</a></li>
 					<li><a href="Utils.html">Utils</a></li>