FLIGHTPLAN

Navigation
- Added NavFix
2026-07-17 07:33:56 +00:00 · 2023-08-03 00:41:34 +02:00 · 2023-08-02 10:53:28 +02:00 · 2023-08-01 00:25:08 +02:00 · 2023-08-01 00:24:49 +02:00 · 2023-07-31 21:58:01 +02:00
66 changed files with 76846 additions and 400 deletions
@@ -28,6 +28,13 @@ local.properties
 .buildpath


+#####################
+## Visual Studio Code
+#####################
+*.code-workspace
+.vscode/
+
+
 #################
 ## Visual Studio
 #################
@@ -0,0 +1,785 @@
+--- **Core** - Client Menu Management.
+--
+-- **Main Features:**
+--
+--    * For complex, non-static menu structures
+--    * Lightweigt implementation as alternative to MENU
+--    * Separation of menu tree creation from menu on the clients's side
+--    * Works with a SET_CLIENT set of clients
+--    * Allow manipulation of the shadow tree in various ways
+--    * Push to all or only one client
+--    * Change entries' menu text
+--    * Option to make an entry usable once only across all clients
+--    * Auto appends GROUP and CLIENT objects to menu calls
+--
+-- ===
+--
+-- ### Author: **applevangelist**
+-- 
+-- ===
+-- 
+-- @module Core.ClientMenu
+-- @image Core_Menu.JPG
+-- last change: July 2023
+
+-- TODO
+----------------------------------------------------------------------------------------------------------------
+--
+-- CLIENTMENU
+--
+----------------------------------------------------------------------------------------------------------------
+
+---
+-- @type CLIENTMENU
+-- @field #string ClassName Class Name
+-- @field #string lid Lid for log entries
+-- @field #string version Version string
+-- @field #string name Name
+-- @field #table path
+-- @field #table parentpath
+-- @field #CLIENTMENU Parent
+-- @field Wrapper.Client#CLIENT client
+-- @field #number GroupID Group ID
+-- @field #number ID Entry ID
+-- @field Wrapper.Group#GROUP group
+-- @field #string UUID Unique ID based on path+name
+-- @field #string Function
+-- @field #table Functionargs
+-- @field #table Children
+-- @field #boolean Once
+-- @field #boolean Generic
+-- @field #boolean debug
+-- @field #CLIENTMENUMANAGER Controller
+-- @extends Core.Base#BASE
+
+---
+-- @field #CLIENTMENU
+CLIENTMENU = {
+  ClassName = "CLIENTMENUE",
+  lid = "",
+  version = "0.1.0",
+  name = nil,
+  path = nil,
+  group = nil,
+  client = nil,
+  GroupID = nil,
+  Children = {},
+  Once = false,
+  Generic = false,
+  debug = false,
+  Controller = nil,
+}
+
+---
+-- @field #CLIENTMENU_ID
+CLIENTMENU_ID = 0
+
+--- Create an new CLIENTMENU object.
+-- @param #CLIENTMENU self
+-- @param Wrapper.Client#CLIENT Client The client for whom this entry is.
+-- @param #string Text Text of the F10 menu entry.
+-- @param #CLIENTMENU Parent The parent menu entry.
+-- @param #string Function (optional) Function to call when the entry is used.
+-- @param ... (optional) Arguments for the Function, comma separated
+-- @return #CLIENTMENU self 
+function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
+  -- Inherit everything from BASE class.
+  local self=BASE:Inherit(self, BASE:New()) -- #CLIENTMENU
+  CLIENTMENU_ID = CLIENTMENU_ID + 1
+  self.ID = CLIENTMENU_ID
+  if Client then
+    self.group = Client:GetGroup()
+    self.client = Client
+    self.GroupID = self.group:GetID()
+  else
+    self.Generic = true
+  end
+  self.name = Text or "unknown entry"
+  if Parent then
+    if Parent:IsInstanceOf("MENU_BASE") then
+      self.parentpath = Parent.MenuPath
+    else
+      self.parentpath = Parent:GetPath()
+      Parent:AddChild(self)
+    end
+  end
+  self.Parent = Parent
+  self.Function = Function
+  self.Functionargs = arg or {}
+  table.insert(self.Functionargs,self.group)
+  table.insert(self.Functionargs,self.client)
+  if self.Functionargs and self.debug then
+    self:T({"Functionargs",self.Functionargs})
+  end
+  if not self.Generic then
+    if Function ~= nil then
+      local ErrorHandler = function( errmsg )
+        env.info( "MOOSE Error in CLIENTMENU COMMAND function: " .. errmsg )
+        if BASE.Debug ~= nil then
+          env.info( BASE.Debug.traceback() )
+        end
+        return errmsg
+      end
+      self.CallHandler = function()
+      local function MenuFunction() 
+        return self.Function( unpack( self.Functionargs ) )
+      end
+        local Status, Result = xpcall( MenuFunction, ErrorHandler)
+        if self.Once == true then
+          self:Clear()
+        end
+      end
+      self.path = missionCommands.addCommandForGroup(self.GroupID,Text,self.parentpath, self.CallHandler)
+    else
+      self.path = missionCommands.addSubMenuForGroup(self.GroupID,Text,self.parentpath)
+    end
+  else
+    if self.parentpath then
+      self.path = UTILS.DeepCopy(self.parentpath)
+    else
+      self.path = {}
+    end
+    self.path[#self.path+1] = Text
+  end
+  self.UUID = table.concat(self.path,";")
+  self:T({self.UUID})
+  self.Once = false
+  -- Log id.
+  self.lid=string.format("CLIENTMENU %s | %s | ", self.ID, self.name)
+  self:T(self.lid.."Created")
+  return self
+end
+
+--- Create a UUID
+-- @param #CLIENTMENU self
+-- @param #CLIENTMENU Parent The parent object if any
+-- @param #string Text The menu entry text
+-- @return #string UUID
+function CLIENTMENU:CreateUUID(Parent,Text)
+  local path = {}
+  if Parent and Parent.path then
+    path = Parent.path
+  end
+  path[#path+1] = Text
+  local UUID = table.concat(path,";")
+  return UUID
+end
+
+--- Set the CLIENTMENUMANAGER for this entry.
+-- @param #CLIENTMENU self
+-- @param #CLIENTMENUMANAGER Controller The controlling object.
+-- @return #CLIENTMENU self 
+function CLIENTMENU:SetController(Controller)
+  self.Controller = Controller
+  return self
+end
+
+--- The entry will be deleted after being used used - for menu entries with functions only.
+-- @param #CLIENTMENU self
+-- @return #CLIENTMENU self 
+function CLIENTMENU:SetOnce()
+  self:T(self.lid.."SetOnce")
+  self.Once = true
+  return self
+end
+
+--- Remove the entry from the F10 menu.
+-- @param #CLIENTMENU self
+-- @return #CLIENTMENU self 
+function CLIENTMENU:RemoveF10()
+  self:T(self.lid.."RemoveF10")
+  if self.GroupID then
+    --self:I(self.lid.."Removing "..table.concat(self.path,";"))
+    missionCommands.removeItemForGroup(self.GroupID , self.path )
+  end
+  return self
+end
+
+--- Get the menu path table.
+-- @param #CLIENTMENU self
+-- @return #table Path
+function CLIENTMENU:GetPath()
+  self:T(self.lid.."GetPath")
+  return self.path 
+end
+
+--- Get the UUID.
+-- @param #CLIENTMENU self
+-- @return #string UUID
+function CLIENTMENU:GetUUID()
+  self:T(self.lid.."GetUUID")
+  return self.UUID
+end
+
+--- Link a child entry.
+-- @param #CLIENTMENU self
+-- @param #CLIENTMENU Child The entry to link as a child.
+-- @return #CLIENTMENU self
+function CLIENTMENU:AddChild(Child)
+  self:T(self.lid.."AddChild "..Child.ID)
+  table.insert(self.Children,Child.ID,Child)
+  return self
+end
+
+--- Remove a child entry.
+-- @param #CLIENTMENU self
+-- @param #CLIENTMENU Child The entry to remove from the children.
+-- @return #CLIENTMENU self
+function CLIENTMENU:RemoveChild(Child)
+  self:T(self.lid.."RemoveChild "..Child.ID)
+  table.remove(self.Children,Child.ID)
+  return self
+end
+
+--- Remove all subentries (children) from this entry.
+-- @param #CLIENTMENU self
+-- @return #CLIENTMENU self
+function CLIENTMENU:RemoveSubEntries()
+  self:T(self.lid.."RemoveSubEntries")
+  self:T({self.Children})
+  for _id,_entry in pairs(self.Children) do
+    self:T("Removing ".._id)
+    if _entry then
+      _entry:RemoveSubEntries()
+      _entry:RemoveF10()
+      if _entry.Parent then
+        _entry.Parent:RemoveChild(self)
+      end
+      --if self.Controller then
+        --self.Controller:_RemoveByID(_entry.ID)
+      --end
+      --_entry = nil
+    end
+  end
+  return self
+end
+
+--- Remove this entry and all subentries (children) from this entry.
+-- @param #CLIENTMENU self
+-- @return #CLIENTMENU self
+function CLIENTMENU:Clear()
+  self:T(self.lid.."Clear")
+  for _id,_entry in pairs(self.Children) do
+    if _entry then
+      _entry:RemoveSubEntries()
+      _entry = nil
+    end
+  end
+  self:RemoveF10()
+  if self.Parent then
+    self.Parent:RemoveChild(self)
+  end
+  --if self.Controller then
+    --self.Controller:_RemoveByID(self.ID)
+  --end
+  return self
+end
+
+-- TODO
+----------------------------------------------------------------------------------------------------------------
+--
+-- CLIENTMENUMANAGER
+--
+----------------------------------------------------------------------------------------------------------------
+
+
+--- Class CLIENTMENUMANAGER              
+-- @type CLIENTMENUMANAGER
+-- @field #string ClassName Class Name
+-- @field #string lid Lid for log entries
+-- @field #string version Version string
+-- @field #string name Name
+-- @field Core.Set#SET_CLIENT clientset The set of clients this menu manager is for
+-- @field #table flattree
+-- @field #table rootentries
+-- @field #table menutree
+-- @field #number entrycount
+-- @field #boolean debug
+-- @extends Core.Base#BASE
+
+--- *As a child my family's menu consisted of two choices: take it, or leave it.*
+--
+-- ===
+--
+-- ## CLIENTMENU and CLIENTMENUMANAGER
+-- 
+-- Manage menu structures for a SET_CLIENT of clients.
+-- 
+-- ## Concept
+-- 
+-- Separate creation of a menu tree structure from pushing it to each client. Create a shadow "reference" menu structure tree for your client pilot's in a mission. 
+-- This can then be propagated to all clients. Manipulate the entries in the structure with removing, clearing or changing single entries, create replacement sub-structures 
+-- for entries etc, push to one or all clients.
+-- 
+-- Many functions can either change the tree for one client or for all clients.
+-- 
+-- ## Create a base reference tree and send to all clients
+-- 
+--            local clientset = SET_CLIENT:New():FilterStart()
+--            
+--            local menumgr = CLIENTMENUMANAGER:New(clientset,"Dayshift")
+--            local mymenu = menumgr:NewEntry("Top")
+--            local mymenu_lv1a = menumgr:NewEntry("Level 1 a",mymenu)
+--            local mymenu_lv1b = menumgr:NewEntry("Level 1 b",mymenu)
+--            -- next one is a command menu entry, which can only be used once
+--            local mymenu_lv1c = menumgr:NewEntry("Action Level 1 c",mymenu, testfunction, "testtext"):SetOnce()
+--            
+--            local mymenu_lv2a = menumgr:NewEntry("Go here",mymenu_lv1a)
+--            local mymenu_lv2b = menumgr:NewEntry("Level 2 ab",mymenu_lv1a)
+--            local mymenu_lv2c = menumgr:NewEntry("Level 2 ac",mymenu_lv1a)
+--            
+--            local mymenu_lv2ba = menumgr:NewEntry("Level 2 ba",mymenu_lv1b)
+--            local mymenu_lv2bb = menumgr:NewEntry("Level 2 bb",mymenu_lv1b)
+--            local mymenu_lv2bc = menumgr:NewEntry("Level 2 bc",mymenu_lv1b)
+--            
+--            local mymenu_lv3a = menumgr:NewEntry("Level 3 aaa",mymenu_lv2a)
+--            local mymenu_lv3b = menumgr:NewEntry("Level 3 aab",mymenu_lv2a)
+--            local mymenu_lv3c = menumgr:NewEntry("Level 3 aac",mymenu_lv2a)
+--            
+--            menumgr:Propagate()
+--            
+-- ## Remove a single entry's subtree
+-- 
+--            menumgr:RemoveSubEntries(mymenu_lv3a)
+--            
+ -- ## Remove a single entry and also it's subtree
+-- 
+--            menumgr:DeleteEntry(mymenu_lv3a)
+-- 
+-- ## Add a single entry
+-- 
+--            local baimenu = menumgr:NewEntry("BAI",mymenu_lv1b)
+--            
+--            menumgr:AddEntry(baimenu)  
+--            
+-- ## Add an entry with a function 
+-- 
+--            local baimenu = menumgr:NewEntry("Task Action", mymenu_lv1b, TestFunction, Argument1, Argument1)
+--            
+--  Now, the class will **automatically append the call with GROUP and CLIENT objects**, as this is can only be done when pushing the entry to the clients. So, the actual function implementation needs to look like this:
+--  
+--            function TestFunction( Argument1, Argument2, Group, Client)
+--            
+--  **Caveat is**, that you need to ensure your arguments are not **nil** or **false**, as LUA will optimize those away. You would end up having Group and Client in wrong places in the function call. Hence,
+--  if you need/ want to send **nil** or **false**, send a place holder instead and ensure your function can handle this, e.g.
+--  
+--            local baimenu = menumgr:NewEntry("Task Action", mymenu_lv1b, TestFunction, "nil", Argument1)
+--     
+-- ## Change the text of a leaf entry in the menu tree          
+--            
+--            menumgr:ChangeEntryTextForAll(mymenu_lv1b,"Attack")
+--            
+-- ## Reset a single clients menu tree
+-- 
+--            menumgr:ResetMenu(client)
+--            
+-- ## Reset all and clear the reference tree
+-- 
+--            menumgr:ResetMenuComplete() 
+--
+-- @field #CLIENTMENUMANAGER
+CLIENTMENUMANAGER = {
+  ClassName = "CLIENTMENUMANAGER",
+  lid = "",
+  version = "0.1.0",
+  name = nil,
+  clientset = nil,
+  menutree = {},
+  flattree = {},
+  playertree = {},
+  entrycount = 0,
+  rootentries = {},
+  debug = true,
+}
+
+--- Create a new ClientManager instance.
+-- @param #CLIENTMENUMANAGER self
+-- @param Core.Set#SET_CLIENT ClientSet The set of clients to manage.
+-- @param #string Alias The name of this manager.
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:New(ClientSet, Alias)
+  -- Inherit everything from FSM class.
+  local self=BASE:Inherit(self, BASE:New()) -- #CLIENTMENUMANAGER
+  self.clientset = ClientSet
+  self.name = Alias or "Nightshift"
+    -- Log id.
+  self.lid=string.format("CLIENTMENUMANAGER %s | %s | ", self.version, self.name)
+  if self.debug then
+    self:T(self.lid.."Created")
+  end
+  return self
+end
+
+--- Create a new entry in the generic structure.
+-- @param #CLIENTMENUMANAGER self
+-- @param #string Text Text of the F10 menu entry.
+-- @param #CLIENTMENU Parent The parent menu entry.
+-- @param #string Function (optional) Function to call when the entry is used.
+-- @param ... (optional) Arguments for the Function, comma separated.
+-- @return #CLIENTMENU Entry
+function CLIENTMENUMANAGER:NewEntry(Text,Parent,Function,...)
+  self:T(self.lid.."NewEntry "..Text or "None")
+  self.entrycount = self.entrycount + 1
+  local entry = CLIENTMENU:NewEntry(nil,Text,Parent,Function,unpack(arg))
+  if not Parent then
+    self.rootentries[self.entrycount] = entry
+  end
+  local depth = #entry.path
+  if not self.menutree[depth] then self.menutree[depth] = {} end
+  table.insert(self.menutree[depth],entry.UUID)
+  self.flattree[entry.UUID] = entry
+  return entry
+end
+
+--- Check matching entry in the generic structure by UUID.
+-- @param #CLIENTMENUMANAGER self
+-- @param #string UUID UUID of the menu entry.
+-- @return #boolean Exists
+function CLIENTMENUMANAGER:EntryUUIDExists(UUID)
+  local exists = self.flattree[UUID] and true or false
+  return exists
+end
+
+--- Find matching entry in the generic structure by UUID.
+-- @param #CLIENTMENUMANAGER self
+-- @param #string UUID UUID of the menu entry.
+-- @return #CLIENTMENU Entry The #CLIENTMENU object found or nil.
+function CLIENTMENUMANAGER:FindEntryByUUID(UUID)
+  self:T(self.lid.."FindEntryByUUID "..UUID or "None")
+  local entry = nil
+  for _gid,_entry in pairs(self.flattree) do
+    local Entry = _entry -- #CLIENTMENU
+    if Entry and Entry.UUID == UUID then
+      entry = Entry
+    end
+  end
+  return entry
+end
+
+--- Find matching entries by text in the generic structure by UUID.
+-- @param #CLIENTMENUMANAGER self
+-- @param #string Text Text or partial text of the menu entry to find.
+-- @param #CLIENTMENU Parent (Optional) Only find entries under this parent entry.
+-- @return #table Table of matching UUIDs of #CLIENTMENU objects
+-- @return #table Table of matching #CLIENTMENU objects
+-- @return #number Number of matches
+function CLIENTMENUMANAGER:FindUUIDsByText(Text,Parent)
+  self:T(self.lid.."FindUUIDsByText "..Text or "None")
+  local matches = {}
+  local entries = {}
+  local n = 0
+  for _uuid,_entry in pairs(self.flattree) do
+    local Entry = _entry -- #CLIENTMENU
+    if Parent then
+      if Entry and string.find(Entry.name,Text) and string.find(Entry.UUID,Parent.UUID) then
+        table.insert(matches,_uuid)
+        table.insert(entries,Entry )
+        n=n+1
+      end
+    else
+      if Entry and string.find(Entry.name,Text) then
+        table.insert(matches,_uuid)
+        table.insert(entries,Entry )
+        n=n+1
+      end
+    end
+  end
+  return matches, entries, n
+end
+
+--- Find matching entries in the generic structure by the menu text.
+-- @param #CLIENTMENUMANAGER self
+-- @param #string Text Text or partial text of the F10 menu entry.
+-- @param #CLIENTMENU Parent (Optional) Only find entries under this parent entry.
+-- @return #table Table of matching #CLIENTMENU objects.
+-- @return #number Number of matches
+function CLIENTMENUMANAGER:FindEntriesByText(Text,Parent)
+  self:T(self.lid.."FindEntriesByText "..Text or "None")
+  local matches, objects, number = self:FindUUIDsByText(Text, Parent)
+  return objects, number
+end
+
+--- Find matching entries under a parent in the generic structure by UUID.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Parent Find entries under this parent entry.
+-- @return #table Table of matching UUIDs of #CLIENTMENU objects
+-- @return #table Table of matching #CLIENTMENU objects
+-- @return #number Number of matches
+function CLIENTMENUMANAGER:FindUUIDsByParent(Parent)
+  self:T(self.lid.."FindUUIDsByParent")
+  local matches = {}
+  local entries = {}
+  local n = 0
+  for _uuid,_entry in pairs(self.flattree) do
+    local Entry = _entry -- #CLIENTMENU
+    if Parent then
+      if Entry and string.find(Entry.UUID,Parent.UUID) then
+        table.insert(matches,_uuid)
+        table.insert(entries,Entry )
+        n=n+1
+      end
+    end
+  end
+  return matches, entries, n
+end
+
+--- Find matching entries in the generic structure under a parent.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Parent Find entries under this parent entry.
+-- @return #table Table of matching #CLIENTMENU objects.
+-- @return #number Number of matches
+function CLIENTMENUMANAGER:FindEntriesByParent(Parent)
+  self:T(self.lid.."FindEntriesByParent")
+  local matches, objects, number = self:FindUUIDsByParent(Parent)
+  return objects, number
+end
+
+--- Alter the text of a leaf entry in the generic structure and push to one specific client's F10 menu.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Entry The menu entry.
+-- @param #string Text New Text of the F10 menu entry.
+-- @param Wrapper.Client#CLIENT Client (optional) The client for whom to alter the entry, if nil done for all clients.
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:ChangeEntryText(Entry, Text, Client)
+  self:T(self.lid.."ChangeEntryText "..Text or "None")
+  local newentry = CLIENTMENU:NewEntry(nil,Text,Entry.Parent,Entry.Function,unpack(Entry.Functionargs))
+  self:DeleteF10Entry(Entry,Client)
+  self:DeleteGenericEntry(Entry)
+  if not Entry.Parent then
+    self.rootentries[self.entrycount] = newentry
+  end
+  local depth = #newentry.path
+  if not self.menutree[depth] then self.menutree[depth] = {} end
+  table.insert(self.menutree[depth],newentry.UUID)
+  self.flattree[newentry.UUID] = newentry
+  self:AddEntry(newentry,Client)
+  return self
+end
+
+--- Push the complete menu structure to each of the clients in the set - refresh the menu tree of the clients.
+-- @param #CLIENTMENUMANAGER self
+-- @param Wrapper.Client#CLIENT Client (optional) If given, propagate only for this client.
+-- @return #CLIENTMENU Entry
+function CLIENTMENUMANAGER:Propagate(Client)
+  self:T(self.lid.."Propagate")
+  self:T(Client)
+  local Set = self.clientset.Set
+  if Client then
+    Set = {Client}
+  end
+  self:ResetMenu(Client)
+  for _,_client in pairs(Set) do
+    local client = _client -- Wrapper.Client#CLIENT
+    if client and client:IsAlive() then
+      local playername = client:GetPlayerName()
+        if not self.playertree[playername] then
+          self.playertree[playername] = {}
+        end
+        for level,branch in pairs (self.menutree) do
+          self:T("Building branch:" .. level)
+          for _,leaf in pairs(branch) do
+            self:T("Building leaf:" .. leaf)
+            local entry = self:FindEntryByUUID(leaf)
+            if entry then
+              self:T("Found generic entry:" .. entry.UUID)
+              local parent = nil
+              if entry.Parent and entry.Parent.UUID then
+                parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
+              end
+              self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
+              self.playertree[playername][entry.UUID].Once = entry.Once
+            else
+              self:T("NO generic entry for:" .. leaf)
+            end  
+          end
+        end
+    end
+  end
+  return self
+end
+
+--- Push a single previously created entry into the menu structure of all clients.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Entry The entry to add.
+-- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. 
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:AddEntry(Entry,Client)
+  self:T(self.lid.."AddEntry")
+  local Set = self.clientset.Set
+  if Client then
+    Set = {Client}
+  end
+  for _,_client in pairs(Set) do
+    local client = _client -- Wrapper.Client#CLIENT
+    if client and client:IsAlive() then
+      local playername = client:GetPlayerName()
+      if Entry then
+        self:T("Adding generic entry:" .. Entry.UUID)
+        local parent = nil
+        if not self.playertree[playername] then
+          self.playertree[playername] = {}
+        end
+        if Entry.Parent and Entry.Parent.UUID then
+          parent = self.playertree[playername][Entry.Parent.UUID] or self:FindEntryByUUID(Entry.Parent.UUID)
+        end
+        self.playertree[playername][Entry.UUID] = CLIENTMENU:NewEntry(client,Entry.name,parent,Entry.Function,unpack(Entry.Functionargs))
+        self.playertree[playername][Entry.UUID].Once = Entry.Once
+      else
+        self:T("NO generic entry given")
+      end 
+    end
+  end
+  return self
+end
+
+--- Blank out the menu - remove **all root entries** and all entries below from the client's F10 menus, leaving the generic structure untouched.
+-- @param #CLIENTMENUMANAGER self
+-- @param Wrapper.Client#CLIENT Client (optional) If given, remove only for this client.
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:ResetMenu(Client)
+  self:T(self.lid.."ResetMenu")
+  for _,_entry in pairs(self.rootentries) do
+    --local RootEntry = self.structure.generic[_entry]
+    if _entry then
+      self:DeleteF10Entry(_entry,Client)
+    end
+  end
+  return self
+end
+
+--- Blank out the menu - remove **all root entries** and all entries below from all clients' F10 menus, and **delete** the generic structure.
+-- @param #CLIENTMENUMANAGER self
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:ResetMenuComplete()
+  self:T(self.lid.."ResetMenuComplete")
+  for _,_entry in pairs(self.rootentries) do
+    --local RootEntry = self.structure.generic[_entry]
+    if _entry then
+      self:DeleteF10Entry(_entry)
+    end
+  end
+  self.playertree = nil
+  self.playertree = {}
+  self.rootentries = nil
+  self.rootentries = {}
+  self.menutree = nil
+  self.menutree = {}
+  return self
+end
+
+--- Remove the entry and all entries below the given entry from the client's F10 menus.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Entry The entry to remove
+-- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. In this case the generic structure will not be touched.
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:DeleteF10Entry(Entry,Client)
+  self:T(self.lid.."DeleteF10Entry")
+  local Set = self.clientset.Set
+  if Client then
+    Set = {Client}
+  end
+  for _,_client in pairs(Set) do
+    if _client and _client:IsAlive() then
+      local playername = _client:GetPlayerName()
+      if self.playertree[playername] then
+        local centry = self.playertree[playername][Entry.UUID] -- #CLIENTMENU
+        if centry then
+          --self:I("Match for "..Entry.UUID)
+          centry:Clear()
+        end
+      end
+    end
+  end
+  return self
+end
+
+--- Remove the entry and all entries below the given entry from the generic tree.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Entry The entry to remove
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:DeleteGenericEntry(Entry)
+  self:T(self.lid.."DeleteGenericEntry")
+  
+  if Entry.Children and #Entry.Children > 0 then
+    self:RemoveGenericSubEntries(Entry)
+  end
+  
+  local depth = #Entry.path
+  local uuid = Entry.UUID
+  
+  local tbl = UTILS.DeepCopy(self.menutree)
+  
+  if tbl[depth] then
+    for i=depth,#tbl do
+      --self:I("Level = "..i)
+      for _id,_uuid in pairs(tbl[i]) do
+        self:T(_uuid)
+        if string.find(_uuid,uuid) or _uuid == uuid then
+          --self:I("Match for ".._uuid)
+          self.menutree[i][_id] = nil
+          self.flattree[_uuid] = nil
+        end  
+      end 
+    end
+  end
+  
+  return self
+end
+
+--- Remove all entries below the given entry from the generic tree.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Entry The entry where to start. This entry stays.
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:RemoveGenericSubEntries(Entry)
+  self:T(self.lid.."RemoveGenericSubEntries")
+  
+  local depth = #Entry.path + 1
+  local uuid = Entry.UUID
+  
+  local tbl = UTILS.DeepCopy(self.menutree)
+  
+  if tbl[depth] then
+    for i=depth,#tbl do
+      self:T("Level = "..i)
+      for _id,_uuid in pairs(tbl[i]) do
+        self:T(_uuid)
+        if string.find(_uuid,uuid) then
+          self:T("Match for ".._uuid)
+          self.menutree[i][_id] = nil
+          self.flattree[_uuid] = nil
+        end  
+      end 
+    end
+  end  
+  return self
+end
+
+
+--- Remove all entries below the given entry from the client's F10 menus.
+-- @param #CLIENTMENUMANAGER self
+-- @param #CLIENTMENU Entry The entry where to start. This entry stays.
+-- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. In this case the generic structure will not be touched.
+-- @return #CLIENTMENUMANAGER self
+function CLIENTMENUMANAGER:RemoveF10SubEntries(Entry,Client)
+  self:T(self.lid.."RemoveSubEntries")
+  local Set = self.clientset.Set
+  if Client then
+    Set = {Client}
+  end
+  for _,_client in pairs(Set) do
+    if _client and _client:IsAlive() then
+      local playername = _client:GetPlayerName()
+      if self.playertree[playername] then
+        local centry = self.playertree[playername][Entry.UUID] -- #CLIENTMENU
+        centry:RemoveSubEntries()
+      end
+    end
+  end
+  return self
+end
+
+----------------------------------------------------------------------------------------------------------------
+--
+-- End ClientMenu
+--
+----------------------------------------------------------------------------------------------------------------
@@ -1124,7 +1124,7 @@ end
 -- @param #string AirbaseName Name of the airbase.
 -- @return #number Category.
 function DATABASE:GetCategoryFromAirbase( AirbaseName )
-  return self.AIRBASES[AirbaseName]:GetCategory()
+  return self.AIRBASES[AirbaseName]:GetAirbaseCategory()
 end


@@ -676,7 +676,7 @@ do -- COORDINATE
    local _,_,_,_,_,scenerys=self:ScanObjects(radius, false, false, true)

    local set={}
-
+    
    for _,_scenery in pairs(scenerys) do
      local scenery=_scenery --DCS#Object

@@ -2944,8 +2944,13 @@ do -- COORDINATE
    if alt < 1 then
      alttext = "very low"
    end
-    
-    local track = UTILS.BearingToCardinal(bearing) or "North"
+
+    -- corrected Track to be direction of travel of bogey (self in this case)
+   	local track = "Maneuver"
+	
+	if self.Heading then
+		track = UTILS.BearingToCardinal(self.Heading) or "North"
+    end
    
    if rangeNM > 3 then
      if SSML then -- google says "oh" instead of zero, be aware
@@ -162,7 +162,17 @@
 -- ### Array formation
 --
 --   * @{#SPAWN.InitArray}(): Make groups visible before they are actually activated, and order these groups like a battalion in an array.
--
+--   
+-- ### Group initial position - if wanted different from template position, for use with e.g. @{#SPAWN.SpawnScheduled}().   
+-- 
+--   * @{#SPAWN.InitPositionCoordinate}(): Set initial position of group via a COORDINATE.
+--   * @{#SPAWN.InitPositionVec2}(): Set initial position of group via a VEC2. 
+--   
+-- ### Set the positions of a group's units to absolute positions, or relative positions to unit No. 1
+-- 
+--   * @{#SPAWN.InitSetUnitRelativePositions}(): Spawn the UNITs of this group with individual relative positions to unit #1 and individual headings.
+--   * @{#SPAWN.InitSetUnitAbsolutePositions}(): Spawn the UNITs of this group with individual absolute positions and individual headings.
+--   
 -- ### Position randomization
 --
 --   * @{#SPAWN.InitRandomizePosition}(): Randomizes the position of @{Wrapper.Group}s that are spawned within a **radius band**, given an Outer and Inner radius, from the point that the spawn happens.
@@ -268,7 +278,7 @@ SPAWN = {
 -- @type SPAWN.Takeoff
 -- @extends Wrapper.Group#GROUP.Takeoff

--- @field #SPAWN.Takeoff Takeoff
+-- @field #SPAWN.Takeoff Takeoff
 SPAWN.Takeoff = {
  Air = 1,
  Runway = 2,
@@ -276,7 +286,7 @@ SPAWN.Takeoff = {
  Cold = 4,
 }

--- @type SPAWN.SpawnZoneTable
+-- @type SPAWN.SpawnZoneTable
 -- @list <Core.Zone#ZONE_BASE> SpawnZone

 --- Creates the main object to spawn a @{Wrapper.Group} defined in the DCS ME.
@@ -388,9 +398,9 @@ end
 --- Creates a new SPAWN instance to create new groups based on the provided template. This will also register the template for future use.
 -- @param #SPAWN self
 -- @param #table SpawnTemplate is the Template of the Group. This must be a valid Group Template structure - see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_func_addGroup)!
-- @param #string SpawnTemplatePrefix [Mandatory] is the name of the template and the prefix of the GROUP on spawn.
+-- @param #string SpawnTemplatePrefix [Mandatory] is the name of the template and the prefix of the GROUP on spawn. The name in the template **will** be overwritten!
 -- @param #string SpawnAliasPrefix [Optional] is the prefix that will be given to the GROUP on spawn.
-- @param #boolean MooseNaming [Optional] If false, skip the Moose naming additions (like groupname#001-01) - you need to ensure yourself no duplicate group names exist!
+-- @param #boolean NoMooseNamingPostfix [Optional] If true, skip the Moose naming additions (like groupname#001-01) - **but** you need to ensure yourself no duplicate group names exist!
 -- @return #SPAWN self
 -- @usage
 -- -- Spawn a P51 Mustang from scratch
@@ -491,7 +501,7 @@ end
 -- )
 -- mustang:Spawn()
 -- 
-function SPAWN:NewFromTemplate( SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPrefix, MooseNaming )
+function SPAWN:NewFromTemplate( SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPrefix, NoMooseNamingPostfix )
   local self = BASE:Inherit( self, BASE:New() )
   self:F( { SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPrefix } )
   --if SpawnAliasPrefix == nil or SpawnAliasPrefix == "" then
@@ -532,7 +542,10 @@ function SPAWN:NewFromTemplate( SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPr
    self.SpawnInitModex = nil
    self.SpawnInitAirbase = nil
    self.TweakedTemplate = true -- Check if the user is using self made template.
-    self.MooseNameing  = MooseNaming or true
+    self.MooseNameing  = true
+    if NoMooseNamingPostfix == true then
+     self.MooseNameing  = false
+    end
    
    self.SpawnGroups = {} -- Array containing the descriptions of each Group to be Spawned.
  else
@@ -1044,7 +1057,7 @@ end
 --- This method provides the functionality to randomize the spawning of the Groups at a given list of zones of different types.
 -- @param #SPAWN self
 -- @param #table SpawnZoneTable A table with @{Core.Zone} objects. If this table is given, then each spawn will be executed within the given list of @{Core.Zone}s objects.
-- @return #SPAWN
+-- @return #SPAWN self
 -- @usage
 --
 --    -- Create a zone table of the 2 zones.
@@ -1074,6 +1087,31 @@ function SPAWN:InitRandomizeZones( SpawnZoneTable )
  return self
 end

+--- This method sets a spawn position for the group that is different from the location of the template.
+-- @param #SPAWN self
+-- @param Core.Point#COORDINATE Coordinate The position to spawn from
+-- @return #SPAWN self
+function SPAWN:InitPositionCoordinate(Coordinate)
+  self:T( { self.SpawnTemplatePrefix, Coordinate:GetVec2()} )
+  self:InitPositionVec2(Coordinate:GetVec2())
+  return self
+end
+
+--- This method sets a spawn position for the group that is different from the location of the template.
+-- @param #SPAWN self
+-- @param DCS#Vec2 Vec2 The position to spawn from
+-- @return #SPAWN self
+function SPAWN:InitPositionVec2(Vec2)
+  self:T( { self.SpawnTemplatePrefix, Vec2} )
+  self.SpawnInitPosition = Vec2
+  self.SpawnFromNewPosition = true
+  self:I("MaxGroups:"..self.SpawnMaxGroups)
+  for SpawnGroupID = 1, self.SpawnMaxGroups do
+    self:_SetInitialPosition( SpawnGroupID )
+  end
+  return self
+end
+
 --- For planes and helicopters, when these groups go home and land on their home airbases and FARPs, they normally would taxi to the parking spot, shut-down their engines and wait forever until the Group is removed by the runtime environment.
 -- This method is used to re-spawn automatically (so no extra call is needed anymore) the same group after it has landed.
 -- This will enable a spawned group to be re-spawned after it lands, until it is destroyed...
@@ -1373,7 +1411,12 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
  self:F2( { SpawnTemplatePrefix = self.SpawnTemplatePrefix, SpawnIndex = SpawnIndex, AliveUnits = self.AliveUnits, SpawnMaxGroups = self.SpawnMaxGroups } )

  if self:_GetSpawnIndex( SpawnIndex ) then
-
+    
+    if self.SpawnFromNewPosition then
+     self:_SetInitialPosition( SpawnIndex )
+    end
+      
+      
    if self.SpawnGroups[self.SpawnIndex].Visible then
      self.SpawnGroups[self.SpawnIndex].Group:Activate()
    else
@@ -1611,7 +1654,7 @@ end
 -- @param #number SpawnTime The time interval defined in seconds between each new spawn of new groups.
 -- @param #number SpawnTimeVariation The variation to be applied on the defined time interval between each new spawn.
 -- The variation is a number between 0 and 1, representing the % of variation to be applied on the time interval.
-- @param #boolen WithDelay Do not spawn the **first** group immediately, but delay the spawn as per the calculation below.
+-- @param #boolean WithDelay Do not spawn the **first** group immediately, but delay the spawn as per the calculation below.
 -- Effectively the same as @{InitDelayOn}().
 -- @return #SPAWN self
 -- @usage
@@ -3124,7 +3167,11 @@ function SPAWN:_GetTemplate( SpawnTemplatePrefix )
  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnTemplatePrefix } )

  local SpawnTemplate = nil
-
+  
+  if _DATABASE.Templates.Groups[SpawnTemplatePrefix] == nil then
+    error( 'No Template exists for SpawnTemplatePrefix = ' .. SpawnTemplatePrefix )
+  end
+  
  local Template = _DATABASE.Templates.Groups[SpawnTemplatePrefix].Template
  self:F( { Template = Template } )

@@ -3158,8 +3205,10 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
  if self.TweakedTemplate ~= nil and self.TweakedTemplate == true then
    BASE:I( "WARNING: You are using a tweaked template." )
    SpawnTemplate = self.SpawnTemplate
-    if self.MooseNameing then
+    if self.MooseNameing == true then
      SpawnTemplate.name = self:SpawnGroupName( SpawnIndex )
+    else
+      SpawnTemplate.name = self:SpawnGroupName()
    end
  else
    SpawnTemplate = self:_GetTemplate( SpawnTemplatePrefix )
@@ -3291,6 +3340,57 @@ function SPAWN:_RandomizeTemplate( SpawnIndex )
  return self
 end

+--- Private method that sets the DCS#Vec2 where the Group will be spawned.
+-- @param #SPAWN self
+-- @param #number SpawnIndex
+-- @return #SPAWN self
+function SPAWN:_SetInitialPosition( SpawnIndex )
+  self:T( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
+  
+  if self.SpawnFromNewPosition then
+    
+    self:T( "Preparing Spawn at Vec2 ", self.SpawnInitPosition )
+
+    local SpawnVec2 = self.SpawnInitPosition
+
+    self:T( { SpawnVec2 = SpawnVec2 } )
+
+    local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
+
+    SpawnTemplate.route = SpawnTemplate.route or {}
+    SpawnTemplate.route.points = SpawnTemplate.route.points or {}
+    SpawnTemplate.route.points[1] = SpawnTemplate.route.points[1] or {}
+    SpawnTemplate.route.points[1].x = SpawnTemplate.route.points[1].x or 0
+    SpawnTemplate.route.points[1].y = SpawnTemplate.route.points[1].y or 0
+      
+    self:T( { Route = SpawnTemplate.route } )
+
+    for UnitID = 1, #SpawnTemplate.units do
+      local UnitTemplate = SpawnTemplate.units[UnitID]
+      self:T( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
+      local SX = UnitTemplate.x
+      local SY = UnitTemplate.y
+      local BX = SpawnTemplate.route.points[1].x
+      local BY = SpawnTemplate.route.points[1].y
+      local TX = SpawnVec2.x + (SX - BX)
+      local TY = SpawnVec2.y + (SY - BY)
+      UnitTemplate.x = TX
+      UnitTemplate.y = TY
+      -- TODO: Manage altitude based on landheight...
+      -- SpawnTemplate.units[UnitID].alt = SpawnVec2:
+      self:T( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
+    end
+    
+    SpawnTemplate.route.points[1].x = SpawnVec2.x
+    SpawnTemplate.route.points[1].y = SpawnVec2.y
+    SpawnTemplate.x = SpawnVec2.x
+    SpawnTemplate.y = SpawnVec2.y
+    
+  end
+
+  return self
+end
+
 --- Private method that randomizes the @{Core.Zone}s where the Group will be spawned.
 -- @param #SPAWN self
 -- @param #number SpawnIndex
@@ -3410,7 +3510,7 @@ end

 -- TODO Need to delete this... _DATABASE does this now ...

--- @param #SPAWN self 
+-- @param #SPAWN self 
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnBirth( EventData )
  self:F( self.SpawnTemplatePrefix )
@@ -3430,7 +3530,7 @@ function SPAWN:_OnBirth( EventData )

 end

--- @param #SPAWN self 
+-- @param #SPAWN self 
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnDeadOrCrash( EventData )
  self:F( self.SpawnTemplatePrefix )
@@ -33,7 +33,8 @@

 do

-  --- @type SPOT
+  ---
+  -- @type SPOT
  -- @extends Core.Fsm#FSM


@@ -228,7 +229,8 @@ do
  -- @param #number LaserCode Laser code.
  -- @param #number Duration Duration of lasing in seconds.
  function SPOT:onafterLaseOn( From, Event, To, Target, LaserCode, Duration )
-    self:F( { "LaseOn", Target, LaserCode, Duration } )
+    self:T({From, Event, To})
+    self:T2( { "LaseOn", Target, LaserCode, Duration } )

    local function StopLase( self )
      self:LaseOff()
@@ -256,6 +258,8 @@ do
    self:HandleEvent( EVENTS.Dead )
    
    self:__Lasing( -1 )
+    
+    return self
  end
  
  
@@ -268,7 +272,7 @@ do
  -- @param #number LaserCode Laser code.
  -- @param #number Duration Duration of lasing in seconds.
  function SPOT:onafterLaseOnCoordinate(From, Event, To, Coordinate, LaserCode, Duration)
-    self:F( { "LaseOnCoordinate", Coordinate, LaserCode, Duration } )
+    self:T2( { "LaseOnCoordinate", Coordinate, LaserCode, Duration } )

    local function StopLase( self )
      self:LaseOff()
@@ -290,12 +294,14 @@ do
    end
    
    self:__Lasing(-1)
+    return self
  end  
-
-  --- @param #SPOT self
+  
+  ---
+  -- @param #SPOT self
  -- @param Core.Event#EVENTDATA EventData
  function SPOT:OnEventDead(EventData)
-    self:F( { Dead = EventData.IniDCSUnitName, Target = self.Target } )
+    self:T2( { Dead = EventData.IniDCSUnitName, Target = self.Target } )
    if self.Target then
      if EventData.IniDCSUnitName == self.TargetName then
        self:F( {"Target dead ", self.TargetName } )
@@ -309,42 +315,51 @@ do
        self:LaseOff()
      end
    end
+    return self
  end
  
-  --- @param #SPOT self
+  ---
+  -- @param #SPOT self
  -- @param From
  -- @param Event
  -- @param To
  function SPOT:onafterLasing( From, Event, To )
-  
-    if self.Target and self.Target:IsAlive() then
-      self.SpotIR:setPoint( self.Target:GetPointVec3():AddY(1):AddY(math.random(-100,100)/100):AddX(math.random(-100,100)/100):GetVec3() )
-      self.SpotLaser:setPoint( self.Target:GetPointVec3():AddY(1):GetVec3() )
-      self:__Lasing( -0.2 )
-    elseif self.TargetCoord then
+    self:T({From, Event, To})
    
-      -- Wiggle the IR spot a bit.  
-      local irvec3={x=self.TargetCoord.x+math.random(-100,100)/100, y=self.TargetCoord.y+math.random(-100,100)/100, z=self.TargetCoord.z} --#DCS.Vec3
-      local lsvec3={x=self.TargetCoord.x, y=self.TargetCoord.y, z=self.TargetCoord.z} --#DCS.Vec3
+    if self.Lasing then
+      if self.Target and self.Target:IsAlive() then
+        
+        self.SpotIR:setPoint( self.Target:GetPointVec3():AddY(1):AddY(math.random(-100,100)/100):AddX(math.random(-100,100)/100):GetVec3() )
+        self.SpotLaser:setPoint( self.Target:GetPointVec3():AddY(1):GetVec3() )
+        
+        self:__Lasing(0.2)
+      elseif self.TargetCoord then
      
-      self.SpotIR:setPoint(irvec3)
-      self.SpotLaser:setPoint(lsvec3)
-      
-      self:__Lasing(-0.25)    
-    else
-      self:F( { "Target is not alive", self.Target:IsAlive() } )
+        -- Wiggle the IR spot a bit.  
+        local irvec3={x=self.TargetCoord.x+math.random(-100,100)/100, y=self.TargetCoord.y+math.random(-100,100)/100, z=self.TargetCoord.z} --#DCS.Vec3
+        local lsvec3={x=self.TargetCoord.x, y=self.TargetCoord.y, z=self.TargetCoord.z} --#DCS.Vec3
+        
+        self.SpotIR:setPoint(irvec3)
+        self.SpotLaser:setPoint(lsvec3)
+        
+        self:__Lasing(0.2)    
+      else
+        self:F( { "Target is not alive", self.Target:IsAlive() } )
+      end
    end
-  
+    return self
  end
-
-  --- @param #SPOT self
+  
+  ---
+  -- @param #SPOT self
  -- @param From
  -- @param Event
  -- @param To
  -- @return #SPOT
  function SPOT:onafterLaseOff( From, Event, To )
-  
-    self:F( {"Stopped lasing for ", self.Target and self.Target:GetName() or "coord", SpotIR = self.SportIR, SpotLaser = self.SpotLaser } )
+    self:T({From, Event, To})
+    
+    self:T2( {"Stopped lasing for ", self.Target and self.Target:GetName() or "coord", SpotIR = self.SportIR, SpotLaser = self.SpotLaser } )
    
    self.Lasing = false
    
@@ -383,4 +398,4 @@ do
    return self
  end
  
-end
+end
@@ -107,7 +107,7 @@ _TIMERID=0

 --- TIMER class version.
 -- @field #string version
-TIMER.version="0.1.2"
+TIMER.version="0.2.0"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -222,7 +222,20 @@ function TIMER:Stop(Delay)
    
      -- Remove timer function.
      self:T(self.lid..string.format("Stopping timer by removing timer function after %d calls!", self.ncalls))
-      timer.removeFunction(self.tid)
+
+      -- We use a pcall here because if the DCS timer does not exist any more, it crashes the whole script!
+      local status=pcall(
+        function ()
+          timer.removeFunction(self.tid)
+        end 
+      )
+      
+      -- Debug messages.
+      if status then
+        self:T2(self.lid..string.format("Stopped timer!"))
+      else
+        self:E(self.lid..string.format("WARNING: Could not remove timer function! isrunning=%s", tostring(self.isrunning)))
+      end
      
      -- Not running any more.
      self.isrunning=false
@@ -1616,7 +1616,11 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
    if (Offset.dx or Offset.dy) and (Offset.rho or Offset.theta) then
      error("Cannot use (dx, dy) with (rho, theta)")
    end
+  end

+  local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) )
+
+  if Offset then
    self.dy = Offset.dy or 0.0
    self.dx = Offset.dx or 0.0
    self.rho = Offset.rho or 0.0
@@ -1624,8 +1628,6 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
    self.relative_to_unit = Offset.relative_to_unit or false
  end

-  local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) )
-
  self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } )

  self.ZoneUNIT = ZoneUNIT
@@ -0,0 +1,806 @@
+--- **Functional** -- Send a truck to supply artillery groups.
+--
+-- ===
+--
+-- **AMMOTRUCK** - Send a truck to supply artillery groups.
+--
+-- ===
+--
+-- ## Missions:
+--
+-- ### [AmmoTruck](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/AMT%20-%20AmmoTruck/AmmoTruck%20100%20-%20NTTR%20-%20Basic)
+--
+-- ===
+--
+-- ### Author : **applevangelist**
+--
+-- @module Functional.AmmoTruck
+-- @image Artillery.JPG
+--
+-- Last update: July 2023
+
+-------------------------------------------------------------------------
+--- **AMMOTRUCK** class, extends Core.FSM#FSM
+-- @type AMMOTRUCK
+-- @field #string ClassName Class Name
+-- @field #string lid Lid for log entries
+-- @field #string version Version string
+-- @field #string alias Alias name
+-- @field #boolean debug Debug flag
+-- @field #table trucklist List of (alive) #AMMOTRUCK.data trucks
+-- @field #table targetlist  List of (alive) #AMMOTRUCK.data artillery
+-- @field #number coalition Coalition this is for
+-- @field Core.Set#SET_GROUP truckset SET of trucks
+-- @field Core.Set#SET_GROUP targetset SET of artillery
+-- @field #table remunitionqueue List of (alive) #AMMOTRUCK.data artillery to be reloaded
+-- @field #table waitingtargets  List of (alive) #AMMOTRUCK.data artillery waiting
+-- @field #number ammothreshold Threshold (min) ammo before sending a truck
+-- @field #number remunidist Max distance trucks will go
+-- @field #number monitor Monitor interval in seconds
+-- @field #number unloadtime Unload time in seconds
+-- @field #number waitingtime Max waiting time in seconds
+-- @field #boolean routeonroad Route truck on road if true (default)
+-- @field #number reloads Number of reloads a single truck can do before he must return home
+-- @extends Core.FSM#FSM
+
+--- *Amateurs talk about tactics, but professionals study logistics.* - General Robert H Barrow, USMC
+--
+-- Simple Class to re-arm your artillery with trucks.
+--
+-- #AMMOTRUCK
+-- 
+-- * Controls a SET\_GROUP of trucks which will re-arm a SET\_GROUP of artillery groups when they run out of ammunition. 
+-- 
+-- ## 1 The AMMOTRUCK concept
+-- 
+-- A SET\_GROUP of trucks which will re-arm a SET\_GROUP of artillery groups when they run out of ammunition. They will be based on a
+-- homebase and drive from there to the artillery groups and then back home.
+-- Trucks are the **only known in-game mechanic** to re-arm artillery and other units in DCS. Working units are e.g.: M-939 (blue), Ural-375 and ZIL-135 (both red).
+-- 
+-- ## 2 Set-up
+--
+-- Define a set of trucks and a set of artillery:  
+-- 
+--            local truckset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Ammo Truck"):FilterStart()
+--            local ariset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Artillery"):FilterStart()
+--
+-- Create an AMMOTRUCK object to take care of the artillery using the trucks, with a homezone:  
+-- 
+--            local ammotruck = AMMOTRUCK:New(truckset,ariset,coalition.side.BLUE,"Logistics",ZONE:FindByName("HomeZone") 
+--            
+-- ## 2 Options and their default values
+-- 
+--            ammotruck.ammothreshold = 5 -- send a truck when down to this many rounds
+--            ammotruck.remunidist = 20000 -- 20km - send trucks max this far from home
+--            ammotruck.unloadtime = 600 -- 10 minutes - min time to unload ammunition
+--            ammotruck.waitingtime = 1800 -- 30 mintes - wait max this long until remunition is done
+--            ammotruck.monitor = -60 -- 1 minute - AMMOTRUCK checks run every one minute
+--            ammotruck.routeonroad = true -- Trucks will **try** to drive on roads
+--            ammotruck.usearmygroup = false -- If true, will make use of ARMYGROUP in the background (if used in DEV branch)
+--        ammotruck.reloads = 5 -- Maxn re-arms a truck can do before he needs to go home and restock. Set to -1 for unlimited
+-- 
+-- ## 3 FSM Events to shape mission
+-- 
+-- Truck has been sent off:
+-- 
+--            function ammotruck:OnAfterRouteTruck(From, Event, To, Truckdata, Aridata)
+--              ...
+--            end
+--            
+-- Truck has arrived:
+-- 
+--            function ammotruck:OnAfterTruckArrived(From, Event, To, Truckdata)
+--              ...
+--            end 
+-- 
+-- Truck is unloading:
+-- 
+--            function ammotruck:OnAfterTruckUnloading(From, Event, To, Truckdata)
+--              ...
+--            end 
+-- 
+-- Truck is returning home:
+-- 
+--            function ammotruck:OnAfterTruckReturning(From, Event, To, Truckdata)
+--              ...
+--            end  
+-- 
+-- Truck is arrived at home:
+-- 
+--            function ammotruck:OnAfterTruckHome(From, Event, To, Truckdata)
+--              ...
+--            end 
+--                        
+-- @field #AMMOTRUCK
+AMMOTRUCK = {
+  ClassName = "AMMOTRUCK",
+  lid = "",
+  version = "0.0.12",
+  alias = "",
+  debug = false,
+  trucklist = {},
+  targetlist = {},
+  coalition = nil,
+  truckset = nil,
+  targetset = nil,
+  remunitionqueue = {},
+  waitingtargets = {},
+  ammothreshold = 5,
+  remunidist = 20000,
+  monitor = -60,
+  unloadtime = 600,
+  waitingtime = 1800,
+  routeonroad = true,
+  reloads = 5,
+}
+
+---
+-- @type AMMOTRUCK.State
+AMMOTRUCK.State = {
+  IDLE = "idle",
+  DRIVING = "driving",
+  ARRIVED = "arrived",
+  UNLOADING = "unloading",
+  RETURNING = "returning",
+  WAITING = "waiting",
+  RELOADING = "reloading",
+  OUTOFAMMO = "outofammo",
+  REQUESTED = "requested",
+}
+
+---
+--@type AMMOTRUCK.data
+--@field Wrapper.Group#GROUP group
+--@field #string name
+--@field #AMMOTRUCK.State statusquo
+--@field #number timestamp
+--@field #number ammo
+--@field Core.Point#COORDINATE coordinate
+--@field #string targetname
+--@field Wrapper.Group#GROUP targetgroup
+--@field Core.Point#COORDINATE targetcoordinate
+--@field #number reloads
+
+---
+-- @param #AMMOTRUCK self
+-- @param Core.Set#SET_GROUP Truckset Set of truck groups
+-- @param Core.Set#SET_GROUP Targetset Set of artillery groups
+-- @param #number Coalition Coalition
+-- @param #string Alias Alias Name
+-- @param Core.Zone#ZONE Homezone Home, return zone for trucks 
+-- @return #AMMOTRUCK self
+-- @usage
+-- Define a set of trucks and a set of artillery:  
+--            local truckset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Ammo Truck"):FilterStart()
+--            local ariset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Artillery"):FilterStart()
+--
+-- Create an AMMOTRUCK object to take care of the artillery using the trucks, with a homezone:  
+--            local ammotruck = AMMOTRUCK:New(truckset,ariset,coalition.side.BLUE,"Logistics",ZONE:FindByName("HomeZone") 
+function AMMOTRUCK:New(Truckset,Targetset,Coalition,Alias,Homezone)
+  
+    -- Inherit everything from BASE class.
+  local self=BASE:Inherit(self, FSM:New()) -- #AMMOTRUCK
+  
+  self.truckset = Truckset -- Core.Set#SET_GROUP
+  self.targetset = Targetset -- Core.Set#SET_GROUP
+  self.coalition = Coalition -- #number
+  self.alias = Alias -- #string
+  self.debug = false
+  self.remunitionqueue = {}
+  self.trucklist = {}
+  self.targetlist = {}
+  self.ammothreshold = 5
+  self.remunidist = 20000
+  self.homezone = Homezone -- Core.Zone#ZONE
+  self.waitingtime = 1800
+  self.usearmygroup = false
+  self.hasarmygroup = false
+  
+  -- Log id.
+  self.lid=string.format("AMMOTRUCK %s | %s | ", self.version, self.alias)
+  
+  self:SetStartState("Stopped")
+  self:AddTransition("Stopped",     "Start",               "Running")
+  self:AddTransition("*",           "Monitor",             "*")
+  self:AddTransition("*",           "RouteTruck",          "*")
+  self:AddTransition("*",           "TruckArrived",        "*")
+  self:AddTransition("*",           "TruckUnloading",      "*")
+  self:AddTransition("*",           "TruckReturning",      "*")
+  self:AddTransition("*",           "TruckHome",           "*")
+  self:AddTransition("*",           "Stop",                "Stopped")
+  
+  self:__Start(math.random(5,10))
+  
+  self:I(self.lid .. "Started")
+  
+  ------------------------
+  --- Pseudo Functions ---
+  ------------------------
+
+  --- Triggers the FSM event "Stop". Stops the AMMOTRUCK and all its event handlers.
+  -- @function [parent=#AMMOTRUCK] Stop
+  -- @param #AMMOTRUCK self
+
+  --- Triggers the FSM event "Stop" after a delay. Stops the AMMOTRUCK and all its event handlers.
+  -- @function [parent=#AMMOTRUCK] __Stop
+  -- @param #AMMOTRUCK self
+  -- @param #number delay Delay in seconds.
+  
+  --- On after "RouteTruck" event.
+  -- @function [parent=#AMMOTRUCK] OnAfterRouteTruck
+  -- @param #AMMOTRUCK self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param #AMMOTRUCK.data Truck
+  -- @param #AMMOTRUCK.data Artillery
+  
+    --- On after "TruckUnloading" event.
+  -- @function [parent=#AMMOTRUCK] OnAfterTruckUnloading
+  -- @param #AMMOTRUCK self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param #AMMOTRUCK.data Truck
+  
+    --- On after "TruckReturning" event.
+  -- @function [parent=#AMMOTRUCK] OnAfterTruckReturning
+  -- @param #AMMOTRUCK self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param #AMMOTRUCK.data Truck
+  
+    --- On after "RouteTruck" event.
+  -- @function [parent=#AMMOTRUCK] OnAfterRouteTruck
+  -- @param #AMMOTRUCK self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param #AMMOTRUCK.data Truck
+  
+    --- On after "TruckHome" event.
+  -- @function [parent=#AMMOTRUCK] OnAfterTruckHome
+  -- @param #AMMOTRUCK self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param #AMMOTRUCK.data Truck
+  
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #table dataset table of #AMMOTRUCK.data entries
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckDrivingTrucks(dataset)
+  self:T(self.lid .. " CheckDrivingTrucks")
+  local data = dataset 
+  for _,_data in pairs (data) do
+    local truck = _data -- #AMMOTRUCK.data
+    -- see if we arrived at destination
+    local coord = truck.group:GetCoordinate()
+    local tgtcoord = truck.targetcoordinate
+    local dist = coord:Get2DDistance(tgtcoord)
+    if dist <= 150 then
+      -- arrived
+      truck.statusquo = AMMOTRUCK.State.ARRIVED
+      truck.timestamp = timer.getAbsTime()
+      truck.coordinate = coord
+      self:__TruckArrived(1,truck)
+    end
+    -- still driving?
+    local Tnow = timer.getAbsTime()
+    if Tnow - truck.timestamp > 30 then
+      local group = truck.group
+      if self.usearmygroup then
+        group = truck.group:GetGroup()
+      end
+      local currspeed = group:GetVelocityKMH()
+      if truck.lastspeed then
+        if truck.lastspeed == 0 and currspeed == 0 then
+          self:T(truck.group:GetName().." Is not moving!")
+          -- try and move it
+          truck.timestamp = timer.getAbsTime()
+          if self.routeonroad then
+            group:RouteGroundOnRoad(truck.targetcoordinate,30,2,"Vee")
+          else
+            group:RouteGroundTo(truck.targetcoordinate,30,"Vee",2)
+          end
+        end
+        truck.lastspeed = currspeed
+      else
+        truck.lastspeed = currspeed
+        truck.timestamp = timer.getAbsTime()
+      end
+      self:I({truck=truck.group:GetName(),currspeed=currspeed,lastspeed=truck.lastspeed})
+    end
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param Wrapper.Group#GROUP Group
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:GetAmmoStatus(Group)
+  local ammotot, shells, rockets, bombs, missiles, narti = Group:GetAmmunition()
+  return rockets+missiles+narti
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #table dataset table of #AMMOTRUCK.data entries
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckWaitingTargets(dataset)
+  self:T(self.lid .. " CheckWaitingTargets")
+  local data = dataset 
+  for _,_data in pairs (data) do
+    local truck = _data -- #AMMOTRUCK.data
+    -- see how long we're waiting - maybe ammo truck is dead?
+    local Tnow = timer.getAbsTime()
+    local Tdiff = Tnow - truck.timestamp
+    if Tdiff > self.waitingtime then
+      local hasammo = self:GetAmmoStatus(truck.group)
+      if hasammo <= self.ammothreshold then
+        truck.statusquo = AMMOTRUCK.State.OUTOFAMMO
+      else
+        truck.statusquo = AMMOTRUCK.State.IDLE
+      end
+    end
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #table dataset table of #AMMOTRUCK.data entries
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckReturningTrucks(dataset)
+  self:T(self.lid .. " CheckReturningTrucks")
+  local data = dataset
+  local tgtcoord = self.homezone:GetCoordinate()
+  local radius = self.homezone:GetRadius()
+  for _,_data in pairs (data) do
+    local truck = _data -- #AMMOTRUCK.data
+    -- see if we arrived at destination
+    local coord = truck.group:GetCoordinate()
+    local dist = coord:Get2DDistance(tgtcoord)
+    self:T({name=truck.name,radius=radius,distance=dist})
+    if dist <= radius then
+      -- arrived
+      truck.statusquo = AMMOTRUCK.State.IDLE
+      truck.timestamp = timer.getAbsTime()
+      truck.coordinate = coord
+      truck.reloads = self.reloads or 5
+      self:__TruckHome(1,truck)
+    end
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string name Artillery group name to find
+-- @return #AMMOTRUCK.data Data
+function AMMOTRUCK:FindTarget(name)
+  self:T(self.lid .. " FindTarget")
+  local data = nil
+  local dataset = self.targetlist
+  for _,_entry in pairs(dataset) do
+    local entry = _entry -- #AMMOTRUCK.data
+    if entry.name == name then
+      data = entry
+      break
+    end
+  end
+  return data
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string name Truck group name to find
+-- @return #AMMOTRUCK.data Data
+function AMMOTRUCK:FindTruck(name)
+  self:T(self.lid .. " FindTruck")
+  local data = nil
+  local dataset = self.trucklist
+  for _,_entry in pairs(dataset) do
+    local entry = _entry -- #AMMOTRUCK.data
+    if entry.name == name then
+      data = entry
+      break
+    end
+  end
+  return data
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #table dataset table of #AMMOTRUCK.data entries
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckArrivedTrucks(dataset)
+  self:T(self.lid .. " CheckArrivedTrucks")
+  local data = dataset 
+  for _,_data in pairs (data) do
+    -- set to unloading
+    local truck = _data -- #AMMOTRUCK.data
+    truck.statusquo = AMMOTRUCK.State.UNLOADING
+    truck.timestamp = timer.getAbsTime()
+    self:__TruckUnloading(2,truck)
+    -- set target to reloading
+    local aridata = self:FindTarget(truck.targetname) -- #AMMOTRUCK.data
+    if aridata then
+      aridata.statusquo = AMMOTRUCK.State.RELOADING
+      aridata.timestamp = timer.getAbsTime()
+    end
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #table dataset table of #AMMOTRUCK.data entries
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckUnloadingTrucks(dataset)
+  self:T(self.lid .. " CheckUnloadingTrucks")
+  local data = dataset 
+  for _,_data in pairs (data) do
+    -- check timestamp
+    local truck = _data -- #AMMOTRUCK.data
+    local Tnow = timer.getAbsTime()
+    local Tpassed = Tnow - truck.timestamp
+    local hasammo = self:GetAmmoStatus(truck.targetgroup)
+    if Tpassed > self.unloadtime and hasammo > self.ammothreshold then
+      truck.statusquo = AMMOTRUCK.State.RETURNING
+      truck.timestamp = timer.getAbsTime()
+      self:__TruckReturning(2,truck)
+      -- set target to reloaded     
+      local aridata = self:FindTarget(truck.targetname) -- #AMMOTRUCK.data
+      if aridata then
+        aridata.statusquo = AMMOTRUCK.State.IDLE
+        aridata.timestamp = timer.getAbsTime()
+      end
+    end
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckTargetsAlive()
+  self:T(self.lid .. " CheckTargetsAlive")
+  local arilist = self.targetlist
+  for _,_ari in pairs(arilist) do
+    local ari = _ari -- #AMMOTRUCK.data
+    if ari.group and ari.group:IsAlive() then
+      -- everything fine
+    else
+      -- ari dead
+      self.targetlist[ari.name] = nil
+    end
+  end
+  -- new arrivals?
+  local aritable = self.targetset:GetSetObjects() --#table
+  for _,_ari in pairs(aritable) do
+    local ari = _ari -- Wrapper.Group#GROUP
+    if ari and ari:IsAlive() and not self.targetlist[ari:GetName()] then
+      local name = ari:GetName()
+      local newari = {} -- #AMMOTRUCK.data
+      newari.name = name
+      newari.group = ari
+      newari.statusquo = AMMOTRUCK.State.IDLE
+      newari.timestamp = timer.getAbsTime()
+      newari.coordinate = ari:GetCoordinate()
+      local hasammo = self:GetAmmoStatus(ari)
+      --newari.ammo = ari:GetAmmunition()
+      newari.ammo = hasammo
+      self.targetlist[name] = newari
+    end 
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:CheckTrucksAlive()
+  self:T(self.lid .. " CheckTrucksAlive")
+  local trucklist = self.trucklist
+  for _,_truck in pairs(trucklist) do
+    local truck = _truck -- #AMMOTRUCK.data
+    if truck.group and truck.group:IsAlive() then
+      -- everything fine
+    else
+      -- truck dead
+      local tgtname = truck.targetname
+      local targetdata = self:FindTarget(tgtname) -- #AMMOTRUCK.data
+      if targetdata then
+        if targetdata.statusquo ~= AMMOTRUCK.State.IDLE then
+          targetdata.statusquo = AMMOTRUCK.State.IDLE
+        end
+      end
+      self.trucklist[truck.name] = nil
+    end
+  end
+  -- new arrivals?
+  local trucktable = self.truckset:GetSetObjects() --#table
+  for _,_truck in pairs(trucktable) do
+    local truck = _truck -- Wrapper.Group#GROUP
+    if truck and truck:IsAlive() and not self.trucklist[truck:GetName()] then
+      local name = truck:GetName()
+      local newtruck = {} -- #AMMOTRUCK.data
+      newtruck.name = name
+      newtruck.group = truck
+      if self.hasarmygroup then
+        -- is (not) already ARMYGROUP?
+        if truck.ClassName and truck.ClassName == "GROUP" then
+          local trucker = ARMYGROUP:New(truck)
+          trucker:Activate()
+          newtruck.group = trucker
+        end
+      end
+      newtruck.statusquo = AMMOTRUCK.State.IDLE
+      newtruck.timestamp = timer.getAbsTime()
+      newtruck.coordinate = truck:GetCoordinate()
+      newtruck.reloads = self.reloads or 5
+      self.trucklist[name] = newtruck
+    end 
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string From
+-- @param #string Event
+-- @param #string To
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:onafterStart(From, Event, To)
+  self:T({From, Event, To})
+  if ARMYGROUP and self.usearmygroup then
+    self.hasarmygroup = true
+  else
+   self.hasarmygroup = false
+  end
+  if self.debug then
+    BASE:TraceOn()
+    BASE:TraceClass("AMMOTRUCK")
+  end
+  self:CheckTargetsAlive()
+  self:CheckTrucksAlive() 
+  self:__Monitor(-30)
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string From
+-- @param #string Event
+-- @param #string To
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:onafterMonitor(From, Event, To)
+  self:T({From, Event, To})
+  self:CheckTargetsAlive()
+  self:CheckTrucksAlive()
+  -- update ammo state
+  local remunition = false
+  local remunitionqueue = {}
+  local waitingtargets = {}
+  for _,_ari in pairs(self.targetlist) do
+    local data = _ari -- #AMMOTRUCK.data
+    if data.group and data.group:IsAlive() then
+      data.ammo = self:GetAmmoStatus(data.group)
+      data.timestamp = timer.getAbsTime()
+      local text = string.format("Ari %s | Ammo %d | State %s",data.name,data.ammo,data.statusquo)
+      self:T(text)
+      if data.ammo <= self.ammothreshold and (data.statusquo == AMMOTRUCK.State.IDLE or data.statusquo == AMMOTRUCK.State.OUTOFAMMO) then
+        -- add to remu queue
+        data.statusquo = AMMOTRUCK.State.OUTOFAMMO
+        remunitionqueue[#remunitionqueue+1] = data
+        remunition = true
+      elseif data.statusquo == AMMOTRUCK.State.WAITING then
+        waitingtargets[#waitingtargets+1] = data
+      end
+    else
+      self.targetlist[data.name] = nil
+    end
+  end
+  -- sort trucks in buckets
+  local idletrucks = {}
+  local drivingtrucks = {}
+  local unloadingtrucks = {}
+  local arrivedtrucks = {}
+  local returningtrucks = {}
+  local found = false
+  for _,_truckdata in pairs(self.trucklist) do
+    local data = _truckdata -- #AMMOTRUCK.data
+    if data.group and data.group:IsAlive() then
+        -- check state
+        local text = string.format("Truck %s | State %s",data.name,data.statusquo)
+        self:T(text)
+        if data.statusquo == AMMOTRUCK.State.IDLE then
+          idletrucks[#idletrucks+1] = data
+          found = true
+        elseif data.statusquo == AMMOTRUCK.State.DRIVING then
+          drivingtrucks[#drivingtrucks+1] = data
+        elseif data.statusquo == AMMOTRUCK.State.ARRIVED then
+          arrivedtrucks[#arrivedtrucks+1] = data
+        elseif data.statusquo == AMMOTRUCK.State.UNLOADING then
+          unloadingtrucks[#unloadingtrucks+1] = data
+        elseif data.statusquo == AMMOTRUCK.State.RETURNING then
+          returningtrucks[#returningtrucks+1] = data
+        if data.reloads > 0 or data.reloads == -1 then
+          idletrucks[#idletrucks+1] = data
+          found = true
+        end         
+        end
+    else
+      self.truckset[data.name] = nil
+    end
+  end
+  -- see if we can/need route one
+  local n=0
+  if found and remunition then
+    -- match
+    --local match = false
+    for _,_truckdata in pairs(idletrucks) do
+      local truckdata = _truckdata -- #AMMOTRUCK.data
+      local truckcoord = truckdata.group:GetCoordinate() -- Core.Point#COORDINATE
+      for _,_aridata in pairs(remunitionqueue) do
+        local aridata = _aridata -- #AMMOTRUCK.data
+        local aricoord = aridata.coordinate
+        local distance = truckcoord:Get2DDistance(aricoord)
+        if distance <= self.remunidist and aridata.statusquo == AMMOTRUCK.State.OUTOFAMMO and n <= #idletrucks then
+          n = n + 1
+          aridata.statusquo = AMMOTRUCK.State.REQUESTED
+          self:__RouteTruck(n*5,truckdata,aridata)
+          break
+        end
+      end
+    end
+  end
+  
+  -- check driving trucks
+  if #drivingtrucks > 0 then
+    self:CheckDrivingTrucks(drivingtrucks)
+  end
+  
+  -- check arrived trucks
+  if #arrivedtrucks > 0 then
+    self:CheckArrivedTrucks(arrivedtrucks)
+  end
+  
+  -- check unloading trucks
+  if #unloadingtrucks > 0 then
+    self:CheckUnloadingTrucks(unloadingtrucks)
+  end
+  
+  -- check returningtrucks trucks
+  if #returningtrucks > 0 then
+    self:CheckReturningTrucks(returningtrucks)
+  end
+  
+  -- check waiting targets
+  if #waitingtargets > 0 then
+    self:CheckWaitingTargets(waitingtargets)
+  end
+  
+  self:__Monitor(self.monitor)
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string From
+-- @param #string Event
+-- @param #string To
+-- @param #AMMOTRUCK.data Truckdata
+-- @param #AMMOTRUCK.data Aridata
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:onafterRouteTruck(From, Event, To, Truckdata, Aridata)
+  self:T({From, Event, To, Truckdata.name, Aridata.name})
+  local truckdata = Truckdata -- #AMMOTRUCK.data
+  local aridata = Aridata -- #AMMOTRUCK.data
+  local tgtgrp = aridata.group
+  local tgtzone = ZONE_GROUP:New(aridata.name,tgtgrp,30)
+  local tgtcoord = tgtzone:GetRandomCoordinate(15)
+  if self.hasarmygroup then
+    local mission = AUFTRAG:NewONGUARD(tgtcoord)
+    local oldmission = truckdata.group:GetMissionCurrent()
+    if oldmission then oldmission:Cancel() end
+    mission:SetTime(5)
+    mission:SetTeleport(false)
+    truckdata.group:AddMission(mission)
+  elseif self.routeonroad then
+    truckdata.group:RouteGroundOnRoad(tgtcoord,30)
+  else
+    truckdata.group:RouteGroundTo(tgtcoord,30)
+  end
+  truckdata.statusquo = AMMOTRUCK.State.DRIVING
+  truckdata.targetgroup = tgtgrp
+  truckdata.targetname = aridata.name
+  truckdata.targetcoordinate = tgtcoord
+  aridata.statusquo = AMMOTRUCK.State.WAITING
+  aridata.timestamp = timer.getAbsTime()
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string From
+-- @param #string Event
+-- @param #string To
+-- @param #AMMOTRUCK.data Truckdata
+-- @return #AMMOTRUCK self 
+ function AMMOTRUCK:onafterTruckUnloading(From, Event, To, Truckdata)
+   local m = MESSAGE:New("Truck "..Truckdata.name.." unloading!",15,"AmmoTruck"):ToCoalitionIf(self.coalition,self.debug)
+   local truck = Truckdata -- Functional.AmmoTruck#AMMOTRUCK.data
+   local coord = truck.group:GetCoordinate()
+   local heading = truck.group:GetHeading()
+   heading = heading < 180 and (360-heading) or (heading - 180)
+   local cid = self.coalition == coalition.side.BLUE and country.id.USA or country.id.RUSSIA
+   cid = self.coalition == coalition.side.NEUTRAL and country.id.UN_PEACEKEEPERS or cid
+   
+   local ammo = {}
+   for i=1,5 do
+     ammo[i] = SPAWNSTATIC:NewFromType("ammo_cargo","Cargos",cid)
+      :InitCoordinate(coord:Translate((15+((i-1)*4)),heading))
+      :Spawn(0,"AmmoCrate-"..math.random(1,10000))
+    end
+    
+    local function destroyammo(ammo)
+      for _,_crate in pairs(ammo) do
+        _crate:Destroy(false)
+      end
+    end
+    
+    local scheduler = SCHEDULER:New(nil,destroyammo,{ammo},self.waitingtime)
+  
+  -- one reload less
+  if truck.reloads ~= -1 then
+    truck.reloads = truck.reloads - 1
+  end
+  return self
+ end 
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string From
+-- @param #string Event
+-- @param #string To
+-- @param #AMMOTRUCK.data Truck
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:onafterTruckReturning(From, Event, To, Truck)
+  self:T({From, Event, To, Truck.name})
+  -- route home
+  local truckdata = Truck -- #AMMOTRUCK.data
+  local tgtzone = self.homezone
+  local tgtcoord = tgtzone:GetRandomCoordinate()
+  if self.hasarmygroup then
+    local mission = AUFTRAG:NewONGUARD(tgtcoord)
+    local oldmission = truckdata.group:GetMissionCurrent()
+    if oldmission then oldmission:Cancel() end
+    mission:SetTime(5)
+    mission:SetTeleport(false)
+    truckdata.group:AddMission(mission)
+  elseif self.routeonroad then
+    truckdata.group:RouteGroundOnRoad(tgtcoord,30,1,"Cone")
+  else
+    truckdata.group:RouteGroundTo(tgtcoord,30,"Cone",1)
+  end
+  return self
+end
+
+---
+-- @param #AMMOTRUCK self
+-- @param #string From
+-- @param #string Event
+-- @param #string To
+-- @return #AMMOTRUCK self 
+function AMMOTRUCK:onafterStop(From, Event, To)
+  self:T({From, Event, To})
+  return self
+end
@@ -3547,8 +3547,6 @@ end
 function ARTY:onafterRespawn(Controllable, From, Event, To)
  self:_EventFromTo("onafterRespawn", Event, From, To)

-  env.info("FF Respawning arty group")
-
  local group=self.Controllable --Wrapper.Group#GROUP

  -- Respawn group.
@@ -2354,6 +2354,7 @@ do -- DETECTION_TYPES
          if not DetectedItem then
            DetectedItem = self:AddDetectedItem( "TYPE", DetectedTypeName )
            DetectedItem.TypeName = DetectedTypeName
+            DetectedItem.Name = DetectedUnitName -- fix by @Nocke
          end

          DetectedItem.Set:AddUnit( DetectedUnit )
@@ -22,7 +22,7 @@
 -- @module Functional.Mantis
 -- @image Functional.Mantis.jpg
 --
-- Last Update: Oct 2022
+-- Last Update: July 2023

 -------------------------------------------------------------------------
 --- **MANTIS** class, extends Core.Base#BASE
@@ -104,9 +104,13 @@
 -- * Silkworm (though strictly speaking this is a surface to ship missile)
 -- * SA-2, SA-3, SA-5, SA-6, SA-7, SA-8, SA-9, SA-10, SA-11, SA-13, SA-15, SA-19
 -- * From HDS (see note on HDS below): SA-2, SA-3, SA-10B, SA-10C, SA-12, SA-17, SA-20A, SA-20B, SA-23, HQ-2
+-- 
 -- * From SMA: RBS98M, RBS70, RBS90, RBS90M, RBS103A, RBS103B, RBS103AM, RBS103BM, Lvkv9040M 
 -- **NOTE** If you are using the Swedish Military Assets (SMA), please note that the **group name** for RBS-SAM types also needs to contain the keyword "SMA"
 -- 
+-- * From CH: 2S38, PantsirS1, PantsirS2, PGL-625, HQ-17A, M903PAC2, M903PAC3, TorM2, TorM2K, TorM2M, NASAMS3-AMRAAMER, NASAMS3-AIM9X2, C-RAM, PGZ-09, S350-9M100, S350-9M96D
+-- **NOTE** If you are using the Military Assets by Currenthill (CH), please note that the **group name** for CH-SAM types also needs to contain the keyword "CHM"
+-- 
 -- Following the example started above, an SA-6 site group name should start with "Red SAM SA-6" then, or a blue Patriot installation with e.g. "Blue SAM Patriot". 
 -- **NOTE** If you are using the High-Digit-Sam Mod, please note that the **group name** for the following SAM types also needs to contain the keyword "HDS":
 -- 
@@ -369,6 +373,7 @@ MANTIS.SamData = {
  ["SA-20A"] = { Range=150, Blindspot=5, Height=27, Type="Long" , Radar="S-300PMU1"},
  ["SA-20B"] = { Range=200, Blindspot=4, Height=27, Type="Long" , Radar="S-300PMU2"},
  ["HQ-2"] = { Range=50, Blindspot=6, Height=35, Type="Medium", Radar="HQ_2_Guideline_LN" },
+  ["SHORAD"] = { Range=3, Blindspot=0, Height=3, Type="Short", Radar="Igla" }
 }

 --- SAM data HDS
@@ -415,6 +420,35 @@ MANTIS.SamDataSMA = {
  ["Lvkv9040M SMA"] = { Range=4, Blindspot=0, Height=2.5, Type="Short", Radar="LvKv9040" },      
 }

+--- SAM data CH
+-- @type MANTIS.SamDataCH
+-- @field #number Range Max firing range in km
+-- @field #number Blindspot no-firing range (green circle)
+-- @field #number Height Max firing height in km
+-- @field #string Type #MANTIS.SamType of SAM, i.e. SHORT, MEDIUM or LONG (range)
+-- @field #string Radar Radar typename on unit level (used as key)
+MANTIS.SamDataCH = {
+  -- units from CH (Military Assets by Currenthill)
+  -- https://www.currenthill.com/
+  -- group name MUST contain CHM to ID launcher type correctly!
+  ["2S38 CH"]         = { Range=8,  Blindspot=0.5,  Height=6,     Type="Short",   Radar="2S38" },
+  ["PantsirS1 CH"]      = { Range=20,   Blindspot=1.2,  Height=15,    Type="Short",   Radar="PantsirS1" },  
+  ["PantsirS2 CH"]      = { Range=30,   Blindspot=1.2,  Height=18,    Type="Medium",  Radar="PantsirS2" }, 
+  ["PGL-625 CH"]      = { Range=10,   Blindspot=0.5,  Height=5,     Type="Short",   Radar="PGL_625" }, 
+  ["HQ-17A CH"]       = { Range=20,   Blindspot=1.5,  Height=10,    Type="Short",   Radar="HQ17A" },  
+  ["M903PAC2 CH"]       = { Range=160,  Blindspot=3,  Height=24.5,  Type="Long",  Radar="MIM104_M903_PAC2" },
+  ["M903PAC3 CH"]       = { Range=120,  Blindspot=1,  Height=40,    Type="Long",  Radar="MIM104_M903_PAC3" }, 
+  ["TorM2 CH"]        = { Range=12,   Blindspot=1,  Height=10,    Type="Short",   Radar="TorM2" },
+  ["TorM2K CH"]       = { Range=12,   Blindspot=1,  Height=10,    Type="Short",   Radar="TorM2K" },
+  ["TorM2M CH"]       = { Range=16,   Blindspot=1,  Height=10,    Type="Short",   Radar="TorM2M" },   
+  ["NASAMS3-AMRAAMER CH"]   = { Range=50,   Blindspot=2,  Height=35.7,  Type="Medium",  Radar="CH_NASAMS3_LN_AMRAAM_ER" },  
+  ["NASAMS3-AIM9X2 CH"]   = { Range=20,   Blindspot=0.2,  Height=18,    Type="Short",   Radar="CH_NASAMS3_LN_AIM9X2" },
+  ["C-RAM CH"]        = { Range=2,  Blindspot=0,  Height=2,     Type="Short",   Radar="CH_Centurion_C_RAM" }, 
+  ["PGZ-09 CH"]       = { Range=4,  Blindspot=0,  Height=3,     Type="Short",   Radar="CH_PGZ09" },
+  ["S350-9M100 CH"]     = { Range=15,   Blindspot=1.5,  Height=8,     Type="Short",   Radar="CH_S350_50P6_9M100" },
+  ["S350-9M96D CH"]     = { Range=150,  Blindspot=2.5,  Height=30,    Type="Long",  Radar="CH_S350_50P6_9M96D" },       
+}
+
 -----------------------------------------------------------------------
 -- MANTIS System
 -----------------------------------------------------------------------
@@ -578,7 +612,7 @@ do
    
    -- TODO Version
    -- @field #string version
-    self.version="0.8.9"
+    self.version="0.8.11"
    self:I(string.format("***** Starting MANTIS Version %s *****", self.version))

    --- FSM Functions ---
@@ -1299,11 +1333,12 @@ do
  -- @param #string grpname Name of the group
  -- @param #boolean mod HDS mod flag
  -- @param #boolean sma SMA mod flag
+  -- @param #boolean chm CH mod flag
  -- @return #number range Max firing range
  -- @return #number height Max firing height
  -- @return #string type Long, medium or short range
  -- @return #number blind "blind" spot
-  function MANTIS:_GetSAMDataFromUnits(grpname,mod,sma)
+  function MANTIS:_GetSAMDataFromUnits(grpname,mod,sma,chm)
    self:T(self.lid.."_GetSAMRangeFromUnits")
    local found = false
    local range = self.checkradius
@@ -1318,8 +1353,10 @@ do
      SAMData = self.SamDataHDS
    elseif sma then
      SAMData = self.SamDataSMA
+    elseif chm then
+      SAMData = self.SamDataCH
    end
-    --self:I("Looking to auto-match for "..grpname)
+    --self:T("Looking to auto-match for "..grpname)
    for _,_unit in pairs(units) do
      local unit = _unit -- Wrapper.Unit#UNIT
      local type = string.lower(unit:GetTypeName())
@@ -1364,10 +1401,13 @@ do
    local found = false
    local HDSmod = false
    local SMAMod = false
+    local CHMod = false
    if string.find(grpname,"HDS",1,true) then
      HDSmod = true
    elseif string.find(grpname,"SMA",1,true) then
      SMAMod = true
+    elseif string.find(grpname,"CHM",1,true) then
+      CHMod = true
    end
    if self.automode then
      for idx,entry in pairs(self.SamData) do
@@ -1386,8 +1426,8 @@ do
      end
    end
    -- secondary filter if not found
-    if (not found and self.automode) or HDSmod or SMAMod then
-      range, height, type = self:_GetSAMDataFromUnits(grpname,HDSmod,SMAMod)
+    if (not found and self.automode) or HDSmod or SMAMod or CHMod then
+      range, height, type = self:_GetSAMDataFromUnits(grpname,HDSmod,SMAMod,CHMod)
    elseif not found then
      self:E(self.lid .. string.format("*****Could not match radar data for %s! Will default to midrange values!",grpname))
    end
@@ -5490,7 +5490,7 @@ function RAT:_ATCInit(airports_map)
  if not RAT.ATC.init then
    local text
    text="Starting RAT ATC.\nSimultanious = "..RAT.ATC.Nclearance.."\n".."Delay        = "..RAT.ATC.delay
-	  BASE:T(RAT.id..text)
+    BASE:T(RAT.id..text)
    RAT.ATC.init=true
    for _,ap in pairs(airports_map) do
      local name=ap:GetName()
@@ -5671,9 +5671,9 @@ function RAT:_ATCClearForLanding(airport, flight)

  -- Debug message.
  local text1=string.format("ATC %s: Flight %s cleared for landing (flag=%d).", airport, flight, flagvalue)
-	if string.find(flight,"#") then
-		flight =  string.match(flight,"^(.+)#")
-	end
+  if string.find(flight,"#") then
+    flight =  string.match(flight,"^(.+)#")
+  end
  local text2=string.format("ATC %s: Flight %s you are cleared for landing.", airport, flight)
  BASE:T( RAT.id..text1)
  MESSAGE:New(text2, 10):ToAllIf(RAT.ATC.messages)
@@ -5716,9 +5716,9 @@ function RAT:_ATCFlightLanded(name)
    local text1=string.format("ATC %s: Flight %s landed. Tholding = %i:%02d, Tfinal = %i:%02d.", dest, name, Thold/60, Thold%60, Tfinal/60, Tfinal%60)
    local text2=string.format("ATC %s: Number of flights still on final %d.", dest, RAT.ATC.airport[dest].Nonfinal)
    local text3=string.format("ATC %s: Traffic report: Number of planes landed in total %d. Flights/hour = %3.2f.", dest, RAT.ATC.airport[dest].traffic, TrafficPerHour)
-	if string.find(name,"#") then
-		name =  string.match(name,"^(.+)#")
-	end
+  if string.find(name,"#") then
+    name =  string.match(name,"^(.+)#")
+  end
    local text4=string.format("ATC %s: Flight %s landed. Welcome to %s.", dest, name, dest)
    BASE:T(RAT.id..text1)
    BASE:T(RAT.id..text2)
@@ -5832,6 +5832,7 @@ RATMANAGER={
  rat={},
  name={},
  alive={},
+  planned={},
  min={},
  nrat=0,
  ntot=nil,
@@ -5880,6 +5881,7 @@ function RATMANAGER:Add(ratobject,min)

  self.rat[self.nrat]=ratobject
  self.alive[self.nrat]=0
+  self.planned[self.nrat]=0
  self.name[self.nrat]=ratobject.alias
  self.min[self.nrat]=min or 1

@@ -6020,11 +6022,25 @@ function RATMANAGER:_Manage()
  for i=1,self.nrat do
    for j=1,N[i] do
      time=time+self.dTspawn
-      SCHEDULER:New(nil, RAT._SpawnWithRoute, {self.rat[i]}, time)
+      self.planned[i]=self.planned[i]+1
+      SCHEDULER:New(nil, RATMANAGER._Spawn, {self, i}, time)
    end
  end
 end

+--- Instantly starts the RAT manager and spawns the initial random number RAT groups for each RAT object.
+-- @param #RATMANAGER self
+-- @param #RATMANAGER RATMANAGER self object.
+-- @param #number i Index.
+function RATMANAGER:_Spawn(i)
+
+  local rat=self.rat[i] --#RAT
+  
+  rat:_SpawnWithRoute()
+  self.planned[i]=self.planned[i]-1
+
+end
+
 --- Counts the number of alive RAT objects.
 -- @param #RATMANAGER self
 function RATMANAGER:_Count()
@@ -6053,7 +6069,7 @@ function RATMANAGER:_Count()
    ntotal=ntotal+n

    -- Debug output.
-    local text=string.format("Number of alive groups of %s = %d", self.name[i], n)
+    local text=string.format("Number of alive groups of %s = %d, planned=%d", self.name[i], n, self.planned[i])
    self:T(RATMANAGER.id..text)
  end

@@ -6083,9 +6099,10 @@ function RATMANAGER:_RollDice(nrat,ntot,min,alive)
  local M={}
  local P={}
  for i=1,nrat do
+    local a=alive[i]+self.planned[i]
    N[#N+1]=0
-    M[#M+1]=math.max(alive[i], min[i])
-    P[#P+1]=math.max(min[i]-alive[i],0)
+    M[#M+1]=math.max(a, min[i])
+    P[#P+1]=math.max(min[i]-a,0)
  end

  -- Min/max group arrays.
@@ -6102,7 +6119,7 @@ function RATMANAGER:_RollDice(nrat,ntot,min,alive)
  -- Number of new groups to be added.
  local nnew=ntot
  for i=1,nrat do
-    nnew=nnew-alive[i]
+    nnew=nnew-alive[i]-self.planned[i]
  end

  for i=1,nrat-1 do
@@ -6134,7 +6151,7 @@ function RATMANAGER:_RollDice(nrat,ntot,min,alive)
    end

    -- Debug info
-    self:T3(string.format("RATMANAGER: i=%d, alive=%d, min=%d, mini=%d, maxi=%d, add=%d, sumN=%d, sumP=%d", j, alive[j], min[j], mini[j], maxi[j], N[j],sN, sP))
+    self:T3(string.format("RATMANAGER: i=%d, alive=%d, planned=%d, min=%d, mini=%d, maxi=%d, add=%d, sumN=%d, sumP=%d", j, alive[j], self.planned[i], min[j], mini[j], maxi[j], N[j],sN, sP))

  end

@@ -6149,7 +6166,7 @@ function RATMANAGER:_RollDice(nrat,ntot,min,alive)
  -- Debug info
  local text=RATMANAGER.id.."\n"
  for i=1,nrat do
-    text=text..string.format("%s: i=%d, alive=%d, min=%d, mini=%d, maxi=%d, add=%d\n", self.name[i], i, alive[i], min[i], mini[i], maxi[i], N[i])
+    text=text..string.format("%s: i=%d, alive=%d, planned=%d, min=%d, mini=%d, maxi=%d, add=%d\n", self.name[i], i, alive[i], self.planned[i], min[i], mini[i], maxi[i], N[i])
  end
  text=text..string.format("Total # of groups to add = %d", sum(N, done))
  self:T(text)
@@ -715,11 +715,11 @@ function SCORING:AddGoalScorePlayer( PlayerName, GoalTag, Text, Score )
    PlayerData.Goals[GoalTag] = PlayerData.Goals[GoalTag] or { Score = 0 }
    PlayerData.Goals[GoalTag].Score = PlayerData.Goals[GoalTag].Score + Score
    PlayerData.Score = PlayerData.Score + Score
-
-    MESSAGE:NewType( self.DisplayMessagePrefix .. Text,
-                     MESSAGE.Type.Information )
-           :ToAll()
-
+    if Text then
+      MESSAGE:NewType( self.DisplayMessagePrefix .. Text,
+                       MESSAGE.Type.Information )
+             :ToAll()
+    end
    self:ScoreCSV( PlayerName, "", "GOAL_" .. string.upper( GoalTag ), 1, Score, nil )
  end
 end
@@ -738,7 +738,7 @@ function SCORING:AddGoalScore( PlayerUnit, GoalTag, Text, Score )

  local PlayerName = PlayerUnit:GetPlayerName()

-  self:F( { PlayerUnit.UnitName, PlayerName, GoalTag, Text, Score } )
+  self:T2( { PlayerUnit.UnitName, PlayerName, GoalTag, Text, Score } )

  -- PlayerName can be nil, if the Unit with the player crashed or due to another reason.
  if PlayerName then
@@ -747,11 +747,12 @@ function SCORING:AddGoalScore( PlayerUnit, GoalTag, Text, Score )
    PlayerData.Goals[GoalTag] = PlayerData.Goals[GoalTag] or { Score = 0 }
    PlayerData.Goals[GoalTag].Score = PlayerData.Goals[GoalTag].Score + Score
    PlayerData.Score = PlayerData.Score + Score
-
-    MESSAGE:NewType( self.DisplayMessagePrefix .. Text,
+    
+    if Text then
+      MESSAGE:NewType( self.DisplayMessagePrefix .. Text,
                     MESSAGE.Type.Information )
           :ToAll()
-
+    end
    self:ScoreCSV( PlayerName, "", "GOAL_" .. string.upper( GoalTag ), 1, Score, PlayerUnit:GetName() )
  end
 end
@@ -784,11 +785,12 @@ function SCORING:_AddMissionTaskScore( Mission, PlayerUnit, Text, Score )

    PlayerData.Score = self.Players[PlayerName].Score + Score
    PlayerData.Mission[MissionName].ScoreTask = self.Players[PlayerName].Mission[MissionName].ScoreTask + Score
-
-    MESSAGE:NewType( self.DisplayMessagePrefix .. Mission:GetText() .. " : " .. Text .. " Score: " .. Score,
-                     MESSAGE.Type.Information )
-           :ToAll()
-
+    
+    if Text then
+      MESSAGE:NewType( self.DisplayMessagePrefix .. Mission:GetText() .. " : " .. Text .. " Score: " .. Score,
+                       MESSAGE.Type.Information )
+             :ToAll()
+    end
    self:ScoreCSV( PlayerName, "", "TASK_" .. MissionName:gsub( ' ', '_' ), 1, Score, PlayerUnit:GetName() )
  end
 end
@@ -820,9 +822,11 @@ function SCORING:_AddMissionGoalScore( Mission, PlayerName, Text, Score )

    PlayerData.Score = self.Players[PlayerName].Score + Score
    PlayerData.Mission[MissionName].ScoreTask = self.Players[PlayerName].Mission[MissionName].ScoreTask + Score
-
-    MESSAGE:NewType( string.format( "%s%s: %s! Player %s receives %d score!", self.DisplayMessagePrefix, Mission:GetText(), Text, PlayerName, Score ), MESSAGE.Type.Information ):ToAll()
-
+    
+    if Text then  
+      MESSAGE:NewType( string.format( "%s%s: %s! Player %s receives %d score!", self.DisplayMessagePrefix, Mission:GetText(), Text, PlayerName, Score ), MESSAGE.Type.Information ):ToAll()
+    end
+    
    self:ScoreCSV( PlayerName, "", "TASK_" .. MissionName:gsub( ' ', '_' ), 1, Score )
  end
 end
@@ -847,11 +851,12 @@ function SCORING:_AddMissionScore( Mission, Text, Score )

      PlayerData.Score = PlayerData.Score + Score
      PlayerData.Mission[MissionName].ScoreMission = PlayerData.Mission[MissionName].ScoreMission + Score
-
-      MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' has " .. Text .. " in " .. Mission:GetText() .. ". " .. Score .. " mission score!",
+      
+      if Text then
+        MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' has " .. Text .. " in " .. Mission:GetText() .. ". " .. Score .. " mission score!",
                       MESSAGE.Type.Information )
             :ToAll()
-
+      end
      self:ScoreCSV( PlayerName, "", "MISSION_" .. MissionName:gsub( ' ', '_' ), 1, Score )
    end
  end
@@ -1762,9 +1767,9 @@ function SCORING:SecondsToClock( sSeconds )
    -- return nil;
    return "00:00:00";
  else
-    nHours = string.format( "%02.f", math.floor( nSeconds / 3600 ) );
-    nMins = string.format( "%02.f", math.floor( nSeconds / 60 - (nHours * 60) ) );
-    nSecs = string.format( "%02.f", math.floor( nSeconds - nHours * 3600 - nMins * 60 ) );
+    local nHours = string.format( "%02.f", math.floor( nSeconds / 3600 ) );
+    local nMins = string.format( "%02.f", math.floor( nSeconds / 60 - (nHours * 60) ) );
+    local nSecs = string.format( "%02.f", math.floor( nSeconds - nHours * 3600 - nMins * 60 ) );
    return nHours .. ":" .. nMins .. ":" .. nSecs
  end
 end
@@ -6671,7 +6671,13 @@ function WAREHOUSE:_OnEventCrashOrDead(EventData)
        self:Destroyed()
      end
      if self.airbase and self.airbasename and self.airbasename==EventData.IniUnitName then
-        self:RunwayDestroyed()      
+        if self:IsRunwayOperational() then
+          -- Trigger RunwayDestroyed event (only if it is not destroyed already)
+          self:RunwayDestroyed()
+        else
+          -- Reset the time stamp.
+          self.runwaydestroyed=timer.getAbsTime()
+        end        
      end
    end

@@ -1,4 +1,4 @@
--- **Functional** - Base class that models processes to achieve goals involving a Zone for a Coalition.
+--- **Functional (WIP)** - Base class modeling processes to achieve goals involving coalition zones.
 --
 -- ===
 --
@@ -1,51 +1,53 @@
 __Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' )
-__Moose.Include( 'Scripts/Moose/Utilities/Routines.lua' )
-__Moose.Include( 'Scripts/Moose/Utilities/Utils.lua' )
-__Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' )
-__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' )
-__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' )
 __Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Routines.lua' )
 __Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Utils.lua' )

 __Moose.Include( 'Scripts/Moose/Core/Base.lua' )
+
 __Moose.Include( 'Scripts/Moose/Core/Astar.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Beacon.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Condition.lua' )
-__Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Report.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' )
-__Moose.Include( 'Scripts/Moose/Core/ScheduleDispatcher.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Event.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Settings.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Menu.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Zone.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Zone_Detection.lua' )
+__Moose.Include( 'Scripts/Moose/Core/ClientMenu.lua') 
 __Moose.Include( 'Scripts/Moose/Core/Database.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Set.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Point.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Velocity.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Message.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Event.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Fsm.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Goal.lua' )
+__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Menu.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Message.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Point.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Report.lua' )
+__Moose.Include( 'Scripts/Moose/Core/ScheduleDispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Set.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Settings.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Spawn.lua' )
 __Moose.Include( 'Scripts/Moose/Core/SpawnStatic.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Timer.lua' )
-__Moose.Include( 'Scripts/Moose/Core/Goal.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Spot.lua' )
-__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' )
 __Moose.Include( 'Scripts/Moose/Core/TextAndSound.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Timer.lua' )
+__Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Velocity.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Zone_Detection.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Zone.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Pathline.lua' )

-__Moose.Include( 'Scripts/Moose/Wrapper/Object.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Identifiable.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Positionable.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Airbase.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Client.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Controllable.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Group.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Unit.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Client.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Static.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Airbase.lua' )
-__Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Identifiable.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Object.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Positionable.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Static.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Unit.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Weapon.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Net.lua' )

@@ -55,35 +57,67 @@ __Moose.Include( 'Scripts/Moose/Cargo/CargoSlingload.lua' )
 __Moose.Include( 'Scripts/Moose/Cargo/CargoCrate.lua' )
 __Moose.Include( 'Scripts/Moose/Cargo/CargoGroup.lua' )

-__Moose.Include( 'Scripts/Moose/Functional/Scoring.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/CleanUp.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Movement.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Sead.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Escort.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/MissileTrainer.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/AICSAR.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/AmmoTruck.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Artillery.lua' )
 __Moose.Include( 'Scripts/Moose/Functional/ATC_Ground.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Autolase.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/CleanUp.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Designate.lua' )
 __Moose.Include( 'Scripts/Moose/Functional/Detection.lua' )
 __Moose.Include( 'Scripts/Moose/Functional/DetectionZones.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Designate.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/RAT.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Range.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Artillery.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/PseudoATC.lua' )
-__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Escort.lua' )
 __Moose.Include( 'Scripts/Moose/Functional/Fox.lua' )
 __Moose.Include( 'Scripts/Moose/Functional/Mantis.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/MissileTrainer.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Movement.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/PseudoATC.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Range.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/RAT.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Scoring.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Sead.lua' )
 __Moose.Include( 'Scripts/Moose/Functional/Shorad.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCargo.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' )

 __Moose.Include( 'Scripts/Moose/Ops/Airboss.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/AirWing.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/ArmyGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/ATIS.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Auftrag.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Awacs.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Brigade.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Chief.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Cohort.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Commander.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/CSAR.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/CTLD.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Fleet.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/FlightControl.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/FlightGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Flotilla.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Intelligence.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Legion.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/NavyGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Operation.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/OpsGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/OpsTransport.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/OpsZone.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Platoon.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/PlayerTask.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/PlayerRecce.lua' )
 __Moose.Include( 'Scripts/Moose/Ops/RecoveryTanker.lua' )
 __Moose.Include( 'Scripts/Moose/Ops/RescueHelo.lua' )
-__Moose.Include( 'Scripts/Moose/Ops/ATIS.lua' )
-__Moose.Include( 'Scripts/Moose/Ops/CTLD.lua' )
-__Moose.Include( 'Scripts/Moose/Ops/CSAR.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Squadron.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Target.lua' )
+
+__Moose.Include( 'Scripts/Moose/Navigation/Navaid.lua' )
+__Moose.Include( 'Scripts/Moose/Navigation/NavFix.lua' )
+__Moose.Include( 'Scripts/Moose/Navigation/FlightPlan.lua' )

 __Moose.Include( 'Scripts/Moose/AI/AI_Balancer.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_Air.lua' )
@@ -122,12 +156,12 @@ __Moose.Include( 'Scripts/Moose/Actions/Act_Route.lua' )
 __Moose.Include( 'Scripts/Moose/Actions/Act_Account.lua' )
 __Moose.Include( 'Scripts/Moose/Actions/Act_Assist.lua' )

-__Moose.Include( 'Scripts/Moose/Sound/UserSound.lua' )
-__Moose.Include( 'Scripts/Moose/Sound/SoundOutput.lua' )
 __Moose.Include( 'Scripts/Moose/Sound/Radio.lua' )
 __Moose.Include( 'Scripts/Moose/Sound/RadioQueue.lua' )
 __Moose.Include( 'Scripts/Moose/Sound/RadioSpeech.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/SoundOutput.lua' )
 __Moose.Include( 'Scripts/Moose/Sound/SRS.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/UserSound.lua' )

 __Moose.Include( 'Scripts/Moose/Tasking/CommandCenter.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Mission.lua' )
@@ -0,0 +1,203 @@
+--- **NAVIGATION** - Flight Plan.
+--
+-- **Main Features:**
+--
+--    * Manage navigation aids
+--    * VOR, NDB
+-- 
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops%20-%20FlightPlan).
+-- 
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Navigation.FlightPlan
+-- @image NAVIGATION_FlightPlan.png
+
+
+--- FLIGHTPLAN class.
+-- @type FLIGHTPLAN
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity of output.
+-- @field #table fixes Navigation fixes.
+-- @field Wrapper.Airbase#AIRBASE departureAirbase Departure airbase.
+-- @field Wrapper.Airbase#AIRBASE destinationAirbase Destination airbase.
+-- @field #number altitudeCruiseMin Minimum cruise altitude in feet MSL.
+-- @field #number altitudeCruiseMax Maximum cruise altitude in feet MSL.
+-- @extends Core.Base#BASE
+
+--- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
+--
+-- ===
+--
+-- # The FLIGHTPLAN Concept
+--
+-- A FLIGHTPLAN consists of one or multiple FLOTILLAs. These flotillas "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
+-- 
+-- # Basic Setup
+-- 
+-- A new `FLIGHTPLAN` object can be created with the @{#FLIGHTPLAN.New}(`WarehouseName`, `FleetName`) function, where `WarehouseName` is the name of the static or unit object hosting the fleet
+-- and `FleetName` is the name you want to give the fleet. This must be *unique*!
+-- 
+--     myFlightplan=FLIGHTPLAN:New("Plan A")
+--     myFleet:SetPortZone(ZonePort1stFleet)
+--     myFleet:Start()
+--     
+-- A fleet needs a *port zone*, which is set via the @{#FLIGHTPLAN.SetPortZone}(`PortZone`) function. This is the zone where the naval assets are spawned and return to.
+-- 
+-- Finally, the fleet needs to be started using the @{#FLIGHTPLAN.Start}() function. If the fleet is not started, it will not process any requests.
+--
+-- @field #FLIGHTPLAN
+FLIGHTPLAN = {
+  ClassName       = "FLIGHTPLAN",
+  verbose         =       0,
+  fixes           = {}
+}
+
+--- Type of navaid
+-- @type FLIGHTPLAN.Type
+-- @field #string VOR VOR
+-- @field #string NDB NDB
+FLIGHTPLAN.TYPE={
+  VOR="VOR",
+  NDB="NDB",
+}
+  
+--- FLIGHTPLAN class version.
+-- @field #string version
+FLIGHTPLAN.version="0.0.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ToDo list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot...
+-- TODO: How to handle the FLIGHTGROUP:_LandAtAirBase
+-- TODO: Do we always need a holding pattern? https://www.faa.gov/air_traffic/publications/atpubs/aip_html/part2_enr_section_1.5.html#:~:text=If%20no%20holding%20pattern%20is,than%20that%20desired%20by%20ATC.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new FLIGHTPLAN instance.
+-- @param #FLIGHTPLAN self
+-- @param #string Name Name of this flight plan.
+-- @return #FLIGHTPLAN self
+function FLIGHTPLAN:New(Name)
+
+  -- Inherit everything from SCENERY class.
+  self=BASE:Inherit(self, BASE:New()) -- #FLIGHTPLAN
+
+  -- Set alias.
+  self.alias=tostring(Name)
+  
+  -- Set some string id for output to DCS.log file.
+  self.lid=string.format("FLIGHTPLAN %s | ", self.alias)
+  
+  -- Debug info.
+  self:I(self.lid..string.format("Created FLIGHTPLAN!"))
+
+  return self
+end
+
+--- Create a new FLIGHTPLAN instance from another FLIGHTPLAN acting as blue print.
+-- The newly created flight plan is deep copied from the given one.
+-- @param #FLIGHTPLAN self
+-- @param #FLIGHTPLAN FlightPlan Blue print of the flight plan to copy.
+-- @return #FLIGHTPLAN self
+function FLIGHTPLAN:NewFromFlightPlan(FlightPlan)
+  self=UTILS.DeepCopy(FlightPlan)
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Add navigation fix to the flight plan.
+-- @param #FLIGHTPLAN self
+-- @param Navigation.NavFix#NAVFIX NavFix The nav fix.
+-- @return #FLIGHTPLAN self
+function FLIGHTPLAN:AddNavFix(NavFix)
+
+  table.insert(self.fixes, NavFix)
+
+  return self
+end
+
+
+--- Set depature airbase.
+-- @param #FLIGHTPLAN self
+-- @param #string AirbaseName Name of the airbase or AIRBASE object.
+-- @return #FLIGHTPLAN self
+function FLIGHTPLAN:SetDepartureAirbase(AirbaseName)
+
+  self.departureAirbase=AIRBASE:FindByName(AirbaseName)
+
+  return self
+end
+
+--- Set destination airbase.
+-- @param #FLIGHTPLAN self
+-- @param #string AirbaseName Name of the airbase or AIRBASE object.
+-- @return #FLIGHTPLAN self
+function FLIGHTPLAN:SetDestinationAirbase(AirbaseName)
+
+  self.destinationAirbase=AIRBASE:FindByName(AirbaseName)
+
+  return self
+end
+
+
+--- Set cruise altitude.
+-- @param #FLIGHTPLAN self
+-- @param #number AltMin Minimum altitude in feet MSL.
+-- @param #number AltMax Maximum altitude in feet MSL. Default is `AltMin`.
+-- @return #FLIGHTPLAN self
+function FLIGHTPLAN:SetCruiseAltitude(AltMin, AltMax)
+
+  self.altitudeCruiseMin=AltMin
+  self.altitudeCruiseMax=AltMax or self.altitudeCruiseMin
+
+  return self
+end
+
+
+--- Get the name of this flight plan.
+-- @param #FLIGHTPLAN self
+-- @return #string The name.
+function FLIGHTPLAN:GetName()
+  return self.alias
+end
+
+
+--- Get cruise altitude. This returns a random altitude between the set min/max cruise altitudes.
+-- @param #FLIGHTPLAN self
+-- @return #number Cruise altitude in feet MSL.
+function FLIGHTPLAN:GetCruiseAltitude()
+
+  local alt=10000
+  if self.altitudeCruiseMin and self.altitudeCruiseMax then
+    alt=math.random(self.altitudeCruiseMin, self.altitudeCruiseMax)
+  elseif self.altitudeCruiseMin then
+    alt=self.altitudeCruiseMin
+  elseif self.altitudeCruiseMax then
+    alt=self.altitudeCruiseMax
+  end
+  
+  return alt
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Private Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -0,0 +1,212 @@
+--- **NAVIGATION** - Navigation Airspace Fix.
+--
+-- **Main Features:**
+--
+--    * Stuff
+--    * More Stuff
+-- 
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20NavFix).
+-- 
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Navigation.NavFix
+-- @image NAVIGATION_NavFix.png
+
+
+--- NAVFIX class.
+-- @type NAVFIX
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity of output.
+-- @field #string name Name of the fix.
+-- @field Core.Point#COORDINATE coordinate Coordinate of the fix.
+-- @field Wrapper.Marker#MARKER marker Marker of fix on F10 map.
+-- @field #boolean isCompulsory Is this a compulsory fix.
+-- @field #boolean isFlyover Is this a fly over fix.
+-- @field #boolean isIAF Is initial approach fix (IAF). 
+-- @field #boolean isIF Is intermediate fix (IF).
+-- 
+-- @extends Core.Base#BASE
+
+--- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
+--
+-- ===
+--
+-- # The NAVFIX Concept
+--
+-- The NAVFIX class has a great concept!
+-- 
+-- # Basic Setup
+-- 
+-- A new `NAVFIX` object can be created with the @{#NAVFIX.New}() function.
+-- 
+--     myTemplate=NAVFIX:New()
+--     myTemplate:SetXYZ(X, Y, Z)
+--     
+-- This is how it works.
+--
+-- @field #NAVFIX
+NAVFIX = {
+  ClassName       = "NAVFIX",
+  verbose         =       0,
+}
+
+--- Type of navaid
+-- @type NAVFIX.Type
+-- @field #string VOR VOR
+-- @field #string NDB NDB
+NAVFIX.Type={
+  VOR="VOR",
+  NDB="NDB",
+}
+  
+--- NAVFIX class version.
+-- @field #string version
+NAVFIX.version="0.0.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ToDo list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot...
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new NAVFIX class instance.
+-- @param #NAVFIX self
+-- @return #NAVFIX self
+function NAVFIX:New(Coordinate, Name)
+
+  -- Inherit everything from SCENERY class.
+  self=BASE:Inherit(self, BASE:New()) -- #NAVFIX
+  
+  self.coordinate=Coordinate
+  
+  self.name=Name
+  
+  self.marker=MARKER:New(Coordinate, self:_GetMarkerText())
+  self.marker:ToAll()
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Set minimum altitude.
+-- @param #NAVFIX self
+-- @param #number Altitude Min altitude in feet.
+-- @return #NAVFIX self
+function NAVFIX:SetAltMin(Altitude)
+
+  self.altMin=Altitude
+
+  return self
+end
+
+--- Set maximum altitude.
+-- @param #NAVFIX self
+-- @param #number Altitude Max altitude in feet.
+-- @return #NAVFIX self
+function NAVFIX:SetAltMax(Altitude)
+
+  self.altMax=Altitude
+
+  return self
+end
+
+--- Set whether this fix is compulsory.
+-- @param #NAVFIX self
+-- @param #boolean Compulsory If `true`, this is a compusory fix. If `false` or nil, it is non-compulsory.
+-- @return #NAVFIX self
+function NAVFIX:SetCompulsory(Compulsory)
+  self.isCompulsory=Compulsory
+  return self
+end
+
+--- Set whether this fix is compulsory.
+-- @param #NAVFIX self
+-- @param #boolean FlyOver If `true`, this is a fly over fix. If `false` or nil, it is not.
+-- @return #NAVFIX self
+function NAVFIX:SetFlyOver(FlyOver)
+  self.isFlyover=FlyOver
+  return self
+end
+
+--- Set whether this is the intermediate fix.
+-- @param #NAVFIX self
+-- @param #boolean IntermediateFix If `true`, this is an intermediate fix.
+-- @return #NAVFIX self
+function NAVFIX:SetIntermediateFix(IntermediateFix)
+  self.isIF=IntermediateFix
+  return self
+end
+
+--- Set whether this is an initial approach fix (IAF).
+-- @param #NAVFIX self
+-- @param #boolean IntermediateFix If `true`, this is an intermediate fix.
+-- @return #NAVFIX self
+function NAVFIX:SetInitialApproachFix(IntermediateFix)
+  self.isIAF=IntermediateFix
+  return self
+end
+
+--- Get the altitude in feet MSL.
+-- @param #NAVFIX self
+-- @return #number Altitude in feet MSL. Can be `#nil`
+function NAVFIX:GetAltitude()
+
+  local alt=nil
+  if self.altMin and self.altMax then
+    alt=math.random(self.altMin, self.altMax)
+  elseif self.altMin then
+    alt=self.altMin
+  elseif self.altMax then
+    alt=self.altMax
+  end
+
+  return alt
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Private Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Get text displayed in the F10 marker.
+-- @param #NAVFIX self
+-- @return #string Marker text.
+function NAVFIX:_GetMarkerText()
+
+  local altmin=self.altMin and tostring(self.altMin) or ""
+  local altmax=self.altMax and tostring(self.altMax) or ""
+  local speedmin=self.speedMin and tostring(self.speedMin) or ""
+  local speedmax=self.speedMax and tostring(self.speedMax) or ""
+
+
+  local text=string.format("NAVFIX %s", self.name)
+  if self.isIAF then
+    text=text..string.format(" (IAF)")
+  end
+  if self.isIF then
+    text=text..string.format(" (IF)")
+  end
+  text=text..string.format("\nAltitude: %s - %s", altmin, altmax)
+  text=text..string.format("\nSpeed: %s - %s", speedmin, speedmax)
+  text=text..string.format("\nCompulsory: %s", tostring(self.isCompulsory))
+  text=text..string.format("\nFly Over: %s", tostring(self.isFlyover))    
+  
+  return text
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -0,0 +1,172 @@
+--- **Navigation** - Navigation aid.
+--
+-- **Main Features:**
+--
+--    * Manage navigation aids
+--    * VOR, NDB
+-- 
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20Navaid).
+-- 
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Navigation.Navaid
+-- @image Navigation_Navaid.png
+
+
+--- NAVAID class.
+-- @type NAVAID
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity of output.
+-- @extends Core.Base#BASE
+
+--- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
+--
+-- ===
+--
+-- # The NAVAID Concept
+--
+-- A NAVAID consists of one or multiple FLOTILLAs. These flotillas "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
+-- 
+-- # Basic Setup
+-- 
+-- A new `NAVAID` object can be created with the @{#NAVAID.New}(`WarehouseName`, `FleetName`) function, where `WarehouseName` is the name of the static or unit object hosting the fleet
+-- and `FleetName` is the name you want to give the fleet. This must be *unique*!
+-- 
+--     myFleet=NAVAID:New("myWarehouseName", "1st Fleet")
+--     myFleet:SetPortZone(ZonePort1stFleet)
+--     myFleet:Start()
+--     
+-- A fleet needs a *port zone*, which is set via the @{#NAVAID.SetPortZone}(`PortZone`) function. This is the zone where the naval assets are spawned and return to.
+-- 
+-- Finally, the fleet needs to be started using the @{#NAVAID.Start}() function. If the fleet is not started, it will not process any requests.
+--
+-- @field #NAVAID
+NAVAID = {
+  ClassName       = "NAVAID",
+  verbose         =       0,
+}
+
+--- Type of navaid
+-- @type NAVAID.Type
+-- @field #string VOR VOR
+-- @field #string NDB NDB
+NAVAID.TYPE={
+  VOR="VOR",
+  NDB="NDB",
+}
+  
+--- NAVAID class version.
+-- @field #string version
+NAVAID.version="0.0.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ToDo list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot...
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new NAVAID class instance.
+-- @param #NAVAID self
+-- @param #string ZoneName Name of the zone to scan the scenery.
+-- @param #string SceneryName Name of the scenery object.
+-- @param #string Type Type of Navaid.
+-- @return #NAVAID self
+function NAVAID:New(ZoneName, SceneryName, Type)
+
+  -- Inherit everything from SCENERY class.
+  self=BASE:Inherit(self, BASE:New()) -- #NAVAID
+
+
+  self.zone=ZONE:FindByName(ZoneName)  
+  
+  self.coordinate=self.zone:GetCoordinate()
+  
+  if SceneryName then
+    self.scenery=SCENERY:FindByNameInZone(SceneryName, ZoneName)
+    if not self.scenery then
+      self:E("ERROR: Could not find scenery object %s in zone %s", SceneryName, ZoneName)
+    end
+  end
+  
+  self.alias=string.format("%s %s %s", tostring(ZoneName), tostring(SceneryName), tostring(Type))
+  
+
+  -- Set some string id for output to DCS.log file.
+  self.lid=string.format("NAVAID %s | ", self.alias)
+  
+  self:I(self.lid..string.format("Created NAVAID!"))
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Set frequency.
+-- @param #NAVAID self
+-- @param #number Frequency Frequency in Hz.
+-- @return #NAVAID self
+function NAVAID:SetFrequency(Frequency)
+
+  self.frequency=Frequency
+
+  return self
+end
+
+--- Set channel.
+-- @param #NAVAID self
+-- @param #number Channel
+-- @param #string Band
+-- @return #NAVAID self
+function NAVAID:SetChannel(Channel, Band)
+
+  self.channel=Channel
+  self.band=Band
+
+  return self
+end
+
+--- Add marker the NAVAID on the F10 map.
+-- @param #NAVAID self
+-- @return #NAVAID self
+function NAVAID:AddMarker()
+
+  local text=string.format("I am a NAVAID!")
+  
+  self.markID=self.coordinate:MarkToAll(text, true)
+
+  return self
+end
+
+--- Remove marker of the NAVAID from the F10 map.
+-- @param #NAVAID self
+-- @return #NAVAID self
+function NAVAID:DelMarker()
+
+  if self.markID then
+    UTILS.RemoveMark(self.markID)
+  end
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Private Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -0,0 +1,108 @@
+--- **NAVIGATION** - Template.
+--
+-- **Main Features:**
+--
+--    * Stuff
+--    * More Stuff
+-- 
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20Template).
+-- 
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Navigation.Template
+-- @image NAVIGATION_Template.png
+
+
+--- TEMPLATE class.
+-- @type TEMPLATE
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity of output.
+-- @extends Core.Base#BASE
+
+--- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
+--
+-- ===
+--
+-- # The TEMPLATE Concept
+--
+-- The TEMPLATE class has a great concept!
+-- 
+-- # Basic Setup
+-- 
+-- A new `TEMPLATE` object can be created with the @{#TEMPLATE.New}() function.
+-- 
+--     myTemplate=TEMPLATE:New()
+--     myTemplate:SetXYZ(X, Y, Z)
+--     
+-- This is how it works.
+--
+-- @field #TEMPLATE
+TEMPLATE = {
+  ClassName       = "TEMPLATE",
+  verbose         =       0,
+}
+
+--- Type of navaid
+-- @type TEMPLATE.Type
+-- @field #string VOR VOR
+-- @field #string NDB NDB
+TEMPLATE.TYPE={
+  VOR="VOR",
+  NDB="NDB",
+}
+  
+--- TEMPLATE class version.
+-- @field #string version
+TEMPLATE.version="0.0.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ToDo list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot...
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new TEMPLATE class instance.
+-- @param #TEMPLATE self
+-- @return #TEMPLATE self
+function TEMPLATE:New()
+
+  -- Inherit everything from SCENERY class.
+  self=BASE:Inherit(self, BASE:New()) -- #TEMPLATE
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Set frequency.
+-- @param #TEMPLATE self
+-- @param #number Frequency Frequency in Hz.
+-- @return #TEMPLATE self
+function TEMPLATE:SetFrequency(Frequency)
+
+  self.frequency=Frequency
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Private Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1,3 +1,4 @@
+---@diagnostic disable: cast-local-type
 --- **Ops** - Automatic Terminal Information Service (ATIS).
 --
 -- ===
@@ -608,15 +609,16 @@ _ATIS = {}

 --- ATIS class version.
 -- @field #string version
-ATIS.version = "0.9.14"
+ATIS.version = "0.9.15"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

-- TODO: Add new Normandy airfields.
-- TODO: Zulu time --> Zulu in output.
 -- TODO: Correct fog for elevation.
+-- DONE: Zulu time --> Zulu in output.
+-- DONE: Fix for AB not having a runway - Helopost like Naqoura
+-- DONE: Add new Normandy airfields.
 -- DONE: Use new AIRBASE system to set start/landing runway
 -- DONE: SetILS doesn't work
 -- DONE: Visibility reported twice over SRS
@@ -2139,16 +2141,20 @@ function ATIS:onafterBroadcast( From, Event, To )
    end
  end
  alltext = alltext .. ";\n" .. subtitle
+  
+  local _RUNACT

  if not self.ATISforFARPs then
    -- Active runway.
-    local subtitle=string.format("Active runway %s", runwayLanding)
-    if rwyLandingLeft==true then
-      subtitle=subtitle.." Left"
-    elseif rwyLandingLeft==false then
-      subtitle=subtitle.." Right"
+    if runwayLanding then
+      local subtitle=string.format("Active runway %s", runwayLanding)
+      if rwyLandingLeft==true then
+        subtitle=subtitle.." Left"
+      elseif rwyLandingLeft==false then
+        subtitle=subtitle.." Right"
+      end
    end
-    local _RUNACT = subtitle
+    _RUNACT = subtitle
    if not self.useSRS then
      self:Transmission(ATIS.Sound.ActiveRunway, 1.0, subtitle)
      self.radioqueue:Number2Transmission(runwayLanding)
@@ -2509,8 +2515,11 @@ function ATIS:GetActiveRunway(Takeoff)
  else
    runway=self.airbase:GetActiveRunwayLanding()
  end
-  
-  return runway.name, runway.isLeft
+  if runway then -- some ABs have NO runways, e.g. Syria Naqoura
+    return runway.name, runway.isLeft
+  else
+    return nil, nil
+  end
 end

 --- Get runway from user supplied magnetic heading.
@@ -152,12 +152,16 @@
 -- @field #boolean ICLSon Automatic ICLS is activated.
 -- @field #number ICLSchannel ICLS channel.
 -- @field #string ICLSmorse ICLS morse code, e.g. "STN".
+-- @field #AIRBOSS.Radio PilotRadio Radio for Pilot calls.
 -- @field #AIRBOSS.Radio LSORadio Radio for LSO calls.
 -- @field #number LSOFreq LSO radio frequency in MHz.
 -- @field #string LSOModu LSO radio modulation "AM" or "FM".
 -- @field #AIRBOSS.Radio MarshalRadio Radio for carrier calls.
 -- @field #number MarshalFreq Marshal radio frequency in MHz.
 -- @field #string MarshalModu Marshal radio modulation "AM" or "FM".
+-- @field #AIRBOSS.Radio AirbossRadio Radio for carrier calls.
+-- @field #number AirbossFreq Airboss radio frequency in MHz.
+-- @field #string AirbossModu Airboss radio modulation "AM" or "FM".
 -- @field #number TowerFreq Tower radio frequency in MHz.
 -- @field Core.Scheduler#SCHEDULER radiotimer Radio queue scheduler.
 -- @field Core.Zone#ZONE_UNIT zoneCCA Carrier controlled area (CCA), i.e. a zone of 50 NM radius around the carrier.
@@ -1731,6 +1735,10 @@ AIRBOSS.Difficulty = {
 -- @field #table trapsheet Groove data table recorded every 0.5 seconds.
 -- @field #boolean trapon If true, save trap sheets.
 -- @field #string debriefschedulerID Debrief scheduler ID.
+-- 
+-- @field Sound.SRS#MSRS SRS
+-- @field Sound.SRS#MSRSQUEUE SRSQ
+-- 
 -- @extends #AIRBOSS.FlightGroup

 --- Main group level radio menu: F10 Other/Airboss.
@@ -1743,7 +1751,7 @@ AIRBOSS.MenuF10Root = nil

 --- Airboss class version.
 -- @field #string version
-AIRBOSS.version = "1.3.0"
+AIRBOSS.version = "1.3.2"
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1876,6 +1884,7 @@ function AIRBOSS:New( carriername, alias )

  -- Set up Airboss radio.
  self:SetMarshalRadio()
+  self:SetAirbossRadio()

  -- Set up LSO radio.
  self:SetLSORadio()
@@ -2847,7 +2856,7 @@ function AIRBOSS:SetGlideslopeErrorThresholds(_max,_min, High, HIGH, Low, LOW)

  --Check if V/STOL Carrier
  if self.carriertype == AIRBOSS.CarrierType.INVINCIBLE or self.carriertype == AIRBOSS.CarrierType.HERMES or self.carriertype == AIRBOSS.CarrierType.TARAWA or self.carriertype == AIRBOSS.CarrierType.AMERICA or self.carriertype == AIRBOSS.CarrierType.JCARLOS or self.carriertype == AIRBOSS.CarrierType.CANBERRA then
-  
+
  -- allow a larger GSE for V/STOL operations --Pene Testing
  self.gle._max=_max or  0.7
  self.gle.High=High or  1.4
@@ -2864,7 +2873,7 @@ function AIRBOSS:SetGlideslopeErrorThresholds(_max,_min, High, HIGH, Low, LOW)
  self.gle.Low=Low   or -0.6
  self.gle.LOW=LOW   or -0.9
  end
-  
+
  return self
 end

@@ -2884,7 +2893,7 @@ function AIRBOSS:SetLineupErrorThresholds(_max,_min, Left, LeftMed, LEFT, Right,

  --Check if V/STOL Carrier -- Pene testing
  if self.carriertype == AIRBOSS.CarrierType.INVINCIBLE or self.carriertype == AIRBOSS.CarrierType.HERMES or self.carriertype == AIRBOSS.CarrierType.TARAWA or self.carriertype == AIRBOSS.CarrierType.AMERICA or self.carriertype == AIRBOSS.CarrierType.JCARLOS or self.carriertype == AIRBOSS.CarrierType.CANBERRA then
-  
+
  -- V/STOL Values -- allow a larger LUE for V/STOL operations
  self.lue._max=_max   or  1.8
  self.lue._min=_min   or -1.8
@@ -2905,7 +2914,7 @@ function AIRBOSS:SetLineupErrorThresholds(_max,_min, Left, LeftMed, LEFT, Right,
  self.lue.RightMed=RightMed or  2.0
  self.lue.RIGHT=RIGHT or  3.0
  end
-  
+
  return self
 end

@@ -3043,12 +3052,56 @@ function AIRBOSS:SetBeaconRefresh( TimeInterval )
  return self
 end

+--- Set up SRS for usage without sound files
+-- @param #AIRBOSS self
+-- @param #string PathToSRS Path to SRS folder, e.g. "C:\\Program Files\\DCS-SimpleRadio-Standalone".
+-- @param #number Port Port of the SRS server, defaults to 5002.
+-- @param #string Culture (Optional, Airboss Culture)  Culture, defaults to "en-US".
+-- @param #string Gender (Optional, Airboss Gender)  Gender, e.g. "male" or "female". Defaults to "male".
+-- @param #string Voice (Optional, Airboss Voice) Set to use a specific voice. Will **override gender and culture** settings.  
+-- @param #string GoogleCreds (Optional) Path to Google credentials, e.g. "C:\\Program Files\\DCS-SimpleRadio-Standalone\\yourgooglekey.json".
+-- @param #number Volume (Optional) E.g. 0.75. Defaults to 1.0 (loudest).
+-- @param #table AltBackend (Optional) See MSRS for details.
+-- @return #AIRBOSS self
+function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volume,AltBackend)
+  -- SRS
+  local Frequency = self.AirbossRadio.frequency
+  local Modulation = self.AirbossRadio.modulation
+  self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,Volume,AltBackend)
+  self.SRS:SetCoalition(self:GetCoalition())
+  self.SRS:SetCoordinate(self:GetCoordinate())
+  self.SRS:SetCulture(Culture or "en-US")
+  --self.SRS:SetFrequencies(Frequencies)
+  self.SRS:SetGender(Gender or "male")
+  self.SRS:SetPath(PathToSRS)
+  self.SRS:SetPort(Port or 5002)
+  self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS")
+  --self.SRS:SetModulations(Modulations)
+  if GoogleCreds then
+    self.SRS:SetGoogle(GoogleCreds)
+  end
+  if Voice then
+    self.SRS:SetVoice(Voice)
+  end
+  self.SRS:SetVolume(Volume or 1.0)
+  -- SRSQUEUE
+  self.SRSQ = MSRSQUEUE:New("AIRBOSS")
+  self.SRSQ:SetTransmitOnlyWithPlayers(true)
+  if not self.PilotRadio then 
+    self:SetSRSPilotVoice()
+  end
+  return self  
+end
+
 --- Set LSO radio frequency and modulation. Default frequency is 264 MHz AM.
 -- @param #AIRBOSS self
 -- @param #number Frequency (Optional) Frequency in MHz. Default 264 MHz.
 -- @param #string Modulation (Optional) Modulation, "AM" or "FM". Default "AM".
+-- @param #string Voice (Optional) SRS specific voice
+-- @param #string Gender (Optional) SRS specific gender
+-- @param #string Culture (Optional) SRS specific culture
 -- @return #AIRBOSS self
-function AIRBOSS:SetLSORadio( Frequency, Modulation )
+function AIRBOSS:SetLSORadio( Frequency, Modulation, Voice, Gender, Culture  )

  self.LSOFreq = (Frequency or 264)
  Modulation = Modulation or "AM"
@@ -3063,16 +3116,62 @@ function AIRBOSS:SetLSORadio( Frequency, Modulation )
  self.LSORadio.frequency = self.LSOFreq
  self.LSORadio.modulation = self.LSOModu
  self.LSORadio.alias = "LSO"
+  self.LSORadio.voice = Voice
+  self.LSORadio.gender = Gender or "male"
+  self.LSORadio.culture = Culture or "en-US"

  return self
 end

--- Set carrier radio frequency and modulation. Default frequency is 305 MHz AM.
+--- Set Airboss radio frequency and modulation. Default frequency is Tower frequency.
+-- @param #AIRBOSS self
+-- @param #number Frequency (Optional) Frequency in MHz. Default frequency is Tower frequency.
+-- @param #string Modulation (Optional) Modulation, "AM" or "FM". Default "AM".
+-- @param #string Voice (Optional) SRS specific voice
+-- @param #string Gender (Optional) SRS specific gender
+-- @param #string Culture (Optional) SRS specific culture
+-- @return #AIRBOSS self
+-- @usage
+--    -- Set single frequency
+--    myairboss:SetAirbossRadio(127.5,"AM",MSRS.Voices.Google.Standard.en_GB_Standard_F)
+--
+--    -- Set multiple frequencies, note you **need** to pass one modulation per frequency given!
+--    myairboss:SetAirbossRadio({127.5,243},{radio.modulation.AM,radio.modulation.AM},MSRS.Voices.Google.Standard.en_GB_Standard_F)
+function AIRBOSS:SetAirbossRadio( Frequency, Modulation, Voice, Gender, Culture )
+
+  self.AirbossFreq = Frequency or self:_GetTowerFrequency() or 127.5
+  Modulation = Modulation or "AM"
+
+  if type(Modulation) == "table" then
+    self.AirbossModu = Modulation
+  else
+    if Modulation == "FM" then
+      self.AirbossModu = radio.modulation.FM
+    else
+      self.AirbossModu = radio.modulation.AM
+    end
+  end
+
+  self.AirbossRadio = {} -- #AIRBOSS.Radio
+  self.AirbossRadio.frequency = self.AirbossFreq
+  self.AirbossRadio.modulation = self.AirbossModu
+  self.AirbossRadio.alias = "AIRBOSS"
+  self.AirbossRadio.voice = Voice
+  self.AirbossRadio.gender = Gender or "male"
+  self.AirbossRadio.culture = Culture or "en-US"
+
+  return self
+end
+
+--- Set Marshal radio frequency and modulation. Default frequency is 305 MHz AM.
 -- @param #AIRBOSS self
 -- @param #number Frequency (Optional) Frequency in MHz. Default 305 MHz.
 -- @param #string Modulation (Optional) Modulation, "AM" or "FM". Default "AM".
+-- @param #string Voice (Optional) SRS specific voice
+-- @param #string Gender (Optional) SRS specific gender
+-- @param #string Culture (Optional) SRS specific culture
 -- @return #AIRBOSS self
-function AIRBOSS:SetMarshalRadio( Frequency, Modulation )
+function AIRBOSS:SetMarshalRadio( Frequency, Modulation, Voice, Gender, Culture )

  self.MarshalFreq = Frequency or 305
  Modulation = Modulation or "AM"
@@ -3087,6 +3186,9 @@ function AIRBOSS:SetMarshalRadio( Frequency, Modulation )
  self.MarshalRadio.frequency = self.MarshalFreq
  self.MarshalRadio.modulation = self.MarshalModu
  self.MarshalRadio.alias = "MARSHAL"
+  self.MarshalRadio.voice = Voice
+  self.MarshalRadio.gender = Gender or "male"
+  self.MarshalRadio.culture = Culture or "en-US"

  return self
 end
@@ -3268,7 +3370,7 @@ function AIRBOSS:SetExtraVoiceOversAI(status)
  self.xtVoiceOversAI=status
  return self
 end
- 
+
 --- Do not handle AI aircraft.
 -- @param #AIRBOSS self
 -- @return #AIRBOSS self
@@ -3383,9 +3485,9 @@ end
 -- @param #string Host Host. Default `"127.0.0.1"`.
 -- @return #AIRBOSS self
 function AIRBOSS:SetFunkManOn(Port, Host)
-  
+
  self.funkmanSocket=SOCKET:New(Port, Host)
-  
+
  return self
 end

@@ -5826,7 +5928,7 @@ function AIRBOSS:_ScanCarrierZone()
    if knownflight then

      -- Check if flight is AI and if we want to handle it at all.
-      if knownflight.ai and knownflight.flag == -100 and self.handleai and false then --Disabled AI handling because of incorrect OPSGROUP reference!
+      if knownflight.ai and knownflight.flag == -100 and self.handleai then

        local putintomarshal = false

@@ -6364,7 +6466,7 @@ function AIRBOSS:_LandAI( flight )
  -- Aircraft speed when flying the pattern.
  local Speed = UTILS.KnotsToKmph( 200 )

-  if   flight.actype == AIRBOSS.AircraftCarrier.HORNET 
+  if   flight.actype == AIRBOSS.AircraftCarrier.HORNET
    or flight.actype == AIRBOSS.AircraftCarrier.FA18C
    or flight.actype == AIRBOSS.AircraftCarrier.RHINOE
    or flight.actype == AIRBOSS.AircraftCarrier.RHINOF
@@ -8102,7 +8204,7 @@ end
 -- @param Core.Event#EVENTDATA EventData
 function AIRBOSS:OnEventBirth( EventData )
  self:F3( { eventbirth = EventData } )
-  
+
  -- Nil checks.
  if EventData == nil then
    self:E( self.lid .. "ERROR: EventData=nil in event BIRTH!" )
@@ -8114,9 +8216,9 @@ function AIRBOSS:OnEventBirth( EventData )
    self:E( EventData )
    return
  end
-  
+
  if EventData.IniObjectCategory ~= Object.Category.UNIT then return end
-  
+
  local _unitName = EventData.IniUnitName
  local _unit, _playername = self:_GetPlayerUnitAndName( _unitName )

@@ -9194,9 +9296,9 @@ function AIRBOSS:_DirtyUp( playerData )
    self:_PlayerHint( playerData )

    -- Radio call "Say/Fly needles". Delayed by 10/15 seconds.
-    if   playerData.actype == AIRBOSS.AircraftCarrier.HORNET 
-      or playerData.actype == AIRBOSS.AircraftCarrier.F14A 
-      or playerData.actype == AIRBOSS.AircraftCarrier.F14B 
+    if   playerData.actype == AIRBOSS.AircraftCarrier.HORNET
+      or playerData.actype == AIRBOSS.AircraftCarrier.F14A
+      or playerData.actype == AIRBOSS.AircraftCarrier.F14B
      or playerData.actype == AIRBOSS.AircraftCarrier.RHINOE
      or playerData.actype == AIRBOSS.AircraftCarrier.RHINOF
      or playerData.actype == AIRBOSS.AircraftCarrier.GROWLER
@@ -9793,24 +9895,24 @@ function AIRBOSS:_Groove( playerData )
      return
    end

-   end   
-    
+   end
+
    -- Long V/STOL groove time Wave Off over 75 seconds to IC - TOPGUN level Only. --pene testing (WIP)--- Need to think more about this.
-   
+
  --if rho>=RAR and rho<=RIC and not playerData.waveoff and playerData.difficulty==AIRBOSS.Difficulty.HARD and  playerData.actype==      AIRBOSS.AircraftCarrier.AV8B then
   -- Get groove time
   --local vSlow=groovedata.time
-   -- If too slow wave off.  
+   -- If too slow wave off.
   --if vSlow >75 then
-  
+
   -- LSO Wave off!
     --self:RadioTransmission(self.LSORadio, self.LSOCall.WAVEOFF, nil, nil, nil, true)
     --playerData.Tlso=timer.getTime()
-   
+
   -- Player was waved Off
     --playerData.waveoff=true
     --return
-  --end    
+  --end
 --end

  -- Groovedata step.
@@ -10008,7 +10110,7 @@ function AIRBOSS:_CheckWaveOff( glideslopeError, lineupError, AoA, playerData )
    waveoff = true
  end

-  -- Too slow or too fast? Only for pros.  
+  -- Too slow or too fast? Only for pros.

  if playerData.difficulty == AIRBOSS.Difficulty.HARD and playerData.actype ~= AIRBOSS.AircraftCarrier.AV8B then
    -- Get aircraft specific AoA values. Not for AV-8B due to transition to Stable Hover.
@@ -10164,7 +10266,7 @@ function AIRBOSS:_GetSternCoord()
    elseif case==2 or case==1 then
    -- V/Stol: Translate 8 meters port.
    self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(8, FB-90, true, true)
-  end
+	end
  elseif self.carriertype==AIRBOSS.CarrierType.STENNIS then
    -- Stennis: translate 7 meters starboard wrt Final bearing.
    self.sterncoord:Translate( self.carrierparam.sterndist, hdg, true, true ):Translate( 7, FB + 90, true, true )
@@ -10313,7 +10415,7 @@ function AIRBOSS:_Trapped( playerData )

    -- Get current wire (estimate). This now based on the position where the player comes to a standstill which should reflect the trapped wire better.
    local dcorr = 100
-    if   playerData.actype == AIRBOSS.AircraftCarrier.HORNET 
+    if   playerData.actype == AIRBOSS.AircraftCarrier.HORNET
      or playerData.actype == AIRBOSS.AircraftCarrier.RHINOE
      or playerData.actype == AIRBOSS.AircraftCarrier.RHINOF
      or playerData.actype == AIRBOSS.AircraftCarrier.GROWLER then
@@ -10838,7 +10940,7 @@ function AIRBOSS:_GetZoneAbeamLandingSpot()

  -- Coordinate array. Pene Testing extended Abeam landing spot V/STOL.
  local p={}
-  
+
  -- Points.
  p[1] = S:Translate( 15, FB ):Translate( 15, FB + 90 ) -- Top-Right
  p[2] = S:Translate( -45, FB ):Translate( 15, FB + 90 ) -- Bottom-Right
@@ -11286,7 +11388,7 @@ function AIRBOSS:_GetOptLandingCoordinate()

  -- set Case III V/STOL abeam landing spot over deck -- Pene Testing
  if self.carriertype==AIRBOSS.CarrierType.INVINCIBLE or self.carriertype==AIRBOSS.CarrierType.HERMES or self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS or self.carriertype==AIRBOSS.CarrierType.CANBERRA then
-  
+
    if case==3 then

      -- Landing coordinate.
@@ -11294,7 +11396,7 @@ function AIRBOSS:_GetOptLandingCoordinate()

      -- Altitude 120ft -- is this corect for Case III?
      self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))
- 
+
    elseif case==2 or case==1 then

      -- Landing 100 ft abeam, 120 ft alt.
@@ -11304,7 +11406,7 @@ function AIRBOSS:_GetOptLandingCoordinate()
      self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))

    end
-  
+
  else

    -- Ideally we want to land between 2nd and 3rd wire.
@@ -11448,8 +11550,48 @@ end
 -- @return #number Carrier heading in degrees.
 function AIRBOSS:GetHeadingIntoWind( magnetic, coord )

+  local function adjustDegreesForWindSpeed(windSpeed)
+    local degreesAdjustment = 0
+  -- the windspeeds are in m/s
+  
+  -- +0 degrees at 15m/s = 37kts
+  -- +0 degrees at 14m/s = 35kts
+  -- +0 degrees at 13m/s = 33kts
+  -- +4 degrees at 12m/s = 31kts
+  -- +4 degrees at 11m/s = 29kts
+  -- +4 degrees at 10m/s = 27kts
+  -- +4 degrees at 9m/s = 27kts
+  -- +4 degrees at 8m/s = 27kts
+  -- +8 degrees at 7m/s = 27kts
+  -- +8 degrees at 6m/s = 27kts
+  -- +8 degrees at 5m/s = 26kts
+  -- +20 degrees at 4m/s = 26kts
+  -- +20 degrees at 3m/s = 26kts
+  -- +30 degrees at 2m/s = 26kts 1s
+  
+    if windSpeed > 0 and windSpeed < 3 then
+      degreesAdjustment = 30
+    elseif windSpeed >= 3 and windSpeed < 5 then
+      degreesAdjustment = 20
+    elseif windSpeed >= 5 and windSpeed < 8 then
+      degreesAdjustment = 8
+    elseif windSpeed >= 8 and windSpeed < 13 then
+      degreesAdjustment = 4
+    elseif windSpeed >= 13 then
+      degreesAdjustment = 0
+    end
+  
+    return degreesAdjustment
+  end
+
  -- Get direction the wind is blowing from. This is where we want to go.
  local windfrom, vwind = self:GetWind( nil, nil, coord )
+  
+  --self:I("windfrom="..windfrom.." vwind="..vwind)
+  
+  vwind = vwind + adjustDegreesForWindSpeed(vwind)
+  
+  --self:I("windfrom="..windfrom.." (c)vwind="..vwind)

  -- Actually, we want the runway in the wind.
  local intowind = windfrom - self.carrierparam.rwyangle
@@ -11899,7 +12041,7 @@ function AIRBOSS:_LSOgrade( playerData )
  local nS=count(G, '%(')
  local nN=N-nS-nL
  local nNv=Nv-nS-nL
-  
+
  -- Groove time 15-18.99 sec for a unicorn. Or 60-65 for V/STOL unicorn.
  local Tgroove=playerData.Tgroove
  local TgrooveUnicorn=Tgroove and (Tgroove>=15.0 and Tgroove<=18.99) or false
@@ -12016,7 +12158,7 @@ function AIRBOSS:_LSOgrade( playerData )

  elseif not playerData.hover and playerData.actype == AIRBOSS.AircraftCarrier.AV8B then
    -------------------------------
-    -- AV-8B not cleared to land -- -- Landing clearence is carrier from LC to Landing 
+    -- AV-8B not cleared to land -- -- Landing clearence is carrier from LC to Landing
    -------------------------------
    if playerData.landed then
      -- AIRBOSS wants your balls!
@@ -13384,8 +13526,8 @@ function AIRBOSS:CarrierTurnIntoWind( time, vdeck, uturn )
  -- Wind speed.
  local _, vwind = self:GetWind()

-  -- Speed of carrier in m/s but at least 2 knots.
-  local vtot = math.max( vdeck - vwind, UTILS.KnotsToMps( 2 ) )
+  -- Speed of carrier in m/s but at least 4 knots.
+  local vtot = math.max( vdeck - vwind, UTILS.KnotsToMps( 4 ) )

  -- Distance to travel
  local dist = vtot * time
@@ -14588,59 +14730,140 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
  if radio == nil or call == nil then
    return
  end
-
-  -- Create a new radio transmission item.
-  local transmission = {} -- #AIRBOSS.Radioitem
-
-  transmission.radio = radio
-  transmission.call = call
-  transmission.Tplay = timer.getAbsTime() + (delay or 0)
-  transmission.interval = interval
-  transmission.isplaying = false
-  transmission.Tstarted = nil
-  transmission.loud = loud and call.loud
-
-  -- Player onboard number if sender has one.
-  if self:_IsOnboard( call.modexsender ) then
-    self:_Number2Radio( radio, call.modexsender, delay, 0.3, pilotcall )
-  end
-
-  -- Play onboard number if receiver has one.
-  if self:_IsOnboard( call.modexreceiver ) then
-    self:_Number2Radio( radio, call.modexreceiver, delay, 0.3, pilotcall )
-  end
-
-  -- Add transmission to the right queue.
-  local caller = ""
-  if radio.alias == "LSO" then
-
-    table.insert( self.RQLSO, transmission )
-
-    caller = "LSOCall"
-
-    -- Schedule radio queue checks.
-    if not self.RQLid then
-      self:T( self.lid .. string.format( "Starting LSO radio queue." ) )
-      self.RQLid = self.radiotimer:Schedule( nil, AIRBOSS._CheckRadioQueue, { self, self.RQLSO, "LSO" }, 0.02, 0.05 )
+  
+  if not self.SRS then
+  
+    -- Create a new radio transmission item.
+    local transmission = {} -- #AIRBOSS.Radioitem
+  
+    transmission.radio = radio
+    transmission.call = call
+    transmission.Tplay = timer.getAbsTime() + (delay or 0)
+    transmission.interval = interval
+    transmission.isplaying = false
+    transmission.Tstarted = nil
+    transmission.loud = loud and call.loud
+  
+    -- Player onboard number if sender has one.
+    if self:_IsOnboard( call.modexsender ) then
+      self:_Number2Radio( radio, call.modexsender, delay, 0.3, pilotcall )
+    end
+  
+    -- Play onboard number if receiver has one.
+    if self:_IsOnboard( call.modexreceiver ) then
+      self:_Number2Radio( radio, call.modexreceiver, delay, 0.3, pilotcall )
+    end
+  
+    -- Add transmission to the right queue.
+    local caller = ""
+    if radio.alias == "LSO" then
+  
+      table.insert( self.RQLSO, transmission )
+  
+      caller = "LSOCall"
+  
+      -- Schedule radio queue checks.
+      if not self.RQLid then
+        self:T( self.lid .. string.format( "Starting LSO radio queue." ) )
+        self.RQLid = self.radiotimer:Schedule( nil, AIRBOSS._CheckRadioQueue, { self, self.RQLSO, "LSO" }, 0.02, 0.05 )
+      end
+  
+    elseif radio.alias == "MARSHAL" then
+  
+      table.insert( self.RQMarshal, transmission )
+  
+      caller = "MarshalCall"
+  
+      if not self.RQMid then
+        self:T( self.lid .. string.format( "Starting Marhal radio queue." ) )
+        self.RQMid = self.radiotimer:Schedule( nil, AIRBOSS._CheckRadioQueue, { self, self.RQMarshal, "MARSHAL" }, 0.02, 0.05 )
+      end
+  
+    end
+  
+    -- Append radio click sound at the end of the transmission.
+    if click then
+      self:RadioTransmission( radio, self[caller].CLICK, false, delay )
+    end
+  
+  else
+    -- SRS transmission
+    
+    local frequency = self.MarshalRadio.frequency
+    local modulation = self.MarshalRadio.modulation
+    local voice = nil
+    local gender = nil
+    local culture = nil
+    
+    if radio.alias == "AIRBOSS" then
+      frequency = self.AirbossRadio.frequency
+      modulation = self.AirbossRadio.modulation
+      voice = self.AirbossRadio.voice
+      gender = self.AirbossRadio.gender
+      culture = self.AirbossRadio.culture
+    end
+    
+    if radio.alias == "MARSHAL" then
+      voice = self.MarshalRadio.voice
+      gender = self.MarshalRadio.gender
+      culture = self.MarshalRadio.culture
+    end
+    
+    if radio.alias == "LSO" then
+      frequency = self.LSORadio.frequency
+      modulation = self.LSORadio.modulation
+      voice = self.LSORadio.voice
+      gender = self.LSORadio.gender
+      culture = self.LSORadio.culture
+    end
+    
+    if pilotcall then
+      voice = self.PilotRadio.voice
+      gender = self.PilotRadio.gender
+      culture = self.PilotRadio.culture
+      radio.alias = "PILOT"
    end

-  elseif radio.alias == "MARSHAL" then
-
-    table.insert( self.RQMarshal, transmission )
-
-    caller = "MarshalCall"
-
-    if not self.RQMid then
-      self:T( self.lid .. string.format( "Starting Marhal radio queue." ) )
-      self.RQMid = self.radiotimer:Schedule( nil, AIRBOSS._CheckRadioQueue, { self, self.RQMarshal, "MARSHAL" }, 0.02, 0.05 )
+    if not radio.alias then
+      -- TODO - what freq to use here?
+      frequency = self.AirbossRadio.frequency
+      modulation = self.AirbossRadio.modulation
+      radio.alias = "AIRBOSS"
    end
-
+    
+    local volume = nil
+    
+    if loud then
+      volume = 1.0
+    end
+    
+    --local text = tostring(call.modexreceiver).."; "..radio.alias.."; "..call.subtitle
+    local text = call.subtitle
+    self:I(self.lid..text) 
+    local srstext = self:_GetNiceSRSText(text)
+    self.SRSQ:NewTransmission(srstext, call.duration, self.SRS, tstart, 0.1, subgroups, call.subtitle, call.subduration, frequency, modulation, gender, culture, voice, volume, radio.alias)
  end
+end

-  -- Append radio click sound at the end of the transmission.
-  if click then
-    self:RadioTransmission( radio, self[caller].CLICK, false, delay )
+--- Set SRS voice for the pilot calls.
+-- @param #AIRBOSS self
+-- @param #string Voice (Optional) SRS specific voice
+-- @param #string Gender (Optional) SRS specific gender
+-- @param #string Culture (Optional) SRS specific culture
+-- @return #AIRBOSS self
+function AIRBOSS:SetSRSPilotVoice( Voice, Gender, Culture )
+
+  self.PilotRadio = {} -- #AIRBOSS.Radio
+  self.PilotRadio.alias = "PILOT"
+  self.PilotRadio.voice = Voice or MSRS.Voices.Microsoft.David
+  self.PilotRadio.gender = Gender or "male"
+  self.PilotRadio.culture = Culture or "en-US"
+  
+  if (not Voice) and self.SRS and self.SRS.google then
+    self.PilotRadio.voice = MSRS.Voices.Google.Standard.en_US_Standard_J
  end
+  
+  return self
 end

 --- Check if a call needs a subtitle because the complete voice overs are not available.
@@ -14886,6 +15109,39 @@ function AIRBOSS:_RadioFilename( call, loud, channel )
  return filename
 end

+--- Format text into SRS friendly string
+-- @param #AIRBOSS self
+-- @param #string text
+-- @return #string text
+function AIRBOSS:_GetNiceSRSText(text)
+  text = string.gsub(text,"================================\n","")
+  text = string.gsub(text,"||","parallel")
+  text = string.gsub(text,"==","perpendicular")
+  text = string.gsub(text,"BRC","Base recovery")
+  --text = string.gsub(text,"#","Number")
+  text = string.gsub(text,"%((%a+)%)","Morse %1")
+  text = string.gsub(text,"°C","° Celsius")
+  text = string.gsub(text,"°"," degrees")
+  text = string.gsub(text," FB "," Final bearing ")
+  text = string.gsub(text," ops"," operations ")
+  text = string.gsub(text," kts"," knots")
+  text = string.gsub(text,"TACAN","Tackan")
+  text = string.gsub(text,"ICLS","I.C.L.S.")
+  text = string.gsub(text,"LSO","L.S.O.")
+  text = string.gsub(text,"inHg","inches of Mercury")
+  text = string.gsub(text,"QFE","Q.F.E.")
+  text = string.gsub(text,"hPa","hecto pascal")
+  text = string.gsub(text," NM"," nautical miles")
+  text = string.gsub(text," ft"," feet")
+  text = string.gsub(text,"A/C","aircraft")
+  text = string.gsub(text,"(#[%a%d%p%s]+)\n","")
+  text = string.gsub(text,"%.000"," dot zero")
+  text = string.gsub(text,"00"," double zero")
+  text = string.gsub(text," 0 "," zero " )
+  text = string.gsub(text,"\n","; ")
+  return text
+end
+
 --- Send text message to player client.
 -- Message format will be "SENDER: RECCEIVER, MESSAGE".
 -- @param #AIRBOSS self
@@ -14897,7 +15153,7 @@ end
 -- @param #boolean clear If true, clear screen from previous messages.
 -- @param #number delay Delay in seconds, before the message is displayed.
 function AIRBOSS:MessageToPlayer( playerData, message, sender, receiver, duration, clear, delay )
-
+  self:I({sender,receiver,message})
  if playerData and message and message ~= "" then

    -- Default duration.
@@ -14920,49 +15176,91 @@ function AIRBOSS:MessageToPlayer( playerData, message, sender, receiver, duratio
      -- SCHEDULER:New(nil, self.MessageToPlayer, {self, playerData, message, sender, receiver, duration, clear}, delay)
      self:ScheduleOnce( delay, self.MessageToPlayer, self, playerData, message, sender, receiver, duration, clear )
    else
-
-      -- Wait until previous sound finished.
-      local wait = 0
-
-      -- Onboard number to get the attention.
-      if receiver == playerData.onboard then
-
-        -- Which voice over number to use.
-        if sender and (sender == "LSO" or sender == "MARSHAL" or sender == "AIRBOSS") then
-
-          -- User sound of board number.
-          wait = wait + self:_Number2Sound( playerData, sender, receiver )
-
+      
+      if not self.SRS then
+        -- Wait until previous sound finished.
+        local wait = 0
+  
+        -- Onboard number to get the attention.
+        if receiver == playerData.onboard then
+  
+          -- Which voice over number to use.
+          if sender and (sender == "LSO" or sender == "MARSHAL" or sender == "AIRBOSS") then
+  
+            -- User sound of board number.
+            wait = wait + self:_Number2Sound( playerData, sender, receiver )
+  
+          end
        end
-      end
+  
+        -- Negative.
+        if string.find( text:lower(), "negative" ) then
+          local filename = self:_RadioFilename( self.MarshalCall.NEGATIVE, false, "MARSHAL" )
+          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
+          wait = wait + self.MarshalCall.NEGATIVE.duration
+        end
+  
+        -- Affirm.
+        if string.find( text:lower(), "affirm" ) then
+          local filename = self:_RadioFilename( self.MarshalCall.AFFIRMATIVE, false, "MARSHAL" )
+          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
+          wait = wait + self.MarshalCall.AFFIRMATIVE.duration
+        end
+  
+        -- Roger.
+        if string.find( text:lower(), "roger" ) then
+          local filename = self:_RadioFilename( self.MarshalCall.ROGER, false, "MARSHAL" )
+          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
+          wait = wait + self.MarshalCall.ROGER.duration
+        end
+  
+        -- Play click sound to end message.
+        if wait > 0 then
+          local filename = self:_RadioFilename( self.MarshalCall.CLICK )
+          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
+        end
+      else
+        -- SRS transmission
+        local frequency = self.MarshalRadio.frequency
+        local modulation = self.MarshalRadio.modulation
+        local voice = self.MarshalRadio.voice
+        local gender = self.MarshalRadio.gender
+        local culture = self.MarshalRadio.culture
+        
+        if not sender then sender = "AIRBOSS" end

-      -- Negative.
-      if string.find( text:lower(), "negative" ) then
-        local filename = self:_RadioFilename( self.MarshalCall.NEGATIVE, false, "MARSHAL" )
-        USERSOUND:New( filename ):ToGroup( playerData.group, wait )
-        wait = wait + self.MarshalCall.NEGATIVE.duration
-      end
+        if string.find(sender,"AIRBOSS" ) then
+          frequency = self.AirbossRadio.frequency
+          modulation = self.AirbossRadio.modulation
+          voice = self.AirbossRadio.voice
+          gender = self.AirbossRadio.gender
+          culture = self.AirbossRadio.culture
+        end

-      -- Affirm.
-      if string.find( text:lower(), "affirm" ) then
-        local filename = self:_RadioFilename( self.MarshalCall.AFFIRMATIVE, false, "MARSHAL" )
-        USERSOUND:New( filename ):ToGroup( playerData.group, wait )
-        wait = wait + self.MarshalCall.AFFIRMATIVE.duration
-      end
+        --if sender == "MARSHAL" then
+          --voice = self.MarshalRadio.voice
+          --gender = self.MarshalRadio.gender
+          --culture = self.MarshalRadio.culture
+        --end

-      -- Roger.
-      if string.find( text:lower(), "roger" ) then
-        local filename = self:_RadioFilename( self.MarshalCall.ROGER, false, "MARSHAL" )
-        USERSOUND:New( filename ):ToGroup( playerData.group, wait )
-        wait = wait + self.MarshalCall.ROGER.duration
-      end
+        if sender == "LSO" then
+          frequency = self.LSORadio.frequency
+          modulation = self.LSORadio.modulation
+          voice = self.LSORadio.voice
+          gender = self.LSORadio.gender
+          culture = self.LSORadio.culture
+        --elseif not sender then
+          -- TODO - what freq to use here?
+          --frequency = self.AirbossRadio.frequency
+          --modulation = self.AirbossRadio.modulation
+          --sender = "AIRBOSS"
+        end

-      -- Play click sound to end message.
-      if wait > 0 then
-        local filename = self:_RadioFilename( self.MarshalCall.CLICK )
-        USERSOUND:New( filename ):ToGroup( playerData.group, wait )
+        self:I(self.lid..text)
+        self:I({sender,frequency,modulation,voice})
+        local srstext = self:_GetNiceSRSText(text)
+        self.SRSQ:NewTransmission(srstext,duration,self.SRS,tstart,0.1,subgroups,subtitle,subduration,frequency,modulation,gender,culture,voice,volume,sender)
      end
-
      -- Text message to player client.
      if playerData.client then
        MESSAGE:New( text, duration, sender, clear ):ToClient( playerData.client )
@@ -15246,13 +15544,13 @@ end
 -- @param #string modex Tail number.
 function AIRBOSS:_MarshallInboundCall(unit, modex)

-  -- Calculate 
+  -- Calculate
  local vectorCarrier = self:GetCoordinate():GetDirectionVec3(unit:GetCoordinate())
  local bearing =  UTILS.Round(unit:GetCoordinate():GetAngleDegrees( vectorCarrier ), 0)
  local distance = UTILS.Round(UTILS.MetersToNM(unit:GetCoordinate():Get2DDistance(self:GetCoordinate())),0)
  local angels = UTILS.Round(UTILS.MetersToFeet(unit:GetHeight()/1000),0)
  local state = UTILS.Round(self:_GetFuelState(unit)/1000,1)
-  
+
  -- Pilot: "Marshall, [modex], marking mom's [bearing] for [distance], angels [XX], state [X.X]"
  local text=string.format("Marshal, %s, marking mom's %d for %d, angels %d, state %.1f", modex, bearing, distance, angels, state)
  -- Debug message.
@@ -16079,8 +16377,8 @@ function AIRBOSS:_RequestMarshal( _unitName )
      -- Voice over of inbound call (regardless of airboss rejecting it or not)
      if self.xtVoiceOvers then
        self:_MarshallInboundCall(_unit, playerData.onboard)
-      end   
-    
+      end
+
      -- Check if player is in CCA
      local inCCA = playerData.unit:IsInZone( self.zoneCCA )

@@ -16301,7 +16599,7 @@ function AIRBOSS:_RequestSpinning( _unitName )
        -- Some advice.
        if playerData.difficulty == AIRBOSS.Difficulty.EASY then
          local text = "Climb to 1200 feet and proceed to the initial again."
-          self:MessageToPlayer( playerData, text, "INSTRUCTOR", "" )
+          self:MessageToPlayer( playerData, text, "AIRBOSS", "" )
        end

        return
@@ -16328,12 +16626,12 @@ function AIRBOSS:_RequestCommence( _unitName )
    local playerData = self.players[_playername] -- #AIRBOSS.PlayerData

    if playerData then
-   
+
      -- Voice over of Commencing call (regardless of Airboss will rejected or not)
      if self.xtVoiceOvers then
        self:_CommencingCall(_unit, playerData.onboard)
      end
-      
+
      -- Check if unit is in CCA.
      local text = ""
      local cleared = false
@@ -17056,7 +17354,7 @@ function AIRBOSS:_DisplayCarrierInfo( _unitname )
        state = "Deck closed"
      end
      if self.turning then
-        state = state .. " (turning currently)"
+        state = state .. " (currently turning)"
      end

      -- Message text.
@@ -0,0 +1,621 @@
+--- **Ops** - Brigade Warehouse.
+--
+-- **Main Features:**
+--
+--    * Manage platoons
+--    * Carry out ARTY and PATROLZONE missions (AUFTRAG)
+--    * Define rearming zones
+-- 
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Brigade).
+-- 
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Ops.Brigade
+-- @image OPS_Brigade_.png
+
+
+--- BRIGADE class.
+-- @type BRIGADE
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity of output.
+-- @field #table rearmingZones Rearming zones. Each element is of type `#BRIGADE.SupplyZone`.
+-- @field #table refuellingZones Refuelling zones. Each element is of type `#BRIGADE.SupplyZone`.
+-- @field Core.Set#SET_ZONE retreatZones Retreat zone set.
+-- @extends Ops.Legion#LEGION
+
+--- *I am not afraid of an Army of lions lead by a sheep; I am afraid of sheep lead by a lion* -- Alexander the Great
+--
+-- ===
+--
+-- # The BRIGADE Concept
+--
+-- A BRIGADE consists of one or multiple PLATOONs. These platoons "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
+--
+--
+-- @field #BRIGADE
+BRIGADE = {
+  ClassName       = "BRIGADE",
+  verbose         =     0,
+  rearmingZones   =    {},
+  refuellingZones =    {}, 
+}
+
+--- Supply Zone.
+-- @type BRIGADE.SupplyZone
+-- @field Core.Zone#ZONE zone The zone.
+-- @field Ops.Auftrag#AUFTRAG mission Mission assigned to supply ammo or fuel.
+-- @field #boolean markerOn If `true`, marker is on.
+-- @field Wrapper.Marker#MARKER marker F10 marker.
+
+--- BRIGADE class version.
+-- @field #string version
+BRIGADE.version="0.1.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ToDo list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: Spawn when hosting warehouse is a ship or oil rig or gas platform.
+-- TODO: Rearming zones.
+-- TODO: Retreat zones.
+-- DONE: Add weapon range.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new BRIGADE class object.
+-- @param #BRIGADE self
+-- @param #string WarehouseName Name of the warehouse STATIC or UNIT object representing the warehouse.
+-- @param #string BrigadeName Name of the brigade.
+-- @return #BRIGADE self
+function BRIGADE:New(WarehouseName, BrigadeName)
+
+  -- Inherit everything from LEGION class.
+  local self=BASE:Inherit(self, LEGION:New(WarehouseName, BrigadeName)) -- #BRIGADE
+
+  -- Nil check.
+  if not self then
+    BASE:E(string.format("ERROR: Could not find warehouse %s!", WarehouseName))
+    return nil
+  end
+
+  -- Set some string id for output to DCS.log file.
+  self.lid=string.format("BRIGADE %s | ", self.alias)
+  
+  -- Defaults
+  self:SetRetreatZones()
+  
+  -- Turn ship into NAVYGROUP.
+  if self:IsShip() then
+    local wh=self.warehouse --Wrapper.Unit#UNIT
+    local group=wh:GetGroup()
+    self.warehouseOpsGroup=NAVYGROUP:New(group) --Ops.NavyGroup#NAVYGROUP
+    self.warehouseOpsElement=self.warehouseOpsGroup:GetElementByName(wh:GetName())
+  end
+  
+  -- Add FSM transitions.
+  --                 From State  -->   Event         -->      To State
+  self:AddTransition("*",             "ArmyOnMission",       "*")           -- An ARMYGROUP was send on a Mission (AUFTRAG).
+
+  ------------------------
+  --- Pseudo Functions ---
+  ------------------------
+
+  --- Triggers the FSM event "Start". Starts the BRIGADE. Initializes parameters and starts event handlers.
+  -- @function [parent=#BRIGADE] Start
+  -- @param #BRIGADE self
+
+  --- Triggers the FSM event "Start" after a delay. Starts the BRIGADE. Initializes parameters and starts event handlers.
+  -- @function [parent=#BRIGADE] __Start
+  -- @param #BRIGADE self
+  -- @param #number delay Delay in seconds.
+
+
+  --- Triggers the FSM event "Stop". Stops the BRIGADE and all its event handlers.
+  -- @param #BRIGADE self
+
+  --- Triggers the FSM event "Stop" after a delay. Stops the BRIGADE and all its event handlers.
+  -- @function [parent=#BRIGADE] __Stop
+  -- @param #BRIGADE self
+  -- @param #number delay Delay in seconds.
+
+
+  --- Triggers the FSM event "ArmyOnMission".
+  -- @function [parent=#BRIGADE] ArmyOnMission
+  -- @param #BRIGADE self
+  -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
+  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+
+  --- Triggers the FSM event "ArmyOnMission" after a delay.
+  -- @function [parent=#BRIGADE] __ArmyOnMission
+  -- @param #BRIGADE self
+  -- @param #number delay Delay in seconds.
+  -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
+  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+
+  --- On after "ArmyOnMission" event.
+  -- @function [parent=#BRIGADE] OnAfterArmyOnMission
+  -- @param #BRIGADE self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
+  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Add a platoon to the brigade.
+-- @param #BRIGADE self
+-- @param Ops.Platoon#PLATOON Platoon The platoon object.
+-- @return #BRIGADE self
+function BRIGADE:AddPlatoon(Platoon)
+
+  -- Add platoon to brigade.
+  table.insert(self.cohorts, Platoon)
+
+  -- Add assets to platoon.
+  self:AddAssetToPlatoon(Platoon, Platoon.Ngroups)
+
+  -- Set brigade of platoon.
+  Platoon:SetBrigade(self)
+
+  -- Start platoon.
+  if Platoon:IsStopped() then
+    Platoon:Start()
+  end
+
+  return self
+end
+
+--- Add asset group(s) to platoon.
+-- @param #BRIGADE self
+-- @param Ops.Platoon#PLATOON Platoon The platoon object.
+-- @param #number Nassets Number of asset groups to add.
+-- @return #BRIGADE self
+function BRIGADE:AddAssetToPlatoon(Platoon, Nassets)
+
+  if Platoon then
+
+    -- Get the template group of the platoon.
+    local Group=GROUP:FindByName(Platoon.templatename)
+
+    if Group then
+
+      -- Debug text.
+      local text=string.format("Adding asset %s to platoon %s", Group:GetName(), Platoon.name)
+      self:T(self.lid..text)
+
+      -- Add assets to airwing warehouse.
+      self:AddAsset(Group, Nassets, nil, nil, nil, nil, Platoon.skill, Platoon.livery, Platoon.name)
+
+    else
+      self:E(self.lid.."ERROR: Group does not exist!")
+    end
+
+  else
+    self:E(self.lid.."ERROR: Platoon does not exit!")
+  end
+
+  return self
+end
+
+--- Define a set of retreat zones.
+-- @param #BRIGADE self
+-- @param Core.Set#SET_ZONE RetreatZoneSet Set of retreat zones.
+-- @return #BRIGADE self
+function BRIGADE:SetRetreatZones(RetreatZoneSet)
+  self.retreatZones=RetreatZoneSet or SET_ZONE:New()
+  return self
+end
+
+--- Add a retreat zone.
+-- @param #BRIGADE self
+-- @param Core.Zone#ZONE RetreatZone Retreat zone.
+-- @return #BRIGADE self
+function BRIGADE:AddRetreatZone(RetreatZone)
+  self.retreatZones:AddZone(RetreatZone)
+  return self
+end
+
+--- Get retreat zones.
+-- @param #BRIGADE self
+-- @return Core.Set#SET_ZONE Set of retreat zones.
+function BRIGADE:GetRetreatZones()
+  return self.retreatZones
+end
+
+--- Add a rearming zone.
+-- @param #BRIGADE self
+-- @param Core.Zone#ZONE RearmingZone Rearming zone.
+-- @return #BRIGADE.SupplyZone The rearming zone data.
+function BRIGADE:AddRearmingZone(RearmingZone)
+
+  local rearmingzone={} --#BRIGADE.SupplyZone
+  
+  rearmingzone.zone=RearmingZone
+  rearmingzone.mission=nil
+  rearmingzone.marker=MARKER:New(rearmingzone.zone:GetCoordinate(), "Rearming Zone"):ToCoalition(self:GetCoalition())
+
+  table.insert(self.rearmingZones, rearmingzone)
+
+  return rearmingzone
+end
+
+
+--- Add a refuelling zone.
+-- @param #BRIGADE self
+-- @param Core.Zone#ZONE RefuellingZone Refuelling zone.
+-- @return #BRIGADE.SupplyZone The refuelling zone data.
+function BRIGADE:AddRefuellingZone(RefuellingZone)
+
+  local supplyzone={} --#BRIGADE.SupplyZone
+  
+  supplyzone.zone=RefuellingZone
+  supplyzone.mission=nil
+  supplyzone.marker=MARKER:New(supplyzone.zone:GetCoordinate(), "Refuelling Zone"):ToCoalition(self:GetCoalition())
+
+  table.insert(self.refuellingZones, supplyzone)
+
+  return supplyzone
+end
+
+
+--- Get platoon by name.
+-- @param #BRIGADE self
+-- @param #string PlatoonName Name of the platoon.
+-- @return Ops.Platoon#PLATOON The Platoon object.
+function BRIGADE:GetPlatoon(PlatoonName)
+  local platoon=self:_GetCohort(PlatoonName)
+  return platoon
+end
+
+--- Get platoon of an asset.
+-- @param #BRIGADE self
+-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The platoon asset.
+-- @return Ops.Platoon#PLATOON The platoon object.
+function BRIGADE:GetPlatoonOfAsset(Asset)
+  local platoon=self:GetPlatoon(Asset.squadname)
+  return platoon
+end
+
+--- Remove asset from platoon.
+-- @param #BRIGADE self
+-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The platoon asset.
+function BRIGADE:RemoveAssetFromPlatoon(Asset)
+  local platoon=self:GetPlatoonOfAsset(Asset)
+  if platoon then
+    platoon:DelAsset(Asset)
+  end
+end
+
+
+--- [ GROUND ] Function to load back an asset in the field that has been filed before.
+-- @param #BRIGADE self
+-- @param #string Templatename e.g."1 PzDv LogRg I\_AID-976" - that's the alias (name) of an platoon spawned as `"platoon - alias"_AID-"asset-ID"`
+-- @param Core.Point#COORDINATE Position where to spawn the platoon
+-- @return #BRIGADE self
+-- @usage
+-- Prerequisites:
+-- Save the assets spawned by BRIGADE/CHIEF regularly (~every 5 mins) into a file, e.g. like this: 
+--   
+--              local Path = FilePath or "C:\\Users\\<yourname>\\Saved Games\\DCS\\Missions\\" -- example path
+--              local BlueOpsFilename = BlueFileName or "ExamplePlatoonSave.csv" -- example filename 
+--              local BlueSaveOps = SET_GROUP:New():FilterCoalitions("blue"):FilterPrefixes("AID"):FilterCategoryGround():FilterOnce()
+--              UTILS.SaveSetOfGroups(BlueSaveOps,Path,BlueOpsFilename)
+--          
+-- where Path and Filename are strings, as chosen by you.
+-- You can then load back the assets at the start of your next mission run. Be aware that it takes a couple of seconds for the 
+-- platoon data to arrive in brigade, so make this an action after ~20 seconds, e.g. like so:
+-- 
+--            function LoadBackAssets()
+--              local Path = FilePath or "C:\\Users\\<yourname>\\Saved Games\\DCS\\Missions\\" -- example path
+--              local BlueOpsFilename = BlueFileName or "ExamplePlatoonSave.csv" -- example filename  
+--              if UTILS.CheckFileExists(Path,BlueOpsFilename) then
+--                local loadback = UTILS.LoadSetOfGroups(Path,BlueOpsFilename,false)
+--                for _,_platoondata in pairs (loadback) do
+--                  local groupname = _platoondata.groupname -- #string
+--                  local coordinate = _platoondata.coordinate -- Core.Point#COORDINATE
+--                  Your_Brigade:LoadBackAssetInPosition(groupname,coordinate)
+--                end
+--              end
+--            end
+--  
+--            local AssetLoader = TIMER:New(LoadBackAssets)
+--            AssetLoader:Start(20)
+-- 
+-- The assets loaded back into the mission will be considered for AUFTRAG type missions from CHIEF and BRIGADE.
+function BRIGADE:LoadBackAssetInPosition(Templatename,Position)
+  self:T(self.lid .. "LoadBackAssetInPosition: " .. tostring(Templatename))
+  
+  -- get Platoon alias from Templatename
+  local nametbl = UTILS.Split(Templatename,"_")
+
+  local name = nametbl[1]
+  
+  self:T(string.format("*** Target Platoon = %s ***",name))
+  
+  -- find a matching asset table from BRIGADE
+  local cohorts = self.cohorts or {}
+  local thisasset = nil --Functional.Warehouse#WAREHOUSE.Assetitem
+  local found = false
+  
+  for _,_cohort in pairs(cohorts) do
+    local asset = _cohort:GetName()
+    self:T(string.format("*** Looking at Platoon = %s ***",asset))
+    if asset == name then
+      self:T("**** Found Platoon ****")
+      local cohassets = _cohort.assets or {}
+      for _,_zug in pairs (cohassets) do
+        local zug = _zug -- Functional.Warehouse#WAREHOUSE.Assetitem   
+        if zug.assignment == name and zug.requested == false then
+          self:T("**** Found Asset ****")
+          found = true
+          thisasset = zug --Functional.Warehouse#WAREHOUSE.Assetitem         
+        break
+        end
+      end
+    end
+  end
+  
+  if found then
+  
+    -- prep asset
+    thisasset.rid = thisasset.uid
+    thisasset.requested = false
+    thisasset.score=100
+    thisasset.missionTask="CAS"
+    thisasset.spawned = true
+    local template = thisasset.templatename
+    local alias = thisasset.spawngroupname
+            
+    -- Spawn group
+    local spawnasset = SPAWN:NewWithAlias(template,alias)
+      :InitDelayOff()
+      :SpawnFromCoordinate(Position)
+    
+    -- build a new self request
+    local request = {} --Functional.Warehouse#WAREHOUSE.Pendingitem
+    request.assignment = name
+    request.warehouse = self
+    request.assets = {thisasset}
+    request.ntransporthome = 0
+    request.ndelivered = 0
+    request.ntransport = 0
+    request.cargoattribute = thisasset.attribute
+    request.category = thisasset.category
+    request.cargoassets = {thisasset}
+    request.assetdesc = WAREHOUSE.Descriptor.ASSETLIST
+    request.cargocategory = thisasset.category
+    request.toself = true
+    request.transporttype = WAREHOUSE.TransportType.SELFPROPELLED
+    request.assetproblem = {}
+    request.born = true
+    request.prio = 50
+    request.uid = thisasset.uid
+    request.airbase = nil
+    request.timestamp = timer.getAbsTime()
+    request.assetdescval = {thisasset}
+    request.nasset = 1
+    request.cargogroupset = SET_GROUP:New()
+    request.cargogroupset:AddGroup(spawnasset)
+    request.iscargo = true
+    
+    -- Call Brigade self
+    self:__AssetSpawned(2, spawnasset, thisasset, request) 
+     
+  end
+  return self
+end
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- FSM Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Start BRIGADE FSM.
+-- @param #BRIGADE self
+function BRIGADE:onafterStart(From, Event, To)
+
+  -- Start parent Warehouse.
+  self:GetParent(self, BRIGADE).onafterStart(self, From, Event, To)
+
+  -- Info.
+  self:I(self.lid..string.format("Starting BRIGADE v%s", BRIGADE.version))
+
+end
+
+--- Update status.
+-- @param #BRIGADE self
+function BRIGADE:onafterStatus(From, Event, To)
+
+  -- Status of parent Warehouse.
+  self:GetParent(self).onafterStatus(self, From, Event, To)
+
+  -- FSM state.
+  local fsmstate=self:GetState()
+  
+  ----------------
+  -- Transport ---
+  ----------------
+  
+  self:CheckTransportQueue()
+
+  --------------
+  -- Mission ---
+  --------------
+
+  -- Check if any missions should be cancelled.
+  self:CheckMissionQueue()
+
+  ---------------------
+  -- Rearming Zones ---
+  ---------------------
+
+  for _,_rearmingzone in pairs(self.rearmingZones) do
+    local rearmingzone=_rearmingzone --#BRIGADE.SupplyZone
+    if (not rearmingzone.mission) or rearmingzone.mission:IsOver() then
+      rearmingzone.mission=AUFTRAG:NewAMMOSUPPLY(rearmingzone.zone)
+      self:AddMission(rearmingzone.mission)
+    end
+  end
+
+  -----------------------
+  -- Refuelling Zones ---
+  -----------------------
+
+  -- Check refuelling zones.
+  for _,_supplyzone in pairs(self.refuellingZones) do
+    local supplyzone=_supplyzone --#BRIGADE.SupplyZone
+    -- Check if mission is nil or over.      
+    if (not supplyzone.mission) or supplyzone.mission:IsOver() then
+      supplyzone.mission=AUFTRAG:NewFUELSUPPLY(supplyzone.zone)
+      self:AddMission(supplyzone.mission)
+    end
+  end    
+
+
+  -----------
+  -- Info ---
+  -----------    
+
+  -- General info:
+  if self.verbose>=1 then
+
+    -- Count missions not over yet.
+    local Nmissions=self:CountMissionsInQueue()
+
+    -- Asset count.
+    local Npq, Np, Nq=self:CountAssetsOnMission()
+
+    -- Asset string.
+    local assets=string.format("%d [OnMission: Total=%d, Active=%d, Queued=%d]", self:CountAssets(), Npq, Np, Nq)
+
+    -- Output.
+    local text=string.format("%s: Missions=%d, Platoons=%d, Assets=%s", fsmstate, Nmissions, #self.cohorts, assets)
+    self:I(self.lid..text)
+  end
+
+  ------------------
+  -- Mission Info --
+  ------------------
+  if self.verbose>=2 then
+    local text=string.format("Missions Total=%d:", #self.missionqueue)
+    for i,_mission in pairs(self.missionqueue) do
+      local mission=_mission --Ops.Auftrag#AUFTRAG
+
+      local prio=string.format("%d/%s", mission.prio, tostring(mission.importance)) ; if mission.urgent then prio=prio.." (!)" end
+      local assets=string.format("%d/%d", mission:CountOpsGroups(), mission.Nassets or 0)
+      local target=string.format("%d/%d Damage=%.1f", mission:CountMissionTargets(), mission:GetTargetInitialNumber(), mission:GetTargetDamage())
+
+      text=text..string.format("\n[%d] %s %s: Status=%s, Prio=%s, Assets=%s, Targets=%s", i, mission.name, mission.type, mission.status, prio, assets, target)
+    end
+    self:I(self.lid..text)
+  end
+
+  --------------------
+  -- Transport Info --
+  --------------------
+  if self.verbose>=2 then
+    local text=string.format("Transports Total=%d:", #self.transportqueue)
+    for i,_transport in pairs(self.transportqueue) do
+      local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
+
+      local prio=string.format("%d/%s", transport.prio, tostring(transport.importance)) ; if transport.urgent then prio=prio.." (!)" end
+      local carriers=string.format("Ncargo=%d/%d, Ncarriers=%d", transport.Ncargo, transport.Ndelivered, transport.Ncarrier)
+
+      text=text..string.format("\n[%d] UID=%d: Status=%s, Prio=%s, Cargo: %s", i, transport.uid, transport:GetState(), prio, carriers)
+    end
+    self:I(self.lid..text)
+  end
+
+  -------------------
+  -- Platoon Info --
+  -------------------
+  if self.verbose>=3 then
+    local text="Platoons:"
+    for i,_platoon in pairs(self.cohorts) do
+      local platoon=_platoon --Ops.Platoon#PLATOON
+
+      local callsign=platoon.callsignName and UTILS.GetCallsignName(platoon.callsignName) or "N/A"
+      local modex=platoon.modex and platoon.modex or -1
+      local skill=platoon.skill and tostring(platoon.skill) or "N/A"
+
+      -- Platoon text.
+      text=text..string.format("\n* %s %s: %s*%d/%d, Callsign=%s, Modex=%d, Skill=%s", platoon.name, platoon:GetState(), platoon.aircrafttype, platoon:CountAssets(true), #platoon.assets, callsign, modex, skill)
+    end
+    self:I(self.lid..text)
+  end
+
+  -------------------
+  -- Rearming Info --
+  -------------------
+  if self.verbose>=4 then
+    local text="Rearming Zones:"
+    for i,_rearmingzone in pairs(self.rearmingZones) do
+      local rearmingzone=_rearmingzone --#BRIGADE.SupplyZone
+      -- Info text.
+      text=text..string.format("\n* %s: Mission status=%s, suppliers=%d", rearmingzone.zone:GetName(), rearmingzone.mission:GetState(), rearmingzone.mission:CountOpsGroups())      
+    end
+    self:I(self.lid..text)
+  end
+  
+  ---------------------
+  -- Refuelling Info --
+  ---------------------
+  if self.verbose>=4 then
+    local text="Refuelling Zones:"
+    for i,_refuellingzone in pairs(self.refuellingZones) do
+      local refuellingzone=_refuellingzone --#BRIGADE.SupplyZone
+      -- Info text.
+      text=text..string.format("\n* %s: Mission status=%s, suppliers=%d", refuellingzone.zone:GetName(), refuellingzone.mission:GetState(), refuellingzone.mission:CountOpsGroups())      
+    end
+    self:I(self.lid..text)
+  end
+  
+  ----------------
+  -- Asset Info --
+  ----------------
+  if self.verbose>=5 then
+    local text="Assets in stock:"
+    for i,_asset in pairs(self.stock) do
+      local asset=_asset --Functional.Warehouse#WAREHOUSE.Assetitem
+      -- Info text.
+      text=text..string.format("\n* %s: spawned=%s", asset.spawngroupname, tostring(asset.spawned))      
+    end
+    self:I(self.lid..text)
+  end    
+
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- FSM Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- On after "ArmyOnMission".
+-- @param #BRIGADE self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup Ops army group on mission.
+-- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
+function BRIGADE:onafterArmyOnMission(From, Event, To, ArmyGroup, Mission)
+  -- Debug info.
+  self:T(self.lid..string.format("Group %s on %s mission %s", ArmyGroup:GetName(), Mission:GetType(), Mission:GetName()))  
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30,7 +30,7 @@
 -- @module Ops.CSAR
 -- @image OPS_CSAR.jpg

-- Date: January 2023
+-- Date: May 2023

 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
@@ -292,7 +292,7 @@ CSAR.AircraftType["Bronco-OV-10A"] = 2

 --- CSAR class version.
 -- @field #string version
-CSAR.version="1.0.17"
+CSAR.version="1.0.18"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -316,7 +316,7 @@ function CSAR:New(Coalition, Template, Alias)
  -- Inherit everything from FSM class.
  local self=BASE:Inherit(self, FSM:New()) -- #CSAR
  
-  BASE:T({Coalition, Prefixes, Alias})
+  BASE:T({Coalition, Template, Alias})
  
  --set Coalition
  if Coalition and type(Coalition)=="string" then
@@ -1880,7 +1880,7 @@ function CSAR:_SignalFlare(_unitName)
      if _SETTINGS:IsImperial() then
        _distance = string.format("%.1fnm",UTILS.MetersToNM(_closest.distance))
      else
-        _distance = string.format("%.1fkm",_closest.distance)
+        _distance = string.format("%.1fkm",_closest.distance/1000)
      end 
      local _msg = string.format("%s - Popping signal flare at your %s o\'clock. Distance %s", self:_GetCustomCallSign(_unitName), _clockDir, _distance)
      self:_DisplayMessageToSAR(_heli, _msg, self.messageTime, false, true, true)
@@ -2175,6 +2175,7 @@ function CSAR:_AddBeaconToGroup(_group, _freq)
    if _group:IsAlive() then
      local _radioUnit = _group:GetUnit(1)
      if _radioUnit then    
+     local name = _radioUnit:GetName()
        local Frequency = _freq -- Freq in Hertz
        local name = _radioUnit:GetName()
        local Sound =  "l10n/DEFAULT/"..self.radioSound
@@ -22,7 +22,7 @@
 -- @module Ops.CTLD
 -- @image OPS_CTLD.jpg

-- Last Update Apr 2023
+-- Last Update June 2023

 do 

@@ -204,7 +204,7 @@ CTLD_CARGO = {
  -- @param #CTLD_CARGO self
  -- @param #boolean loaded
  function CTLD_CARGO:Isloaded()
-    if self.HasBeenMoved and not self.WasDropped() then
+    if self.HasBeenMoved and not self:WasDropped() then
      return true
    else
     return false
@@ -1221,7 +1221,7 @@ CTLD.UnitTypes = {

 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.0.37"
+CTLD.version="1.0.40"

 --- Instantiate a new CTLD.
 -- @param #CTLD self
@@ -1390,6 +1390,7 @@ function CTLD:New(Coalition, Prefixes, Alias)
  -- sub categories
  self.usesubcats = false
  self.subcats = {}
+  self.subcatsTroop = {}
  
  -- disallow building in loadzones
  self.nobuildinloadzones = true
@@ -1750,6 +1751,8 @@ function CTLD:_EventHandler(EventData)
    if _coalition ~= self.coalition then
        return --ignore!
    end
+    local unitname = event.IniUnitName or "none"
+    self.MenusDone[unitname] = nil
    -- check is Helicopter
    local _unit = event.IniUnit
    local _group = event.IniGroup
@@ -1770,6 +1773,7 @@ function CTLD:_EventHandler(EventData)
    local unitname = event.IniUnitName or "none"
    self.CtldUnits[unitname] = nil
    self.Loaded_Cargo[unitname] = nil
+    self.MenusDone[unitname] = nil
  end
  return self
 end
@@ -2276,6 +2280,7 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop)
  if not drop then 
    inzone = self:IsUnitInZone(Unit,CTLD.CargoZoneType.LOAD)
    if not inzone then
+---@diagnostic disable-next-line: cast-local-type
      inzone, ship, zone, distance, width  = self:IsUnitInZone(Unit,CTLD.CargoZoneType.SHIP)
    end
  else
@@ -3442,6 +3447,9 @@ function CTLD:_RefreshF10Menus()
        if _unit:IsHelicopter() or (self:IsHercules(_unit) and self.enableHercules) then --ensure no stupid unit entries here
          local unitName = _unit:GetName()
          _UnitList[unitName] = unitName
+        else
+          local unitName = _unit:GetName()
+          _UnitList[unitName] = nil
        end    
      end -- end isAlive
    end -- end if _unit
@@ -3462,6 +3470,12 @@ function CTLD:_RefreshF10Menus()
      self.subcats[entry.Subcategory] = entry.Subcategory
    end
   end
+   for _id,_cargo in pairs(self.Cargo_Troops) do
+    local entry = _cargo -- #CTLD_CARGO
+    if not self.subcatsTroop[entry.Subcategory] then
+      self.subcatsTroop[entry.Subcategory] = entry.Subcategory
+    end
+   end
  end
  
  -- build unit menus
@@ -3498,15 +3512,28 @@ function CTLD:_RefreshF10Menus()
          local beaconself = MENU_GROUP_COMMAND:New(_group,"Drop beacon now",smoketopmenu, self.DropBeaconNow, self, _unit):Refresh()
          -- sub menus
          -- sub menu troops management
-          if cantroops then 
+          if cantroops then
            local troopsmenu = MENU_GROUP:New(_group,"Load troops",toptroops)
-            for _,_entry in pairs(self.Cargo_Troops) do
-              local entry = _entry -- #CTLD_CARGO
-              menucount = menucount + 1
-              menus[menucount] = MENU_GROUP_COMMAND:New(_group,entry.Name,troopsmenu,self._LoadTroops, self, _group, _unit, entry)
+            if self.usesubcats then
+              local subcatmenus = {}
+              for _name,_entry in pairs(self.subcatsTroop) do
+                subcatmenus[_name] = MENU_GROUP:New(_group,_name,troopsmenu)
+              end
+              for _,_entry in pairs(self.Cargo_Troops) do
+                local entry = _entry -- #CTLD_CARGO
+                local subcat = entry.Subcategory
+                menucount = menucount + 1
+                menus[menucount] = MENU_GROUP_COMMAND:New(_group,entry.Name,subcatmenus[subcat],self._LoadTroops, self, _group, _unit, entry)
+              end
+            else              
+              for _,_entry in pairs(self.Cargo_Troops) do
+                local entry = _entry -- #CTLD_CARGO
+                menucount = menucount + 1
+                menus[menucount] = MENU_GROUP_COMMAND:New(_group,entry.Name,troopsmenu,self._LoadTroops, self, _group, _unit, entry)
+              end
            end
            local unloadmenu1 = MENU_GROUP_COMMAND:New(_group,"Drop troops",toptroops, self._UnloadTroops, self, _group, _unit):Refresh()
-              local extractMenu1 = MENU_GROUP_COMMAND:New(_group, "Extract troops", toptroops, self._ExtractTroops, self, _group, _unit):Refresh()
+            local extractMenu1 = MENU_GROUP_COMMAND:New(_group, "Extract troops", toptroops, self._ExtractTroops, self, _group, _unit):Refresh()
          end
          -- sub menu crates management
          if cancrates then 
@@ -3597,7 +3624,8 @@ end
 -- @param #number NoTroops Size of the group in number of Units across combined templates (for loading).
 -- @param #number PerTroopMass Mass in kg of each soldier
 -- @param #number Stock Number of groups in stock. Nil for unlimited.
-function CTLD:AddTroopsCargo(Name,Templates,Type,NoTroops,PerTroopMass,Stock)
+-- @param #string SubCategory Name of sub-category (optional).
+function CTLD:AddTroopsCargo(Name,Templates,Type,NoTroops,PerTroopMass,Stock,SubCategory)
  self:T(self.lid .. " AddTroopsCargo")
  self:T({Name,Templates,Type,NoTroops,PerTroopMass,Stock})
  if not self:_CheckTemplates(Templates) then
@@ -3606,7 +3634,7 @@ function CTLD:AddTroopsCargo(Name,Templates,Type,NoTroops,PerTroopMass,Stock)
  end
  self.CargoCounter = self.CargoCounter + 1
  -- Troops are directly loadable
-  local cargo = CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,true,NoTroops,nil,nil,PerTroopMass,Stock)
+  local cargo = CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,true,NoTroops,nil,nil,PerTroopMass,Stock, SubCategory)
  table.insert(self.Cargo_Troops,cargo)
  return self
 end
@@ -4308,6 +4336,9 @@ end
      local uspeed = Unit:GetVelocityMPS()
      local uheight = Unit:GetHeight()
      local ucoord = Unit:GetCoordinate()
+      if not ucoord then
+        return false
+      end
      local gheight = ucoord:GetLandHeight()
      local aheight = uheight - gheight -- height above ground
      local maxh = self.maximumHoverHeight -- 15
@@ -4334,6 +4365,9 @@ end
      local uspeed = Unit:GetVelocityMPS()
      local uheight = Unit:GetHeight()
      local ucoord = Unit:GetCoordinate()
+      if not ucoord then
+        return false
+      end
      local gheight = ucoord:GetLandHeight()
      local aheight = uheight - gheight -- height above ground
      local minh = self.HercMinAngels-- 1500m
@@ -4419,6 +4453,9 @@ end
    end
    local uheight = Unit:GetHeight()
    local ucoord = Unit:GetCoordinate()
+    if not ucoord then
+      return false
+    end
    local gheight = ucoord:GetLandHeight()
    local aheight = uheight - gheight -- height above ground
    if aheight >= minheight then
@@ -0,0 +1,425 @@
+--- **Ops** - Fleet Warehouse.
+--
+-- **Main Features:**
+--
+--    * Manage flotillas
+--    * Carry out ARTY and PATROLZONE missions (AUFTRAG)
+-- 
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Fleet).
+-- 
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Ops.Fleet
+-- @image OPS_Fleet.png
+
+
+--- FLEET class.
+-- @type FLEET
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity of output.
+-- @field Core.Set#SET_ZONE retreatZones Retreat zone set.
+-- @field #boolean pathfinding Set pathfinding on for all spawned navy groups.
+-- @extends Ops.Legion#LEGION
+
+--- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
+--
+-- ===
+--
+-- # The FLEET Concept
+--
+-- A FLEET consists of one or multiple FLOTILLAs. These flotillas "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
+-- 
+-- # Basic Setup
+-- 
+-- A new `FLEET` object can be created with the @{#FLEET.New}(`WarehouseName`, `FleetName`) function, where `WarehouseName` is the name of the static or unit object hosting the fleet
+-- and `FleetName` is the name you want to give the fleet. This must be *unique*!
+-- 
+--     myFleet=FLEET:New("myWarehouseName", "1st Fleet")
+--     myFleet:SetPortZone(ZonePort1stFleet)
+--     myFleet:Start()
+--     
+-- A fleet needs a *port zone*, which is set via the @{#FLEET.SetPortZone}(`PortZone`) function. This is the zone where the naval assets are spawned and return to.
+-- 
+-- Finally, the fleet needs to be started using the @{#FLEET.Start}() function. If the fleet is not started, it will not process any requests.
+-- 
+-- ## Adding Flotillas
+-- 
+-- Flotillas can be added via the @{#FLEET.AddFlotilla}(`Flotilla`) function. See @{Ops.Flotilla#FLOTILLA} for how to create a flotilla.
+-- 
+--     myFleet:AddFlotilla(FlotillaTiconderoga)
+--     myFleet:AddFlotilla(FlotillaPerry)
+--     
+--
+--
+-- @field #FLEET
+FLEET = {
+  ClassName       = "FLEET",
+  verbose         =       0,
+  pathfinding     =   false,
+}
+
+--- Supply Zone.
+-- @type FLEET.SupplyZone
+-- @field Core.Zone#ZONE zone The zone.
+-- @field Ops.Auftrag#AUFTRAG mission Mission assigned to supply ammo or fuel.
+-- @field #boolean markerOn If `true`, marker is on.
+-- @field Wrapper.Marker#MARKER marker F10 marker.
+
+--- FLEET class version.
+-- @field #string version
+FLEET.version="0.0.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ToDo list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: Add routes?
+-- DONE: Add weapon range.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new FLEET class object.
+-- @param #FLEET self
+-- @param #string WarehouseName Name of the warehouse STATIC or UNIT object representing the warehouse.
+-- @param #string FleetName Name of the fleet.
+-- @return #FLEET self
+function FLEET:New(WarehouseName, FleetName)
+
+  -- Inherit everything from LEGION class.
+  local self=BASE:Inherit(self, LEGION:New(WarehouseName, FleetName)) -- #FLEET
+
+  -- Nil check.
+  if not self then
+    BASE:E(string.format("ERROR: Could not find warehouse %s!", WarehouseName))
+    return nil
+  end
+
+  -- Set some string id for output to DCS.log file.
+  self.lid=string.format("FLEET %s | ", self.alias)
+  
+  -- Defaults
+  self:SetRetreatZones()
+  
+  -- Turn ship into NAVYGROUP.
+  if self:IsShip() then
+    local wh=self.warehouse --Wrapper.Unit#UNIT
+    local group=wh:GetGroup()
+    self.warehouseOpsGroup=NAVYGROUP:New(group) --Ops.NavyGroup#NAVYGROUP
+    self.warehouseOpsElement=self.warehouseOpsGroup:GetElementByName(wh:GetName())
+  end
+
+
+  -- Add FSM transitions.
+  --                 From State  -->   Event         -->      To State
+  self:AddTransition("*",             "NavyOnMission",        "*")           -- An NAVYGROUP was send on a Mission (AUFTRAG).
+
+  ------------------------
+  --- Pseudo Functions ---
+  ------------------------
+
+  --- Triggers the FSM event "Start". Starts the FLEET. Initializes parameters and starts event handlers.
+  -- @function [parent=#FLEET] Start
+  -- @param #FLEET self
+
+  --- Triggers the FSM event "Start" after a delay. Starts the FLEET. Initializes parameters and starts event handlers.
+  -- @function [parent=#FLEET] __Start
+  -- @param #FLEET self
+  -- @param #number delay Delay in seconds.
+
+
+  --- Triggers the FSM event "Stop". Stops the FLEET and all its event handlers.
+  -- @param #FLEET self
+
+  --- Triggers the FSM event "Stop" after a delay. Stops the FLEET and all its event handlers.
+  -- @function [parent=#FLEET] __Stop
+  -- @param #FLEET self
+  -- @param #number delay Delay in seconds.
+
+
+  --- Triggers the FSM event "NavyOnMission".
+  -- @function [parent=#FLEET] NavyOnMission
+  -- @param #FLEET self
+  -- @param Ops.NavyGroup#NAVYGROUP ArmyGroup The NAVYGROUP on mission.
+  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+
+  --- Triggers the FSM event "NavyOnMission" after a delay.
+  -- @function [parent=#FLEET] __NavyOnMission
+  -- @param #FLEET self
+  -- @param #number delay Delay in seconds.
+  -- @param Ops.NavyGroup#NAVYGROUP ArmyGroup The NAVYGROUP on mission.
+  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+
+  --- On after "NavyOnMission" event.
+  -- @function [parent=#FLEET] OnAfterNavyOnMission
+  -- @param #FLEET self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param Ops.NavyGroup#NAVYGROUP NavyGroup The NAVYGROUP on mission.
+  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Add a flotilla to the fleet.
+-- @param #FLEET self
+-- @param Ops.Flotilla#FLOTILLA Flotilla The flotilla object.
+-- @return #FLEET self
+function FLEET:AddFlotilla(Flotilla)
+
+  -- Add flotilla to fleet.
+  table.insert(self.cohorts, Flotilla)
+
+  -- Add assets to flotilla.
+  self:AddAssetToFlotilla(Flotilla, Flotilla.Ngroups)
+
+  -- Set fleet of flotilla.
+  Flotilla:SetFleet(self)
+
+  -- Start flotilla.
+  if Flotilla:IsStopped() then
+    Flotilla:Start()
+  end
+
+  return self
+end
+
+--- Add asset group(s) to flotilla.
+-- @param #FLEET self
+-- @param Ops.Flotilla#FLOTILLA Flotilla The flotilla object.
+-- @param #number Nassets Number of asset groups to add.
+-- @return #FLEET self
+function FLEET:AddAssetToFlotilla(Flotilla, Nassets)
+
+  if Flotilla then
+
+    -- Get the template group of the flotilla.
+    local Group=GROUP:FindByName(Flotilla.templatename)
+
+    if Group then
+
+      -- Debug text.
+      local text=string.format("Adding asset %s to flotilla %s", Group:GetName(), Flotilla.name)
+      self:T(self.lid..text)
+
+      -- Add assets to airwing warehouse.
+      self:AddAsset(Group, Nassets, nil, nil, nil, nil, Flotilla.skill, Flotilla.livery, Flotilla.name)
+
+    else
+      self:E(self.lid.."ERROR: Group does not exist!")
+    end
+
+  else
+    self:E(self.lid.."ERROR: Flotilla does not exit!")
+  end
+
+  return self
+end
+
+--- Set pathfinding for all spawned naval groups.
+-- @param #FLEET self
+-- @param #boolean Switch If `true`, pathfinding is used.
+-- @return #FLEET self
+function FLEET:SetPathfinding(Switch)
+  self.pathfinding=Switch
+  return self
+end
+
+--- Define a set of retreat zones.
+-- @param #FLEET self
+-- @param Core.Set#SET_ZONE RetreatZoneSet Set of retreat zones.
+-- @return #FLEET self
+function FLEET:SetRetreatZones(RetreatZoneSet)
+  self.retreatZones=RetreatZoneSet or SET_ZONE:New()
+  return self
+end
+
+--- Add a retreat zone.
+-- @param #FLEET self
+-- @param Core.Zone#ZONE RetreatZone Retreat zone.
+-- @return #FLEET self
+function FLEET:AddRetreatZone(RetreatZone)
+  self.retreatZones:AddZone(RetreatZone)
+  return self
+end
+
+--- Get retreat zones.
+-- @param #FLEET self
+-- @return Core.Set#SET_ZONE Set of retreat zones.
+function FLEET:GetRetreatZones()
+  return self.retreatZones
+end
+
+--- Get flotilla by name.
+-- @param #FLEET self
+-- @param #string FlotillaName Name of the flotilla.
+-- @return Ops.Flotilla#FLOTILLA The Flotilla object.
+function FLEET:GetFlotilla(FlotillaName)
+  local flotilla=self:_GetCohort(FlotillaName)
+  return flotilla
+end
+
+--- Get flotilla of an asset.
+-- @param #FLEET self
+-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The flotilla asset.
+-- @return Ops.Flotilla#FLOTILLA The flotilla object.
+function FLEET:GetFlotillaOfAsset(Asset)
+  local flotilla=self:GetFlotilla(Asset.squadname)
+  return flotilla
+end
+
+--- Remove asset from flotilla.
+-- @param #FLEET self
+-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The flotilla asset.
+function FLEET:RemoveAssetFromFlotilla(Asset)
+  local flotilla=self:GetFlotillaOfAsset(Asset)
+  if flotilla then
+    flotilla:DelAsset(Asset)
+  end
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- FSM Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Start FLEET FSM.
+-- @param #FLEET self
+function FLEET:onafterStart(From, Event, To)
+
+  -- Start parent Warehouse.
+  self:GetParent(self, FLEET).onafterStart(self, From, Event, To)
+
+  -- Info.
+  self:I(self.lid..string.format("Starting FLEET v%s", FLEET.version))
+
+end
+
+--- Update status.
+-- @param #FLEET self
+function FLEET:onafterStatus(From, Event, To)
+
+  -- Status of parent Warehouse.
+  self:GetParent(self).onafterStatus(self, From, Event, To)
+
+  -- FSM state.
+  local fsmstate=self:GetState()
+  
+  ----------------
+  -- Transport ---
+  ----------------
+  
+  self:CheckTransportQueue()
+
+  --------------
+  -- Mission ---
+  --------------
+
+  -- Check if any missions should be cancelled.
+  self:CheckMissionQueue()
+
+  -----------
+  -- Info ---
+  -----------    
+
+  -- General info:
+  if self.verbose>=1 then
+
+    -- Count missions not over yet.
+    local Nmissions=self:CountMissionsInQueue()
+
+    -- Asset count.
+    local Npq, Np, Nq=self:CountAssetsOnMission()
+
+    -- Asset string.
+    local assets=string.format("%d [OnMission: Total=%d, Active=%d, Queued=%d]", self:CountAssets(), Npq, Np, Nq)
+
+    -- Output.
+    local text=string.format("%s: Missions=%d, Flotillas=%d, Assets=%s", fsmstate, Nmissions, #self.cohorts, assets)
+    self:I(self.lid..text)
+  end
+
+  ------------------
+  -- Mission Info --
+  ------------------
+  if self.verbose>=2 then
+    local text=string.format("Missions Total=%d:", #self.missionqueue)
+    for i,_mission in pairs(self.missionqueue) do
+      local mission=_mission --Ops.Auftrag#AUFTRAG
+
+      local prio=string.format("%d/%s", mission.prio, tostring(mission.importance)) ; if mission.urgent then prio=prio.." (!)" end
+      local assets=string.format("%d/%d", mission:CountOpsGroups(), mission.Nassets or 0)
+      local target=string.format("%d/%d Damage=%.1f", mission:CountMissionTargets(), mission:GetTargetInitialNumber(), mission:GetTargetDamage())
+
+      text=text..string.format("\n[%d] %s %s: Status=%s, Prio=%s, Assets=%s, Targets=%s", i, mission.name, mission.type, mission.status, prio, assets, target)
+    end
+    self:I(self.lid..text)
+  end
+
+  --------------------
+  -- Transport Info --
+  --------------------
+  if self.verbose>=2 then
+    local text=string.format("Transports Total=%d:", #self.transportqueue)
+    for i,_transport in pairs(self.transportqueue) do
+      local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
+
+      local prio=string.format("%d/%s", transport.prio, tostring(transport.importance)) ; if transport.urgent then prio=prio.." (!)" end
+      local carriers=string.format("Ncargo=%d/%d, Ncarriers=%d", transport.Ncargo, transport.Ndelivered, transport.Ncarrier)
+
+      text=text..string.format("\n[%d] UID=%d: Status=%s, Prio=%s, Cargo: %s", i, transport.uid, transport:GetState(), prio, carriers)
+    end
+    self:I(self.lid..text)
+  end
+
+  -------------------
+  -- Flotilla Info --
+  -------------------
+  if self.verbose>=3 then
+    local text="Flotillas:"
+    for i,_flotilla in pairs(self.cohorts) do
+      local flotilla=_flotilla --Ops.Flotilla#FLOTILLA
+
+      local callsign=flotilla.callsignName and UTILS.GetCallsignName(flotilla.callsignName) or "N/A"
+      local modex=flotilla.modex and flotilla.modex or -1
+      local skill=flotilla.skill and tostring(flotilla.skill) or "N/A"
+
+      -- Flotilla text.
+      text=text..string.format("\n* %s %s: %s*%d/%d, Callsign=%s, Modex=%d, Skill=%s", flotilla.name, flotilla:GetState(), flotilla.aircrafttype, flotilla:CountAssets(true), #flotilla.assets, callsign, modex, skill)
+    end
+    self:I(self.lid..text)
+  end
+  
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- FSM Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- On after "NavyOnMission".
+-- @param #FLEET self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup Ops army group on mission.
+-- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
+function FLEET:onafterNavyOnMission(From, Event, To, NavyGroup, Mission)
+  -- Debug info.
+  self:T(self.lid..string.format("Group %s on %s mission %s", NavyGroup:GetName(), Mission:GetType(), Mission:GetName()))  
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -0,0 +1,175 @@
+--- **Ops** - Flotilla is a small naval group belonging to a fleet.
+--
+-- **Main Features:**
+--
+--    * Set parameters like livery, skill valid for all flotilla members.
+--    * Define mission types, this flotilla can perform (see Ops.Auftrag#AUFTRAG).
+--    * Pause/unpause flotilla operations.
+--
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- 
+-- ===
+-- @module Ops.Flotilla
+-- @image OPS_Flotilla.png
+
+
+--- FLOTILLA class.
+-- @type FLOTILLA
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity level.
+-- @field Ops.OpsGroup#OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
+-- @extends Ops.Cohort#COHORT
+
+--- *No captain can do very wrong if he places his ship alongside that of an enemy.* -- Horation Nelson
+--
+-- ===
+--
+-- # The FLOTILLA Concept
+-- 
+-- A FLOTILLA is an essential part of a FLEET.
+--
+--
+--
+-- @field #FLOTILLA
+FLOTILLA = {
+  ClassName      = "FLOTILLA",
+  verbose        =     0,
+  weaponData     =    {},
+}
+
+--- FLOTILLA class version.
+-- @field #string version
+FLOTILLA.version="0.1.0"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- TODO list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new FLOTILLA object and start the FSM.
+-- @param #FLOTILLA self
+-- @param #string TemplateGroupName Name of the template group.
+-- @param #number Ngroups Number of asset groups of this flotilla. Default 3.
+-- @param #string FlotillaName Name of the flotilla. Must be **unique**!
+-- @return #FLOTILLA self
+function FLOTILLA:New(TemplateGroupName, Ngroups, FlotillaName)
+
+  -- Inherit everything from COHORT class.
+  local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, FlotillaName)) -- #FLOTILLA
+  
+  -- All flotillas get mission type Nothing.
+  self:AddMissionCapability(AUFTRAG.Type.NOTHING, 50)
+  
+  -- Is naval.
+  self.isNaval=true
+
+  -- Get initial ammo.
+  self.ammo=self:_CheckAmmo()
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+  -- TODO: Flotilla specific user functions.
+
+--- Set fleet of this flotilla.
+-- @param #FLOTILLA self
+-- @param Ops.Fleet#FLEET Fleet The fleet.
+-- @return #FLOTILLA self
+function FLOTILLA:SetFleet(Fleet)
+  self.legion=Fleet
+  return self
+end
+
+--- Get fleet of this flotilla.
+-- @param #FLOTILLA self
+-- @return Ops.Fleet#FLEET The fleet.
+function FLOTILLA:GetFleet()
+  return self.legion
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Start & Status
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
+-- @param #FLOTILLA self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function FLOTILLA:onafterStart(From, Event, To)
+
+  -- Short info.
+  local text=string.format("Starting %s v%s %s", self.ClassName, self.version, self.name)
+  self:I(self.lid..text)
+
+  -- Start the status monitoring.
+  self:__Status(-1)
+end
+
+--- On after "Status" event.
+-- @param #FLOTILLA self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function FLOTILLA:onafterStatus(From, Event, To)
+
+  if self.verbose>=1 then
+
+    -- FSM state.
+    local fsmstate=self:GetState()
+  
+    local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
+    local skill=self.skill and tostring(self.skill) or "N/A"
+    
+    local NassetsTot=#self.assets
+    local NassetsInS=self:CountAssets(true)
+    local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0  
+    if self.legion then
+      NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
+    end
+    
+    -- Short info.
+    local text=string.format("%s [Type=%s, Call=%s, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]", 
+    fsmstate, self.aircrafttype, callsign, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
+    self:T(self.lid..text)
+    
+    -- Weapon data info.
+    if self.verbose>=3 and self.weaponData then
+      local text="Weapon Data:"
+      for bit,_weapondata in pairs(self.weaponData) do
+        local weapondata=_weapondata --Ops.OpsGroup#OPSGROUP.WeaponData
+        text=text..string.format("\n- Bit=%s: Rmin=%.1f km, Rmax=%.1f km", bit, weapondata.RangeMin/1000, weapondata.RangeMax/1000)
+      end
+      self:I(self.lid..text)
+    end
+    
+    -- Check if group has detected any units.
+    self:_CheckAssetStatus()
+    
+  end  
+  
+  if not self:IsStopped() then
+    self:__Status(-60)
+  end
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Misc Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -0,0 +1,175 @@
+--- **Ops** - Brigade Platoon.
+--
+-- **Main Features:**
+--
+--    * Set parameters like livery, skill valid for all platoon members.
+--    * Define modex and callsigns.
+--    * Define mission types, this platoon can perform (see Ops.Auftrag#AUFTRAG).
+--    * Pause/unpause platoon operations.
+--
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- @module Ops.Platoon
+-- @image OPS_Platoon.png
+
+
+--- PLATOON class.
+-- @type PLATOON
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity level.
+-- @field Ops.OpsGroup#OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
+-- @extends Ops.Cohort#COHORT
+
+--- *Some cool cohort quote* -- Known Author
+--
+-- ===
+--
+-- # The PLATOON Concept
+-- 
+-- A PLATOON is essential part of an BRIGADE.
+--
+--
+--
+-- @field #PLATOON
+PLATOON = {
+  ClassName      = "PLATOON",
+  verbose        =     0,
+  weaponData     =    {},
+}
+
+--- PLATOON class version.
+-- @field #string version
+PLATOON.version="0.1.0"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- TODO list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new PLATOON object and start the FSM.
+-- @param #PLATOON self
+-- @param #string TemplateGroupName Name of the template group.
+-- @param #number Ngroups Number of asset groups of this platoon. Default 3.
+-- @param #string PlatoonName Name of the platoon. Must be **unique**!
+-- @return #PLATOON self
+function PLATOON:New(TemplateGroupName, Ngroups, PlatoonName)
+
+  -- Inherit everything from COHORT class.
+  local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, PlatoonName)) -- #PLATOON
+  
+  -- All platoons get mission type Nothing.
+  self:AddMissionCapability(AUFTRAG.Type.NOTHING, 50)
+  
+  -- Is ground.
+  self.isGround=true
+
+  -- Get ammo.
+  self.ammo=self:_CheckAmmo()
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+  -- TODO: Platoon specific user functions.
+
+--- Set brigade of this platoon.
+-- @param #PLATOON self
+-- @param Ops.Brigade#BRIGADE Brigade The brigade.
+-- @return #PLATOON self
+function PLATOON:SetBrigade(Brigade)
+  self.legion=Brigade
+  return self
+end
+
+--- Get brigade of this platoon.
+-- @param #PLATOON self
+-- @return Ops.Brigade#BRIGADE The brigade.
+function PLATOON:GetBrigade()
+  return self.legion
+end
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Start & Status
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--[[
+--- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
+-- @param #PLATOON self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function PLATOON:onafterStart(From, Event, To)
+
+  -- Short info.
+  local text=string.format("Starting %s v%s %s", self.ClassName, self.version, self.name)
+  self:I(self.lid..text)
+
+  -- Start the status monitoring.
+  self:__Status(-1)
+end
+]]
+
+--- On after "Status" event.
+-- @param #PLATOON self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function PLATOON:onafterStatus(From, Event, To)
+
+  if self.verbose>=1 then
+
+    -- FSM state.
+    local fsmstate=self:GetState()
+  
+    local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
+    local skill=self.skill and tostring(self.skill) or "N/A"
+    
+    local NassetsTot=#self.assets
+    local NassetsInS=self:CountAssets(true)
+    local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0  
+    if self.legion then
+      NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
+    end
+    
+    -- Short info.
+    local text=string.format("%s [Type=%s, Call=%s, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]", 
+    fsmstate, self.aircrafttype, callsign, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
+    self:T(self.lid..text)
+    
+    -- Weapon data info.
+    if self.verbose>=3 and self.weaponData then
+      local text="Weapon Data:"
+      for bit,_weapondata in pairs(self.weaponData) do
+        local weapondata=_weapondata --Ops.OpsGroup#OPSGROUP.WeaponData
+        text=text..string.format("\n- Bit=%s: Rmin=%.1f km, Rmax=%.1f km", bit, weapondata.RangeMin/1000, weapondata.RangeMax/1000)
+      end
+      self:I(self.lid..text)
+    end
+    
+    -- Check if group has detected any units.
+    self:_CheckAssetStatus()
+    
+  end  
+  
+  if not self:IsStopped() then
+    self:__Status(-60)
+  end
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Misc Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: Misc functions.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -0,0 +1,324 @@
+--- **Ops** - Airwing Squadron.
+--
+-- **Main Features:**
+--
+--    * Set parameters like livery, skill valid for all squadron members.
+--    * Define modex and callsigns.
+--    * Define mission types, this squadron can perform (see Ops.Auftrag#AUFTRAG).
+--    * Pause/unpause squadron operations.
+--
+-- ===
+--
+-- ### Author: **funkyfranky**
+-- @module Ops.Squadron
+-- @image OPS_Squadron.png
+
+
+--- SQUADRON class.
+-- @type SQUADRON
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity level.
+-- @field #string lid Class id string for output to DCS log file.
+-- @field #string name Name of the squadron.
+-- @field #string templatename Name of the template group.
+-- @field #string aircrafttype Type of the airframe the squadron is using.
+-- @field Wrapper.Group#GROUP templategroup Template group.
+-- @field #number ngrouping User defined number of units in the asset group.
+-- @field #table assets Squadron assets.
+-- @field #table missiontypes Capabilities (mission types and performances) of the squadron.
+-- @field #number fuellow Low fuel threshold.
+-- @field #boolean fuellowRefuel If `true`, flight tries to refuel at the nearest tanker.
+-- @field #number maintenancetime Time in seconds needed for maintenance of a returned flight.
+-- @field #number repairtime Time in seconds for each
+-- @field #string livery Livery of the squadron.
+-- @field #number skill Skill of squadron members.
+-- @field #number modex Modex.
+-- @field #number modexcounter Counter to incease modex number for assets.
+-- @field #string callsignName Callsign name.
+-- @field #number callsigncounter Counter to increase callsign names for new assets.
+-- @field #number Ngroups Number of asset flight groups this squadron has. 
+-- @field #number engageRange Mission range in meters.
+-- @field #string attribute Generalized attribute of the squadron template group.
+-- @field #number tankerSystem For tanker squads, the refuel system used (boom=0 or probpe=1). Default nil.
+-- @field #number refuelSystem For refuelable squads, the refuel system used (boom=0 or probe=1). Default nil.
+-- @field #table tacanChannel List of TACAN channels available to the squadron.
+-- @field #number radioFreq Radio frequency in MHz the squad uses.
+-- @field #number radioModu Radio modulation the squad uses.
+-- @field #string takeoffType Take of type.
+-- @field #table parkingIDs Parking IDs for this squadron.
+-- @field #boolean despawnAfterLanding Aircraft are despawned after landing.
+-- @field #boolean despawnAfterHolding Aircraft are despawned after holding.
+-- @extends Ops.Cohort#COHORT
+
+--- *It is unbelievable what a squadron of twelve aircraft did to tip the balance* -- Adolf Galland
+--
+-- ===
+--
+-- # The SQUADRON Concept
+-- 
+-- A SQUADRON is essential part of an @{Ops.Airwing#AIRWING} and consists of **one** type of aircraft.
+-- 
+-- 
+--
+-- @field #SQUADRON
+SQUADRON = {
+  ClassName      = "SQUADRON",
+  verbose        =     0,
+  modex          =   nil,
+  modexcounter   =     0,
+  callsignName   =   nil,
+  callsigncounter=    11,
+  tankerSystem   =   nil,
+  refuelSystem   =   nil,
+}
+
+--- SQUADRON class version.
+-- @field #string version
+SQUADRON.version="0.8.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- TODO list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- DONE: Parking spots for squadrons?
+-- DONE: Engage radius.
+-- DONE: Modex.
+-- DONE: Call signs.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new SQUADRON object and start the FSM.
+-- @param #SQUADRON self
+-- @param #string TemplateGroupName Name of the template group.
+-- @param #number Ngroups Number of asset groups of this squadron. Default 3.
+-- @param #string SquadronName Name of the squadron, e.g. "VFA-37". Must be **unique**!
+-- @return #SQUADRON self
+function SQUADRON:New(TemplateGroupName, Ngroups, SquadronName)
+
+  -- Inherit everything from FSM class.
+  local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, SquadronName)) -- #SQUADRON
+
+  -- Everyone can ORBIT.
+  self:AddMissionCapability(AUFTRAG.Type.ORBIT)
+  
+  -- Is air.
+  self.isAir=true
+
+  -- Refueling system.
+  self.refuelSystem=select(2, self.templategroup:GetUnit(1):IsRefuelable())
+  self.tankerSystem=select(2, self.templategroup:GetUnit(1):IsTanker())
+
+  ------------------------
+  --- Pseudo Functions ---
+  ------------------------
+
+  -- See COHORT class
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Set number of units in groups.
+-- @param #SQUADRON self
+-- @param #number nunits Number of units. Must be >=1 and <=4. Default 2.
+-- @return #SQUADRON self
+function SQUADRON:SetGrouping(nunits)
+  self.ngrouping=nunits or 2
+  if self.ngrouping<1 then self.ngrouping=1 end
+  if self.ngrouping>4 then self.ngrouping=4 end
+  return self
+end
+
+--- Set valid parking spot IDs. Assets of this squad are only allowed to be spawned at these parking spots. **Note** that the IDs are different from the ones displayed in the mission editor!
+-- @param #SQUADRON self
+-- @param #table ParkingIDs Table of parking ID numbers or a single `#number`.
+-- @return #SQUADRON self
+function SQUADRON:SetParkingIDs(ParkingIDs)
+  if type(ParkingIDs)~="table" then
+    ParkingIDs={ParkingIDs}
+  end
+  self.parkingIDs=ParkingIDs
+  return self
+end
+
+
+--- Set takeoff type. All assets of this squadron will be spawned with cold (default) or hot engines.
+-- Spawning on runways is not supported.
+-- @param #SQUADRON self
+-- @param #string TakeoffType Take off type: "Cold" (default) or "Hot" with engines on or "Air" for spawning in air.
+-- @return #SQUADRON self
+function SQUADRON:SetTakeoffType(TakeoffType)
+  TakeoffType=TakeoffType or "Cold"
+  if TakeoffType:lower()=="hot" then
+    self.takeoffType=COORDINATE.WaypointType.TakeOffParkingHot
+  elseif TakeoffType:lower()=="cold" then
+    self.takeoffType=COORDINATE.WaypointType.TakeOffParking
+  elseif TakeoffType:lower()=="air" then
+    self.takeoffType=COORDINATE.WaypointType.TurningPoint    
+  else
+    self.takeoffType=COORDINATE.WaypointType.TakeOffParking
+  end
+  return self
+end
+
+--- Set takeoff type cold (default). All assets of this squadron will be spawned with engines off (cold).
+-- @param #SQUADRON self
+-- @return #SQUADRON self
+function SQUADRON:SetTakeoffCold()
+  self:SetTakeoffType("Cold")
+  return self
+end
+
+--- Set takeoff type hot. All assets of this squadron will be spawned with engines on (hot).
+-- @param #SQUADRON self
+-- @return #SQUADRON self
+function SQUADRON:SetTakeoffHot()
+  self:SetTakeoffType("Hot")
+  return self
+end
+
+--- Set takeoff type air. All assets of this squadron will be spawned in air above the airbase.
+-- @param #SQUADRON self
+-- @return #SQUADRON self
+function SQUADRON:SetTakeoffAir()
+  self:SetTakeoffType("Air")
+  return self
+end
+
+--- Set despawn after landing. Aircraft will be despawned after the landing event.
+-- Can help to avoid DCS AI taxiing issues.
+-- @param #SQUADRON self
+-- @param #boolean Switch If `true` (default), activate despawn after landing.
+-- @return #SQUADRON self
+function SQUADRON:SetDespawnAfterLanding(Switch)
+  if Switch then
+    self.despawnAfterLanding=Switch
+  else
+    self.despawnAfterLanding=true
+  end
+  return self
+end
+
+--- Set despawn after holding. Aircraft will be despawned when they arrive at their holding position at the airbase.
+-- Can help to avoid DCS AI taxiing issues.
+-- @param #SQUADRON self
+-- @param #boolean Switch If `true` (default), activate despawn after holding.
+-- @return #SQUADRON self
+function SQUADRON:SetDespawnAfterHolding(Switch)
+  if Switch then
+    self.despawnAfterHolding=Switch
+  else
+    self.despawnAfterHolding=true
+  end
+  return self
+end
+
+
+--- Set low fuel threshold.
+-- @param #SQUADRON self
+-- @param #number LowFuel Low fuel threshold in percent. Default 25.
+-- @return #SQUADRON self
+function SQUADRON:SetFuelLowThreshold(LowFuel)
+  self.fuellow=LowFuel or 25
+  return self
+end
+
+--- Set if low fuel threshold is reached, flight tries to refuel at the neares tanker.
+-- @param #SQUADRON self
+-- @param #boolean switch If true or nil, flight goes for refuelling. If false, turn this off.
+-- @return #SQUADRON self
+function SQUADRON:SetFuelLowRefuel(switch)
+  if switch==false then
+    self.fuellowRefuel=false
+  else
+    self.fuellowRefuel=true
+  end
+  return self
+end
+
+--- Set airwing.
+-- @param #SQUADRON self
+-- @param Ops.AirWing#AIRWING Airwing The airwing.
+-- @return #SQUADRON self
+function SQUADRON:SetAirwing(Airwing)
+  self.legion=Airwing
+  return self
+end
+
+--- Get airwing.
+-- @param #SQUADRON self
+-- @return Ops.AirWing#AIRWING The airwing.
+function SQUADRON:GetAirwing(Airwing)
+  return self.legion
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Start & Status
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
+-- @param #SQUADRON self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function SQUADRON:onafterStart(From, Event, To)
+
+  -- Short info.
+  local text=string.format("Starting SQUADRON", self.name)
+  self:T(self.lid..text)
+
+  -- Start the status monitoring.
+  self:__Status(-1)
+end
+
+--- On after "Status" event.
+-- @param #SQUADRON self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function SQUADRON:onafterStatus(From, Event, To)
+
+  if self.verbose>=1 then
+
+    -- FSM state.
+    local fsmstate=self:GetState()
+  
+    local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
+    local modex=self.modex and self.modex or -1
+    local skill=self.skill and tostring(self.skill) or "N/A"
+    
+    local NassetsTot=#self.assets
+    local NassetsInS=self:CountAssets(true)
+    local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0  
+    if self.legion then
+      NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
+    end
+    
+    -- Short info.
+    local text=string.format("%s [Type=%s, Call=%s, Modex=%d, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]", 
+    fsmstate, self.aircrafttype, callsign, modex, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
+    self:I(self.lid..text)
+    
+    -- Check if group has detected any units.
+    self:_CheckAssetStatus()
+    
+  end  
+  
+  if not self:IsStopped() then
+    self:__Status(-60)
+  end
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Misc Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
@@ -46,6 +46,7 @@
 -- @field #string path Path to the SRS exe. This includes the final slash "/".
 -- @field #string google Full path google credentials JSON file, e.g. "C:\Users\username\Downloads\service-account-file.json".
 -- @field #string Label Label showing up on the SRS radio overlay. Default is "ROBOT". No spaces allowed.
+-- @field #table AltBackend Table containing functions and variables to enable an alternate backend to transmit to SRS.
 -- @extends Core.Base#BASE

 --- *It is a very sad thing that nowadays there is so little useless information.* - Oscar Wilde
@@ -123,6 +124,50 @@
 -- 
 -- Use @{#MSRS.SetVolume} to define the SRS volume. Defaults to 1.0. Allowed values are between 0.0 and 1.0, from silent to loudest.
 -- 
+-- ## Set DCS-gRPC as an alternative to 'DCS-SR-ExternalAudio.exe' for TTS 
+--
+-- Use @{#MSRS.SetDefaultBackendGRPC} to enable [DCS-gRPC](https://github.com/DCS-gRPC/rust-server) as an alternate backend for transmitting text-to-speech over SRS.
+-- This can be useful if 'DCS-SR-ExternalAudio.exe' cannot be used in the environment, or to use Azure or AWS clouds for TTS.  Note that DCS-gRPC does not (yet?) support
+-- all of the features and options available with 'DCS-SR-ExternalAudio.exe'. Of note, only text-to-speech is supported and it it cannot be used to transmit audio files.
+--
+-- DCS-gRPC must be installed and configured per the [DCS-gRPC documentation](https://github.com/DCS-gRPC/rust-server) and already running via either the 'autostart' mechanism 
+-- or a Lua call to 'GRPC.load()' prior to use of the alternate DCS-gRPC backend. If a cloud TTS provider is being used, the API key must be set via the 'Config\dcs-grpc.lua' 
+-- configuration file prior DCS-gRPC being started. DCS-gRPC can be used both with DCS dedicated server and regular DCS installations.
+-- 
+-- To use the default local Windows TTS with DCS-gRPC, Windows 2019 Server (or newer) or Windows 10/11 are required.  Voices for non-local languages and dialects may need to
+-- be explicitly installed.
+--
+-- To set the MSRS class to use the DCS-gRPC backend for all future instances, call the function `MSRS.SetDefaultBackendGRPC()`.
+--
+-- **Note** - When using other classes that use MSRS with the alternate DCS-gRPC backend, pass them strings instead of nil values for non-applicable fields with filesystem paths, 
+-- such as the SRS path or Google credential path. This will help maximize compatibility with other classes that were written for the default backend.
+--
+-- Basic Play Text-To-Speech example using alternate DCS-gRPC backend (DCS-gRPC not previously started):
+--
+--     -- Start DCS-gRPC
+--     GRPC.load()
+--     -- Select the alternate DCS-gRPC backend for new MSRS instances
+--     MSRS.SetDefaultBackendGRPC()
+--     -- Create a SOUNDTEXT object.
+--     local text=SOUNDTEXT:New("All Enemies destroyed")  
+--     -- MOOSE SRS 
+--     local msrs=MSRS:New('', 305.0)
+--     -- Text-to speech with default voice after 30 seconds.
+--     msrs:PlaySoundText(text, 30)
+--
+-- Basic example of using another class (ATIS) with SRS and the DCS-gRPC backend (DCS-gRPC not previously started):
+--
+--     -- Start DCS-gRPC
+--     GRPC.load()
+--     -- Select the alternate DCS-gRPC backend for new MSRS instances
+--     MSRS.SetDefaultBackendGRPC()
+--     -- Create new ATIS as usual
+--     atis=ATIS:New("Nellis", 251, radio.modulation.AM)
+--     -- ATIS:SetSRS() expects a string for the SRS path even though it is not needed with DCS-gRPC
+--     atis:SetSRS('')
+--     -- Start ATIS
+--     atis:Start()
+--
 -- @field #MSRS
 MSRS = {
  ClassName      =     "MSRS",
@@ -139,11 +184,12 @@ MSRS = {
  speed          =          1,
  coordinate     =        nil,
  Label          =    "ROBOT",
+  AltBackend     =        nil,
 }

 --- MSRS class version.
 -- @field #string version
-MSRS.version="0.1.1"
+MSRS.version="0.1.2"

 --- Voices
 -- @type Voices
@@ -264,16 +310,35 @@ MSRS.Voices = {
 -- @param #number Frequency Radio frequency in MHz. Default 143.00 MHz. Can also be given as a #table of multiple frequencies.
 -- @param #number Modulation Radio modulation: 0=AM (default), 1=FM. See `radio.modulation.AM` and `radio.modulation.FM` enumerators. Can also be given as a #table of multiple modulations.
 -- @param #number Volume Volume - 1.0 is max, 0.0 is silence
+-- @param #table AltBackend Optional table containing tables 'Functions' and 'Vars' which add/replace functions and variables for the MSRS instance to allow alternate backends for transmitting to SRS.
 -- @return #MSRS self
-function MSRS:New(PathToSRS, Frequency, Modulation, Volume)
+function MSRS:New(PathToSRS, Frequency, Modulation, Volume, AltBackend)

  -- Defaults.
-  Frequency =Frequency or 143
-  Modulation= Modulation or radio.modulation.AM
+  Frequency = Frequency or 143
+  Modulation = Modulation or radio.modulation.AM

  -- Inherit everything from FSM class.
  local self=BASE:Inherit(self, BASE:New()) -- #MSRS
+
+  -- If AltBackend is supplied, initialize it, which will add/replace functions and variables in this MSRS instance.
+  if type( AltBackend ) == "table" or type( self.AltBackend ) == "table" then
+
+    local Backend = UTILS.DeepCopy(AltBackend) or UTILS.DeepCopy(self.AltBackend)
+
+    -- Add parameters to vars so alternate backends can use them if applicable
+    Backend.Vars            = Backend.Vars or {}
+    Backend.Vars.PathToSRS  = UTILS.DeepCopy(PathToSRS)   -- DeepCopy probably unecessary
+    Backend.Vars.Frequency  = UTILS.DeepCopy(Frequency)
+    Backend.Vars.Modulation = UTILS.DeepCopy(Modulation)
+    Backend.Vars.Volume     = UTILS.DeepCopy(Volume)      -- DeepCopy probably unecessary
+
+    Backend.Functions = Backend.Functions or {} 
+
+    return self:_NewAltBackend(Backend)
+  end
  
+  -- If no AltBackend table, the proceed with default initialization
  self:SetPath(PathToSRS)
  self:SetPort()
  self:SetFrequencies(Frequency)
@@ -568,6 +633,32 @@ function MSRS:Help()
  return self
 end

+--- Sets an alternate SRS backend to be used by MSRS to transmit over SRS for all new MSRS class instances.
+-- @param #table A table containing a table `Functions` with new/replacement class functions and `Vars` with new/replacement variables. 
+-- @return #boolean Returns 'true' on success.
+function MSRS.SetDefaultBackend(Backend)
+  if type(Backend) == "table" then
+    MSRS.AltBackend = UTILS.DeepCopy(Backend)
+  else
+    return false
+  end
+  
+  return true
+end
+
+--- Restores default SRS backend (DCS-SR-ExternalAudio.exe) to be used by all new MSRS class instances to transmit over SRS.
+-- @return #boolean Returns 'true' on success.
+function MSRS.ResetDefaultBackend()
+  MSRS.AltBackend = nil
+  return true
+end
+
+--- Sets DCS-gRPC as the default SRS backend for all new MSRS class instances.
+-- @return #boolean Returns 'true' on success.
+function MSRS.SetDefaultBackendGRPC()
+  return MSRS.SetDefaultBackend(MSRS_BACKEND_DCSGRPC)
+end
+
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Transmission Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -736,6 +827,35 @@ end
 -- Misc Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

+--- Adds or replaces functions and variables in the current MSRS class instance to enable an alternate backends for transmitting to SRS.
+-- @param #MSRS self
+-- @param #table A table containing a table `Functions` with new/replacement class functions and `Vars` with new/replacement variables. 
+-- @return #MSRS self
+function MSRS:_NewAltBackend(Backend)
+  BASE:T('Entering MSRS:_NewAltBackend()')
+
+  -- Add/replace class instance functions with those defined in the alternate backend in Functions table
+  for funcName,funcDef in pairs(Backend.Functions) do
+    if type(funcDef) == 'function' then
+      BASE:T('MSRS (re-)defining function MSRS:' .. funcName )
+      self[funcName] = funcDef
+    end
+  end
+
+  -- Add/replace class instance variables with those defined in the alternate backend in Vars table
+  for varName,varVal in pairs(Backend.Vars) do
+      BASE:T('MSRS setting self.' .. varName)
+      self[varName] = UTILS.DeepCopy(varVal)
+  end
+  
+  -- If _MSRSbackendInit() is defined in the backend, then run it (it should return self)
+  if self._MSRSbackendInit and type(self._MSRSbackendInit) == 'function' then
+    return self:_MSRSbackendInit()
+  end
+
+  return self
+end
+
 --- Execute SRS command to play sound using the `DCS-SR-ExternalAudio.exe`.
 -- @param #MSRS self
 -- @param #string command Command to executer
@@ -779,8 +899,25 @@ function MSRS:_ExecCommand(command)
      -- Remove file in 1 second.
      timer.scheduleFunction(os.remove, filename, timer.getTime()+1)
      timer.scheduleFunction(os.remove, filenvbs, timer.getTime()+1)
-    
-    
+
+    elseif false then
+
+      -- Create a tmp file.
+      local filenvbs = os.getenv('TMP') .. "\\MSRS-"..STTS.uuid()..".vbs"
+      
+      -- VBS script
+      local script = io.open(filenvbs, "w+")
+      script:write(string.format('Set oShell = CreateObject ("Wscript.Shell")\n'))
+      script:write(string.format('Dim strArgs\n'))
+      script:write(string.format('strArgs = "cmd /c %s"\n', filename))
+      script:write(string.format('oShell.Run strArgs, 0, false'))
+      script:close()      
+      
+      local runvbs=string.format('cscript.exe //Nologo //B "%s"', filenvbs)
+
+      -- Play file in 0.01 seconds
+      res=os.execute(runvbs)
+      
    else

      -- Debug output.
@@ -879,6 +1016,311 @@ function MSRS:_GetCommand(freqs, modus, coal, gender, voice, culture, volume, sp
  return command
 end

+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- MSRS DCS-gRPC alternate backend
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Alternate backend for MSRS to enable text-to-speech via DCS-gRPC.
+-- ### Author: **dogjutsu**
+-- A table containing functions and variables for MSRS to use DCS-gRPC [DCS-gRPC](https://github.com/DCS-gRPC/rust-server) 0.7.0 or newer as a backend to transmit over SRS.
+-- This is not a standalone class. Instead, variables and functions under the `Vars` and `Functions` tables get added to or replace MSRS variables/functions when activated.
+-- 
+-- @type MSRS_BACKEND_DCSGRPC 
+-- @field #number version Version number of this alternate backend.
+-- @field #table Functions A table of functions that will add or replace the default MSRS class functions.
+-- @field #table Vars A table of variables that will add or replace the default MSRS class variables.
+MSRS_BACKEND_DCSGRPC = {}
+MSRS_BACKEND_DCSGRPC.version = 0.1
+
+MSRS_BACKEND_DCSGRPC.Functions = {}
+MSRS_BACKEND_DCSGRPC.Vars = { provider = 'win' }
+
+--- Called by @{#MSRS._NewAltBackend} (if present) immediately after an alternate backend functions and variables for MSRS are added/replaced.
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions._MSRSbackendInit = function (self)
+  BASE:I('Loaded MSRS DCS-gRPC alternate backend version ' .. self.AltBackend.version or 'unspecified')
+
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- MSRS DCS-gRPC alternate backend User Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- No-op replacement function for @{#MSRS.SetPath} (Not Applicable)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetPath = function (self)
+  return self
+end
+
+--- No-op replacement function for @{#MSRS.GetPath} (Not Applicable)
+-- @param #MSRS self
+-- @return #string Empty string
+MSRS_BACKEND_DCSGRPC.Functions.GetPath = function (self)
+  return ''
+end
+
+--- No-op replacement function for @{#MSRS.SetVolume} (Not Applicable)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetVolume = function (self)
+  BASE:I('NOTE: MSRS:SetVolume() not used with DCS-gRPC backend.')
+  return self
+end
+
+--- No-op replacement function for @{#MSRS.GetVolume} (Not Applicable)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.GetVolume = function (self)
+  BASE:I('NOTE: MSRS:GetVolume() not used with DCS-gRPC backend.')
+  return 1
+end
+
+--- No-op replacement function for @{#MSRS.SetGender} (Not Applicable)
+-- @param #MSRS self
+-- #string Gender Gender: "male" or "female"
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetGender = function (self, Gender)
+  -- Use DCS-gRPC default if not specified
+
+  if Gender then
+    self.gender=Gender:lower()
+  end
+  
+  -- Debug output.
+  self:T("Setting gender to "..tostring(self.gender))
+  return self
+end
+
+--- Replacement function for @{#MSRS.SetGoogle} to use google text-to-speech.  (API key set as part of DCS-gRPC configuration)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetGoogle = function (self)
+    self.provider = 'gcloud'
+    return self
+end
+
+--- MSRS:SetAWS() Use AWS text-to-speech. (API key set as part of DCS-gRPC configuration)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetAWS = function (self)
+    self.provider = 'aws'
+    return self
+end
+
+--- MSRS:SetAzure() Use Azure text-to-speech. (API key set as part of DCS-gRPC configuration)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetAzure = function (self)
+    self.provider = 'azure'
+    return self
+end
+
+--- MSRS:SetWin() Use local Windows OS text-to-speech (Windows Server 2019 / Windows 11 / Windows 10? or newer). (Default)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.SetWin = function (self)
+    self.provider = 'win'
+    return self
+end
+
+--- Replacement function for @{#MSRS.Help} to display help.
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.Help = function (self)
+    env.info('For DCS-gRPC help, please see: https://github.com/DCS-gRPC/rust-server')
+    return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- MSRS DCS-gRPC alternate backend Transmission Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- No-op replacement function for @{#MSRS.PlaySoundFile} (Not Applicable)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.PlaySoundFile = function (self)
+    BASE:E("ERROR: MSRS:PlaySoundFile() is not supported by the DCS-gRPC backend.")
+    return self
+end
+
+--- Replacement function for @{#MSRS.PlaySoundText} 
+-- @param #MSRS self
+-- @param Sound.SoundFile#SOUNDTEXT SoundText Sound text.
+-- @param #number Delay Delay in seconds, before the sound file is played.
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.PlaySoundText = function (self, SoundText, Delay)
+
+    if Delay and Delay>0 then
+        self:ScheduleOnce(Delay, self.PlaySoundText, self, SoundText, 0)
+    else
+        self:_DCSgRPCtts(tostring(SoundText.text))
+    end
+    
+    return self
+end
+
+--- Replacement function for @{#MSRS.PlayText} 
+-- @param #MSRS self
+-- @param #string Text Text message.
+-- @param #number Delay Delay in seconds, before the message is played.
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.PlayText = function (self, Text, Delay)
+
+    if Delay and Delay>0 then
+        self:ScheduleOnce(Delay, self.PlayText, self, Text, 0)
+    else
+        self:_DCSgRPCtts(tostring(Text))
+    end
+    
+    return self
+end
+
+--- Replacement function for @{#MSRS.PlayText} 
+-- @param #MSRS self
+-- @param #string Text Text message.
+-- @param #number Delay Delay in seconds, before the message is played.
+-- @param #table Frequencies Radio frequencies.
+-- @param #table Modulations Radio modulations. (Non-functional, DCS-gRPC sets automatically)
+-- @param #string Gender Gender. (Non-functional, only 'Voice' supported)
+-- @param #string Culture Culture. (Non-functional, only 'Voice' supported)
+-- @param #string Voice Voice. 
+-- @param #number Volume Volume. (Non-functional, all transmissions full volume with DCS-gRPC)
+-- @param #string Label Label.
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.PlayTextExt = function (self, Text, Delay, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label)
+  if Delay and Delay>0 then
+      self:ScheduleOnce(Delay, self.PlayTextExt, self, Text, 0, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label)
+  else
+      self:_DCSgRPCtts(tostring(Text, nil, Frequencies, Voice, Label))
+  end
+  
+  return self
+end
+
+--- No-op replacement function for @{#MSRS.PlayTextFile} (Not Applicable)
+-- @param #MSRS self
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions.PlayTextFile = function (self, TextFile, Delay)
+  BASE:E("ERROR: MSRS:PlayTextFile() is not supported by the DCS-gRPC backend.")
+  return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- MSRS DCS-gRPC alternate backend Misc Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- DCS-gRPC v0.70 TTS API call:
+-- GRPC.tts(ssml, frequency[, options]) - Synthesize text (ssml; SSML tags supported) to speech and transmit it over SRS on the frequency with the following optional options (and their defaults):
+
+-- {
+--     -- The plain text without any transformations made to it for the purpose of getting it spoken out
+--     -- as desired (no SSML tags, no FOUR NINER instead of 49, ...). Even though this field is
+--     -- optional, please consider providing it as it can be used to display the spoken text to players
+--     -- with hearing impairments.
+--     plaintext = null, -- e.g. `= "Hello Pilot"`
+
+--     -- Name of the SRS client.
+--     srsClientName = "DCS-gRPC",
+
+--     -- The origin of the transmission. Relevant if the SRS server has "Line of
+--     -- Sight" and/or "Distance Limit" enabled.
+--     position = {
+--         lat = 0.0,
+--         lon = 0.0,
+--         alt = 0.0, -- in meters
+--     },
+
+--     -- The coalition of the transmission. Relevant if the SRS server has "Secure
+--     -- Coalition Radios" enabled. Supported values are: `blue` and `red`. Defaults
+--     -- to being spectator if not specified.
+--     coalition = null,
+
+--     -- TTS provider to be use. Defaults to the one configured in your config or to Windows'
+--     -- built-in TTS. Examples:
+--     -- `= { aws = {} }` / `= { aws = { voice = "..." } }` enable AWS TTS
+--     -- `= { azure = {} }` / `= { azure = { voice = "..." } }` enable Azure TTS
+--     -- `= { gcloud = {} }` / `= { gcloud = { voice = "..." } }` enable Google Cloud TTS
+--     -- `= { win = {} }` / `= { win = { voice = "..." } }` enable Windows TTS
+--     provider = null,
+-- }
+
+--- Make DCS-gRPC API call to transmit text-to-speech over SRS.
+-- @param #MSRS self
+-- @param #string Text Text of message to transmit (can also be SSML).
+-- @param #string Optional plaintext version of message (for accessiblity)
+-- @param #table Frequencies Radio frequencies to transmit on. Can also accept a number in MHz.
+-- @param #string Voice Voice for the TTS provider to user. 
+-- @param #string Label Label (SRS diplays as name of the transmitter).
+-- @return #MSRS self
+MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts = function (self, Text, Plaintext, Frequencies, Voice, Label)
+
+    BASE:T("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
+    BASE:T({Text, Plaintext, Frequencies, Voice, Label})
+
+    local options = {}
+    local ssml = Text or ''
+
+    local XmitFrequencies = Frequencies or self.Frequency
+    if type(XmitFrequencies)~="table" then
+        XmitFrequencies={XmitFrequencies}
+    end
+
+    options.plaintext = Plaintext
+    options.srsClientName = Label or self.Label
+    options.position = {}
+    if self.coordinate then
+        options.position.lat, options.position.lat, options.position.alt = self:_GetLatLongAlt(self.coordinate)
+    end
+
+    options.position.lat = options.position.lat or 0.0
+    options.position.lon = options.position.lon or 0.0
+    options.position.alt = options.position.alt or 0.0
+
+    if UTILS.GetCoalitionName(self.coalition) == 'Blue' then
+      options.coalition = 'blue'
+    elseif UTILS.GetCoalitionName(self.coalition) == 'Red' then
+      options.coalition = 'red'
+    end
+
+    options.provider = {}
+    options.provider[self.provider] = {}
+
+    if self.voice then
+      options.provider[self.provider].voice = Voice or self.voice
+    elseif ssml then
+      -- DCS-gRPC doesn't directly support language/gender, but can use SSML
+      -- Only use if a voice isn't explicitly set
+      local preTag, genderProp, langProp, postTag = '', '', '', ''
+
+      if self.gender then
+        genderProp = ' gender=\"' .. self.gender .. '\"'
+      end
+      if self.culture then
+        langProp = ' language=\"' .. self.culture .. '\"'
+      end
+
+      if self.culture or self.gender then
+        preTag = '<voice' .. langProp .. genderProp  .. '>'
+        postTag = '</voice>'
+        ssml = preTag .. Text .. postTag
+      end
+
+    end
+
+    for _,_freq in ipairs(XmitFrequencies) do
+        local freq = _freq*1000000
+        BASE:T("GRPC.tts")
+        BASE:T(ssml)
+        BASE:T(freq)
+        BASE:T(options)
+        GRPC.tts(ssml, freq, options)
+    end
+
+end
+
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

 --- Manages radio transmissions.
@@ -922,6 +1364,11 @@ MSRSQUEUE = {
 -- @field #number interval Interval in seconds before next transmission.
 -- @field #boolean TransmitOnlyWithPlayers If true, only transmit if there are alive Players.
 -- @field Core.Set#SET_CLIENT PlayerSet PlayerSet created when TransmitOnlyWithPlayers == true
+-- @field #string gender Voice gender
+-- @field #string culture Voice culture
+-- @field #string voice Voice if any
+-- @field #number volume Volume
+-- @field #string label Label to be used

 --- Create a new MSRSQUEUE object for a given radio frequency/modulation.
 -- @param #MSRSQUEUE self
@@ -1001,8 +1448,13 @@ end
 -- @param #number subduration Duration [sec] of the subtitle being displayed. Default 5 sec.
 -- @param #number frequency Radio frequency if other than MSRS default.
 -- @param #number modulation Radio modulation if other then MSRS default.
+-- @param #string gender Gender of the voice
+-- @param #string culture Culture of the voice
+-- @param #string voice Specific voice
+-- @param #number volume Volume setting
+-- @param #string label Label to be used
 -- @return #MSRSQUEUE.Transmission Radio transmission table.
-function MSRSQUEUE:NewTransmission(text, duration, msrs, tstart, interval, subgroups, subtitle, subduration, frequency, modulation)
+function MSRSQUEUE:NewTransmission(text, duration, msrs, tstart, interval, subgroups, subtitle, subduration, frequency, modulation, gender, culture, voice, volume, label)
  
  if self.TransmitOnlyWithPlayers then
    if self.PlayerSet and self.PlayerSet:CountAlive() == 0 then
@@ -1037,6 +1489,11 @@ function MSRSQUEUE:NewTransmission(text, duration, msrs, tstart, interval, subgr
  else
    transmission.subduration=0 --nil
  end
+  transmission.gender = gender
+  transmission.culture = culture
+  transmission.voice = voice
+  transmission.gender = volume
+  transmission.label = label
  
  -- Add transmission to queue.  
  self:AddTransmission(transmission)
@@ -1050,7 +1507,7 @@ end
 function MSRSQUEUE:Broadcast(transmission)
  
  if transmission.frequency then
-    transmission.msrs:PlayTextExt(transmission.text, nil, transmission.frequency, transmission.modulation, Gender, Culture, Voice, Volume, Label)
+    transmission.msrs:PlayTextExt(transmission.text, nil, transmission.frequency, transmission.modulation, transmission.gender, transmission.culture, transmission.voice, transmission.volume, transmission.label)
  else
    transmission.msrs:PlayText(transmission.text)
  end
@@ -28,11 +28,11 @@ ENUMS = {}

 --- Rules of Engagement.
 -- @type ENUMS.ROE
-- @field #number WeaponFree AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target.
-- @field #number OpenFireWeaponFree AI will engage any enemy group it detects, but will prioritize targets specified in the groups tasking.
-- @field #number OpenFire AI will engage only targets specified in its taskings.
-- @field #number ReturnFire AI will only engage threats that shoot first.
-- @field #number WeaponHold AI will hold fire under all circumstances.
+-- @field #number WeaponFree [AIR] AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target.
+-- @field #number OpenFireWeaponFree [AIR] AI will engage any enemy group it detects, but will prioritize targets specified in the groups tasking.
+-- @field #number OpenFire [AIR, GROUND, NAVAL] AI will engage only targets specified in its taskings.
+-- @field #number ReturnFire [AIR, GROUND, NAVAL] AI will only engage threats that shoot first.
+-- @field #number WeaponHold [AIR, GROUND, NAVAL] AI will hold fire under all circumstances.
 ENUMS.ROE = {
  WeaponFree=0,
  OpenFireWeaponFree=1,
@@ -236,6 +236,7 @@ ENUMS.WeaponType.Any={
 -- @field #string ESCORT Escort another group.
 -- @field #string FIGHTERSWEEP Fighter sweep.
 -- @field #string GROUNDATTACK Ground attack.
+-- @field #string GROUNDESCORT Ground escort another group.
 -- @field #string INTERCEPT Intercept.
 -- @field #string PINPOINTSTRIKE Pinpoint strike.
 -- @field #string RECONNAISSANCE Reconnaissance mission.
@@ -251,6 +252,7 @@ ENUMS.MissionTask={
  CAP="CAP",
  CAS="CAS",
  ESCORT="Escort",
+  GROUNDESCORT="Ground escort",
  FIGHTERSWEEP="Fighter Sweep",
  GROUNDATTACK="Ground Attack",
  INTERCEPT="Intercept",
@@ -43,7 +43,7 @@ BIGSMOKEPRESET = {
  HugeSmoke=8,
 }

--- DCS map as returned by env.mission.theatre.
+--- DCS map as returned by `env.mission.theatre`.
 -- @type DCSMAP
 -- @field #string Caucasus Caucasus map.
 -- @field #string Normandy Normandy map.
@@ -53,6 +53,7 @@ BIGSMOKEPRESET = {
 -- @field #string Syria Syria map.
 -- @field #string MarianaIslands Mariana Islands map.
 -- @field #string Falklands South Atlantic map.
+-- @field #string Sinai Sinai map.
 DCSMAP = {
  Caucasus="Caucasus",
  NTTR="Nevada",
@@ -62,6 +63,7 @@ DCSMAP = {
  Syria="Syria",
  MarianaIslands="MarianaIslands",
  Falklands="Falklands",
+  Sinai="SinaiMap"
 }


@@ -297,14 +299,14 @@ end
 -- @param #table tbl Input table.
 UTILS.OneLineSerialize = function( tbl )  -- serialization of a table all on a single line, no comments, made to replace old get_table_string function

-  lookup_table = {}
+local  lookup_table = {}

  local function _Serialize( tbl )

    if type(tbl) == 'table' then --function only works for tables!

      if lookup_table[tbl] then
-        return lookup_table[object]
+        return lookup_table[tbl]
      end

      local tbl_str = {}
@@ -553,6 +555,18 @@ UTILS.kg2lbs = function( kg )
  return kg * 2.20462
 end

+--- Convert latitude or longitude from degrees, minutes, seconds (DMS) to decimal degrees (DD).
+-- @param #number Degrees Degrees in grad.
+-- @param #number Minutes Minutes.
+-- @param #number Seconds Seconds.
+-- @return #number Latitude or Longitude in decimal degrees.
+UTILS.LLDMSToDD = function(Degrees, Minutes, Seconds)
+
+  local dd=(Degrees or 0) + (Minutes or 0)/60 + (Seconds or 0)/3600
+
+  return dd
+end
+
 --[[acc:
 in DM: decimal point of minutes.
 In DMS: decimal point of seconds.
@@ -1390,7 +1404,7 @@ function UTILS.TACANToFrequency(TACANChannel, TACANMode)
 end


--- Returns the DCS map/theatre as optained by env.mission.theatre
+--- Returns the DCS map/theatre as optained by `env.mission.theatre`.
 -- @return #string DCS map name.
 function UTILS.GetDCSMap()
  return env.mission.theatre
@@ -1446,6 +1460,7 @@ end
 -- * Syria +5 (East)
 -- * Mariana Islands +2 (East)
 -- * Falklands +12 (East) - note there's a LOT of deviation across the map, as we're closer to the South Pole
+-- * Sinai +4.8 (East)
 -- @param #string map (Optional) Map for which the declination is returned. Default is from env.mission.theatre
 -- @return #number Declination in degrees.
 function UTILS.GetMagneticDeclination(map)
@@ -1470,6 +1485,8 @@ function UTILS.GetMagneticDeclination(map)
    declination=2
  elseif map==DCSMAP.Falklands then
    declination=12
+  elseif map==DCSMAP.Sinai then
+    declination=4.8
  else
    declination=0
  end
@@ -1685,6 +1702,8 @@ function UTILS.GMTToLocalTimeDifference()
    return 10  -- Guam is UTC+10 hours.
  elseif theatre==DCSMAP.Falklands then
    return -3  -- Fireland is UTC-3 hours.
+  elseif theatre==DCSMAP.Sinai then
+    return 2   -- Currently map is +2 but should be +3 (DCS bug?)    
  else
    BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0", tostring(theatre)))
    return 0
@@ -12,7 +12,7 @@
 -- @image Wrapper_Airbase.JPG


--- @type AIRBASE
+-- @type AIRBASE
 -- @field #string ClassName Name of the class, i.e. "AIRBASE".
 -- @field #table CategoryName Names of airbase categories.
 -- @field #string AirbaseName Name of the airbase.
@@ -426,7 +426,7 @@ AIRBASE.TheChannel = {
 -- * AIRBASE.Syria.Al_Dumayr
 -- * AIRBASE.Syria.Gazipasa
 -- * AIRBASE.Syria.Hatay
-- * AIRBASE.Syria.Nicosia
+-- * AIRBASE.Syria.Nicosia [Deactivated by ED as of June/2023]
 -- * AIRBASE.Syria.Pinarbashi
 -- * AIRBASE.Syria.Paphos
 -- * AIRBASE.Syria.Kingsfield
@@ -467,8 +467,8 @@ AIRBASE.TheChannel = {
 -- * AIRBASE.Syria.H3_Northwest
 -- * AIRBASE.Syria.H3_Southwest
 -- * AIRBASE.Syria.Kharab_Ishk
-- * AIRBASE.Syria.Raj_al_Issa_East
-- * AIRBASE.Syria.Raj_al_Issa_West
+-- * AIRBASE.Syria.Raj_al_Issa_East (deleted by ED)
+-- * AIRBASE.Syria.Raj_al_Issa_West (deleted by ED)
 -- * AIRBASE.Syria.Ruwayshid
 -- * AIRBASE.Syria.Sanliurfa
 -- * AIRBASE.Syria.Tal_Siman
@@ -490,9 +490,8 @@ AIRBASE.Syria={
  ["Wujah_Al_Hajar"]="Wujah Al Hajar",
  ["Al_Dumayr"]="Al-Dumayr",
  ["Gazipasa"]="Gazipasa",
-  --["Ru_Convoy_4"]="Ru Convoy-4",
  ["Hatay"]="Hatay",
-  ["Nicosia"]="Nicosia",
+  --["Nicosia"]="Nicosia",
  ["Pinarbashi"]="Pinarbashi",
  ["Paphos"]="Paphos",
  ["Kingsfield"]="Kingsfield",
@@ -533,8 +532,8 @@ AIRBASE.Syria={
  ["H3_Northwest"]="H3 Northwest",
  ["H3_Southwest"]="H3 Southwest",
  ["Kharab_Ishk"]="Kharab Ishk",
-  ["Raj_al_Issa_East"]="Raj al Issa East",
-  ["Raj_al_Issa_West"]="Raj al Issa West",
+  -- ["Raj_al_Issa_East"]="Raj al Issa East",
+  -- ["Raj_al_Issa_West"]="Raj al Issa West",
  ["Ruwayshid"]="Ruwayshid",
  ["Sanliurfa"]="Sanliurfa",
  ["Tal_Siman"]="Tal Siman",
@@ -619,6 +618,72 @@ AIRBASE.SouthAtlantic={
  ["Gull_Point"] = "Gull Point",
 }

+--- Airbases of the Sinai map:
+--
+--  * AIRBASE.Sinai.Abu_Suwayr
+--  * AIRBASE.Sinai.Sde_Dov
+--  * AIRBASE.Sinai.AzZaqaziq
+--  * AIRBASE.Sinai.Hatzor
+--  * AIRBASE.Sinai.Kedem
+--  * AIRBASE.Sinai.Nevatim
+--  * AIRBASE.Sinai.Cairo_International_Airport
+--  * AIRBASE.Sinai.Al_Ismailiyah
+--  * AIRBASE.Sinai.As_Salihiyah
+--  * AIRBASE.Sinai.Fayed
+--  * AIRBASE.Sinai.Bilbeis_Air_Base
+--  * AIRBASE.Sinai.Ramon_Airbase
+--  * AIRBASE.Sinai.Kibrit_Air_Base
+--  * AIRBASE.Sinai.El_Arish
+--  * AIRBASE.Sinai.Ovda
+--  * AIRBASE.Sinai.Melez
+--  * AIRBASE.Sinai.Al_Mansurah
+--  * AIRBASE.Sinai.Palmahim
+--  * AIRBASE.Sinai.Baluza
+--  * AIRBASE.Sinai.El_Gora
+--  * AIRBASE.Sinai.Difarsuwar_Airfield
+--  * AIRBASE.Sinai.Wadi_al_Jandali
+--  * AIRBASE.Sinai.St_Catherine
+--  * AIRBASE.Sinai.Tel_Nof
+--  * AIRBASE.Sinai.Abu_Rudeis
+--  * AIRBASE.Sinai.Inshas_Airbase
+--  * AIRBASE.Sinai.Ben_Gurion
+--  * AIRBASE.Sinai.Bir_Hasanah
+--  * AIRBASE.Sinai.Cairo_West
+-- 
+-- @field Sinai
+AIRBASE.Sinai = {
+  ["Hatzerim"] = "Hatzerim",
+  ["Abu_Suwayr"] = "Abu Suwayr",
+  ["Sde_Dov"] = "Sde Dov",
+  ["AzZaqaziq"] = "AzZaqaziq",
+  ["Hatzor"] = "Hatzor",
+  ["Kedem"] = "Kedem",
+  ["Nevatim"] = "Nevatim",
+  ["Cairo_International_Airport"] = "Cairo International Airport",
+  ["Al_Ismailiyah"] = "Al Ismailiyah",
+  ["As_Salihiyah"] = "As Salihiyah",
+  ["Fayed"] = "Fayed",
+  ["Bilbeis_Air_Base"] = "Bilbeis Air Base",
+  ["Ramon_Airbase"] = "Ramon Airbase",
+  ["Kibrit_Air_Base"] = "Kibrit Air Base",
+  ["El_Arish"] = "El Arish",
+  ["Ovda"] = "Ovda",
+  ["Melez"] = "Melez",
+  ["Al_Mansurah"] = "Al Mansurah",
+  ["Palmahim"] = "Palmahim",
+  ["Baluza"] = "Baluza",
+  ["El_Gora"] = "El Gora",
+  ["Difarsuwar_Airfield"] = "Difarsuwar Airfield",
+  ["Wadi_al_Jandali"] = "Wadi al Jandali",
+  ["St_Catherine"] = "St Catherine",
+  ["Tel_Nof"] = "Tel Nof",
+  ["Abu_Rudeis"] = "Abu Rudeis",
+  ["Inshas_Airbase"] = "Inshas Airbase",
+  ["Ben_Gurion"] = "Ben-Gurion",
+  ["Bir_Hasanah"] = "Bir Hasanah",
+  ["Cairo_West"] = "Cairo West",
+}
+
 --- AIRBASE.ParkingSpot ".Coordinate, ".TerminalID", ".TerminalType", ".TOAC", ".Free", ".TerminalID0", ".DistToRwy".
 -- @type AIRBASE.ParkingSpot
 -- @field Core.Point#COORDINATE Coordinate Coordinate of the parking spot.
@@ -1436,16 +1501,16 @@ function AIRBASE:FindFreeParkingSpotForAircraft(group, terminaltype, scanradius,

  -- Get the aircraft size, i.e. it's longest side of x,z.
  local aircraft = nil -- fix local problem below
-  local _aircraftsize, ax,ay,az
+  -- SU27 dimensions as default
+  local _aircraftsize = 23
+  local ax = 23 -- l
+  local ay = 7 -- h
+  local az = 17 -- w
  if group and group.ClassName == "GROUP" then
    aircraft=group:GetUnit(1)
-    _aircraftsize, ax,ay,az=aircraft:GetObjectSize()
-  else
-    -- SU27 dimensions
-    _aircraftsize = 23
-    ax = 23 -- length
-    ay = 7 -- height
-    az = 17 -- width
+    if aircraft then
+      _aircraftsize, ax,ay,az=aircraft:GetObjectSize()
+    end
  end


@@ -2295,3 +2360,17 @@ function AIRBASE:CheckOnRunWay(group, radius, despawn)

  return false
 end
+
+--- Get category of airbase.
+-- @param #AIRBASE self
+-- @return #number Category of airbase from GetDesc().category.
+function AIRBASE:GetCategory()
+  return self.category
+end
+
+--- Get category name of airbase.
+-- @param #AIRBASE self
+-- @return #string Category of airbase, i.e. Airdrome, Ship, or Helipad
+function AIRBASE:GetCategoryName()
+  return AIRBASE.CategoryName[self.category]
+end
@@ -52,6 +52,7 @@
 --   * @{#CONTROLLABLE.TaskEmbarking}: (AIR) Move the controllable to a Vec2 Point, wait for a defined duration and embark a controllable.
 --   * @{#CONTROLLABLE.TaskEmbarkToTransport}: (GROUND) Embark to a Transport landed at a location.
 --   * @{#CONTROLLABLE.TaskEscort}: (AIR) Escort another airborne controllable.
+--   * @{#CONTROLLABLE.TaskGroundEscort}: (AIR/HELO) Escort a ground controllable.
 --   * @{#CONTROLLABLE.TaskFAC_AttackGroup}: (AIR + GROUND) The task makes the controllable/unit a FAC and orders the FAC to control the target (enemy ground controllable) destruction.
 --   * @{#CONTROLLABLE.TaskFireAtPoint}: (GROUND) Fire some or all ammunition at a VEC2 point.
 --   * @{#CONTROLLABLE.TaskFollow}: (AIR) Following another airborne controllable.
@@ -1270,7 +1271,7 @@ end

 --- (AIR) Orbit at a position with at a given altitude and speed. Optionally, a race track pattern can be specified.
 -- @param #CONTROLLABLE self
-- @param Core.Point#COORDINATE Coord Coordinate at which the CONTROLLABLE orbits.
+-- @param Core.Point#COORDINATE Coord Coordinate at which the CONTROLLABLE orbits. Can also be given as a `DCS#Vec3` or `DCS#Vec2` object.
 -- @param #number Altitude Altitude in meters of the orbit pattern. Default y component of Coord.
 -- @param #number Speed Speed [m/s] flying the orbit pattern. Default 128 m/s = 250 knots.
 -- @param Core.Point#COORDINATE CoordRaceTrack (Optional) If this coordinate is specified, the CONTROLLABLE will fly a race-track pattern using this and the initial coordinate.
@@ -1279,11 +1280,11 @@ function CONTROLLABLE:TaskOrbit( Coord, Altitude, Speed, CoordRaceTrack )

  local Pattern = AI.Task.OrbitPattern.CIRCLE

-  local P1 = Coord:GetVec2()
+  local P1 = {x=Coord.x, y=Coord.z or Coord.y}
  local P2 = nil
  if CoordRaceTrack then
    Pattern = AI.Task.OrbitPattern.RACE_TRACK
-    P2 = CoordRaceTrack:GetVec2()
+    P2 = {x=CoordRaceTrack.x, y=CoordRaceTrack.z or CoordRaceTrack.y}
  end

  local Task = {
@@ -1480,15 +1481,53 @@ function CONTROLLABLE:TaskFollow( FollowControllable, Vec3, LastWaypointIndex )
  return DCSTask
 end

+--- (AIR/HELO) Escort a ground controllable.
+-- The unit / controllable will follow lead unit of the other controllable, additional units of both controllables will continue following their leaders.
+-- The unit / controllable will also protect that controllable from threats of specified types.
+-- @param #CONTROLLABLE self
+-- @param #CONTROLLABLE FollowControllable The controllable to be escorted.
+-- @param #number LastWaypointIndex (optional) Detach waypoint of another controllable. Once reached the unit / controllable Escort task is finished.
+-- @param #number OrbitDistance (optional) Maximum distance helo will orbit around the ground unit in meters. Defaults to 2000 meters.
+-- @param DCS#AttributeNameArray TargetTypes (optional) Array of AttributeName that is contains threat categories allowed to engage. Default {"Ground vehicles"}. See [https://wiki.hoggit.us/view/DCS_enum_attributes](https://wiki.hoggit.us/view/DCS_enum_attributes)
+-- @return DCS#Task The DCS task structure.
+function CONTROLLABLE:TaskGroundEscort( FollowControllable, LastWaypointIndex, OrbitDistance, TargetTypes )
+
+  --  Escort = {
+  --    id = 'GroundEscort',
+  --    params = {
+  --      groupId = Group.ID, -- must
+  --      engagementDistMax = Distance, -- Must. With his task it does not appear to actually define the range AI are allowed to attack at, rather it defines the size length of the orbit. The helicopters will fly up to this set distance before returning to the escorted group.
+  --      lastWptIndexFlag = boolean, -- optional
+  --      lastWptIndex = number, -- optional
+  --      targetTypes = array of AttributeName, -- must
+  --      lastWptIndexFlagChangedManually = boolean, -- must be true
+  --    }
+  --  }
+
+  local DCSTask = {
+    id = 'GroundEscort',
+    params = {
+    groupId           = FollowControllable and FollowControllable:GetID() or nil,
+    engagementDistMax = OrbitDistance or 2000,
+    lastWptIndexFlag  = LastWaypointIndex and true or false,
+    lastWptIndex      = LastWaypointIndex,   
+    targetTypes       = TargetTypes or {"Ground vehicles"},
+    lastWptIndexFlagChangedManually = true,
+    },
+  }
+
+  return DCSTask
+end
+
 --- (AIR) Escort another airborne controllable.
 -- The unit / controllable will follow lead unit of another controllable, wingmens of both controllables will continue following their leaders.
 -- The unit / controllable will also protect that controllable from threats of specified types.
 -- @param #CONTROLLABLE self
 -- @param #CONTROLLABLE FollowControllable The controllable to be escorted.
 -- @param DCS#Vec3 Vec3 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.
-- @param #number LastWaypointIndex Detach waypoint of another controllable. Once reached the unit / controllable Follow task is finished.
-- @param #number EngagementDistance Maximal distance from escorted controllable to threat. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax.
-- @param DCS#AttributeNameArray TargetTypes Array of AttributeName that is contains threat categories allowed to engage. Default {"Air"}.
+-- @param #number LastWaypointIndex Detach waypoint of another controllable. Once reached the unit / controllable Escort task is finished.
+-- @param #number EngagementDistance Maximal distance from escorted controllable to threat in meters. If the threat is already engaged by escort escort will disengage if the distance becomes greater than 1.5 * engagementDistMax.
+-- @param DCS#AttributeNameArray TargetTypes Array of AttributeName that is contains threat categories allowed to engage. Default {"Air"}. See https://wiki.hoggit.us/view/DCS_enum_attributes
 -- @return DCS#Task The DCS task structure.
 function CONTROLLABLE:TaskEscort( FollowControllable, Vec3, LastWaypointIndex, EngagementDistance, TargetTypes )

@@ -1504,8 +1543,7 @@ function CONTROLLABLE:TaskEscort( FollowControllable, Vec3, LastWaypointIndex, E
  --    }
  --  }

-  local DCSTask
-  DCSTask = {
+  local DCSTask = {
    id = 'Escort',
    params = {
      groupId           = FollowControllable and FollowControllable:GetID() or nil,
@@ -5,7 +5,7 @@
 -- ===
 --
 -- ### Author: **Applevangelist**
-- # Last Update Apr 2023
+-- # Last Update June 2023
 -- 
 -- ===
 --
@@ -35,6 +35,7 @@ do
 -- @field #number id
 -- @field #number side
 -- @field #number slot
+-- @field #numner timestamp

 --- Encapsules multiplayer environment scripting functions from [net](https://wiki.hoggitworld.com/view/DCS_singleton_net)
 -- with some added FSM functions and options to block/unblock players in MP environments.
@@ -42,7 +43,7 @@ do
 -- @field #NET
 NET = {
  ClassName = "NET",
-  Version = "0.1.1",
+  Version = "0.1.2",
  BlockTime = 600,
  BlockedPilots = {},
  BlockedUCIDs = {},
@@ -90,7 +91,7 @@ function NET:New()
  -- @param #string From State.
  -- @param #string Event Trigger.
  -- @param #string To State.
-  -- @param Wrapper.Unit#UNIT Client Unit Object.
+  -- @param Wrapper.Client#CLIENT Client Object.
  -- @param #string Name Name of joining Pilot.
  -- @return #NET self
  
@@ -205,7 +206,7 @@ function NET:_EventHandler(EventData)
    
    -- Joining
    if data.id == EVENTS.PlayerEnterUnit or data.id == EVENTS.PlayerEnterAircraft then
-      self:T(self.lid.."Pilot Joining: "..name.." | UCID: "..ucid)
+      self:T(self.lid.."Pilot Joining: "..name.." | UCID: "..ucid.." | Event ID: "..data.id)
      -- Check for blockages
      local blocked = self:IsAnyBlocked(ucid,name,PlayerID,PlayerSide,PlayerSlot)  
      
@@ -213,14 +214,18 @@ function NET:_EventHandler(EventData)
        -- block pilot
        local outcome = net.force_player_slot(tonumber(PlayerID), 0, '' )
      else
-        self.KnownPilots[name] = {
-          name = name,
-          ucid = ucid,
-          id = PlayerID,
-          side = PlayerSide,
-          slot = PlayerSlot,
-        }
-        self:__PlayerJoined(1,data.IniUnit,name)
+        local client = CLIENT:FindByPlayerName(name) or data.IniUnit
+        if not self.KnownPilots[name] or (self.KnownPilots[name] and TNow-self.KnownPilots[name].timestamp > 3) then
+          self:__PlayerJoined(1,client,name)
+          self.KnownPilots[name] = {
+            name = name,
+            ucid = ucid,
+            id = PlayerID,
+            side = PlayerSide,
+            slot = PlayerSlot,
+            timestamp = TNow,
+          }
+        end
        return self
      end
    end
@@ -771,7 +776,7 @@ end
 -- @param #string To
 -- @return #NET self
 function NET:onafterStatus(From,Event,To)
-  self:I({From,Event,To})
+  self:T({From,Event,To})
  
  local function HouseHold(tavolo)
    local TNow = timer.getTime()
@@ -799,7 +804,7 @@ end
 -- @param #string To
 -- @return #NET self
 function NET:onafterRun(From,Event,To)
-  self:I({From,Event,To})
+  self:T({From,Event,To})
  self:HandleEvent(EVENTS.PlayerEnterUnit,self._EventHandler)
  self:HandleEvent(EVENTS.PlayerEnterAircraft,self._EventHandler)
  self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventHandler)
@@ -807,7 +812,7 @@ function NET:onafterRun(From,Event,To)
  self:HandleEvent(EVENTS.Ejection,self._EventHandler)
  self:HandleEvent(EVENTS.Crash,self._EventHandler)
  self:HandleEvent(EVENTS.SelfKillPilot,self._EventHandler)
-  self:__Status(-30)
+  self:__Status(-10)
 end

 ---  Stop the event functions
@@ -237,22 +237,23 @@ end
 -- @return DCS#Vec3 The 3D point vector of the POSITIONABLE.
 -- @return #nil The POSITIONABLE is not existing or alive.
 function POSITIONABLE:GetVec3()
-
  local DCSPositionable = self:GetDCSObject()
-
  if DCSPositionable then
-
+    --local status, vec3 = pcall(
+      -- function()
+        --  local vec3 = DCSPositionable:getPoint()
+        --  return vec3
+       --end
+    --)
    local vec3 = DCSPositionable:getPoint()
-
-    if vec3 then
+    --if status then
      return vec3
-    else
-      self:E( "ERROR: Cannot get vec3!" )
-    end
+    --else
+      --self:E( { "Cannot get Vec3 from DCS Object", Positionable = self, Alive = self:IsAlive() } )
+    --end
  end
-
  -- ERROR!
-  self:E( { "Cannot GetVec3", Positionable = self, Alive = self:IsAlive() } )
+  self:E( { "Cannot get the Positionable DCS Object for GetVec3", Positionable = self, Alive = self:IsAlive() } )
  return nil
 end

@@ -464,6 +465,115 @@ function POSITIONABLE:GetOffsetCoordinate( x, y, z )
  return coord
 end

+--- Returns a COORDINATE object, which is transformed to be relative to the POSITIONABLE. Inverse of @{#POSITIONABLE.GetOffsetCoordinate}.
+-- @param #POSITIONABLE self
+-- @param #number x Offset along the world x-axis in meters. Default 0 m.
+-- @param #number y Offset along the world y-axis in meters. Default 0 m.
+-- @param #number z Offset along the world z-axis in meters. Default 0 m.
+-- @return Core.Point#COORDINATE The relative COORDINATE with respect to the orientation of the  POSITIONABLE.
+function POSITIONABLE:GetRelativeCoordinate( x, y, z )
+
+  -- Default if nil.
+  x = x or 0
+  y = y or 0
+  z = z or 0
+  
+  
+  -- Vector from the origin of the map to self.
+  local selfPos = self:GetVec3()
+  
+  -- Vectors making up self's local coordinate system.
+  local X = self:GetOrientationX()
+  local Y = self:GetOrientationY()
+  local Z = self:GetOrientationZ()
+  
+  -- Offset from self to self's position (still in the world coordinate system).
+  local off = {
+    x = x - selfPos.x,
+    y = y - selfPos.y,
+    z = z - selfPos.z
+  }
+  
+  -- The end result
+  local res = { x = 0, y = 0, z = 0 }
+  
+  -- Matrix equation to solve:
+  -- | X.x, Y.x, Z.x |   | res.x |   | off.x |
+  -- | X.y, Y.y, Z.y | . | res.y | = | off.y |
+  -- | X.z, Y.z, Z.z |   | res.z |   | off.z |
+  
+  -- Use gaussian elimination to solve the system of equations.
+  -- https://en.wikipedia.org/wiki/Gaussian_elimination
+
+  local mat = {
+    { X.x, Y.x, Z.x, off.x },
+    { X.y, Y.y, Z.y, off.y },
+    { X.z, Y.z, Z.z, off.z }
+  }
+  
+  -- Matrix dimensions
+  local m = 3
+  local n = 4
+  
+  -- Pivot indices
+  local h = 1
+  local k = 1
+  
+  while h <= m and k <= n do
+    local v_max = math.abs( mat[h][k] )
+    local i_max = h
+    for i = h,m,1 do
+      local value = math.abs( mat[i][k] )
+        if value > v_max then
+          i_max = i
+          v_max = value
+        end
+    end
+    
+    if mat[i_max][k] == 0 then
+      -- Already all 0s, nothing to do.
+      k = k + 1
+    else
+      -- Swap rows h and i_max
+      local tmp = mat[h]
+      mat[h] = mat[i_max]
+      mat[i_max] = tmp
+      
+      for i = h + 1,m,1 do
+        -- The scaling factor to use to reduce all values in this column
+        local f = mat[i][k] / mat[h][k]
+        mat[i][k] = 0
+        for j = k+1,n,1 do
+          mat[i][j] = mat[i][j] - f*mat[h][j]
+        end
+      end
+      
+      h = h + 1
+      k = k + 1
+    end
+  end
+  
+  -- mat is now in row echelon form:
+  -- | #, #, #, # |
+  -- | 0, #, #, # |
+  -- | 0, 0, #, # |
+  --
+  -- and the linear equation is now effectively:
+  -- | #, #, # |   | res.x |   | # |
+  -- | 0, #, # | . | res.y | = | # |
+  -- | 0, 0, # |   | res.z |   | # |
+  -- this resulting system of equations can be easily solved via substitution.
+  
+  res.z = mat[3][4] / mat[3][3]
+  res.y = (mat[2][4] - res.z * mat[2][3]) / mat[2][2]
+  res.x = (mat[1][4] - res.y * mat[1][2] - res.z * mat[1][3]) / mat[1][1]
+  
+  local coord = COORDINATE:NewFromVec3( res )
+
+  -- Return the relative coordinate.
+  return coord
+end
+
 --- Returns a random @{DCS#Vec3} vector within a range, indicating the point in 3D of the POSITIONABLE within the mission.
 -- @param #POSITIONABLE self
 -- @param #number Radius
@@ -128,7 +128,7 @@ function SCENERY:FindByName(Name, Coordinate, Radius)
  -- @param #number radius
  -- @param #string name
  local function SceneryScan(coordinate, radius, name)
-    if coordinate ~= nil then
+    if coordinate ~= nil then   
      local scenerylist = coordinate:ScanScenery(radius)
      local rscenery = nil
      for _,_scenery in pairs(scenerylist) do
@@ -157,14 +157,14 @@ end
 --@param Core.Zone#ZONE Zone Where to find the scenery object. Can be handed as zone name.
 --@param #number Radius (optional) Search radius around coordinate, defaults to 100
 --@return #SCENERY Scenery Object or `nil` if it cannot be found
-function SCENERY:FindByNameInZone(Name, Zone, Radius)   
+function SCENERY:FindByNameInZone(Name, Zone, Radius)
  local radius = Radius or 100
  local name = Name or "unknown"
  if type(Zone) == "string" then
    Zone = ZONE:FindByName(Zone)
  end
  local coordinate = Zone:GetCoordinate()
-  return self:FindByName(Name,coordinate,Radius)  
+  return self:FindByName(Name,coordinate,Radius)
 end

 --- Find a SCENERY object from its zone name. Since SCENERY isn't registered in the Moose database (just too many objects per map), we need to do a scan first
@@ -25,6 +25,7 @@
 -- @field #string ClassName Name of the class.
 -- @field #string UnitName Name of the unit.
 -- @field #string GroupName Name of the group the unit belongs to.
+-- @field #table DCSUnit The DCS Unit object from the API.
 -- @extends Wrapper.Controllable#CONTROLLABLE

 --- For each DCS Unit object alive within a running mission, a UNIT wrapper object (instance) will be created within the global _DATABASE object (an instance of @{Core.Database#DATABASE}).
@@ -92,6 +93,7 @@ UNIT = {
  ClassName="UNIT",
  UnitName=nil,
  GroupName=nil,
+  DCSUnit = nil,
 }


@@ -124,6 +126,7 @@ function UNIT:Register( UnitName )
    if group then 
      self.GroupName=group:getName()
    end
+    self.DCSUnit = unit
  end
  
  -- Set event prio.
@@ -175,7 +178,11 @@ function UNIT:GetDCSObject()
  if DCSUnit then
    return DCSUnit
  end
-
+  
+  --if self.DCSUnit then
+    --return self.DCSUnit
+  --end
+  
  return nil
 end

@@ -313,19 +320,36 @@ function UNIT:IsActive()
  return nil
 end

--- Returns if the Unit is alive.  
-- If the Unit is not alive, nil is returned.  
-- If the Unit is alive and active, true is returned.    
-- If the Unit is alive but not active, false is returned.  
+--- Returns if the unit is exists in the mission.
+-- If not even the DCS unit object does exist, `nil` is returned.  
+-- If the unit object exists, the value of the DCS API function [isExist](https://wiki.hoggitworld.com/view/DCS_func_isExist) is returned.  
 -- @param #UNIT self
-- @return #boolean `true` if Unit is alive and active. `false` if Unit is alive but not active. `nil` if the Unit is not existing or is not alive.
+-- @return #boolean Returns `true` if unit exists in the mission.
+function UNIT:IsExist()
+
+  local DCSUnit = self:GetDCSObject() -- DCS#Unit
+  
+  if DCSUnit then
+    local exists = DCSUnit:isExist()
+    return exists
+  end 
+  
+  return nil
+end
+
+--- Returns if the Unit is alive.  
+-- If the Unit is not alive/existent, `nil` is returned.  
+-- If the Unit is alive and active, `true` is returned.    
+-- If the Unit is alive but not active, `false`` is returned.  
+-- @param #UNIT self
+-- @return #boolean Returns `true` if Unit is alive and active, `false` if it exists but is not active and `nil` if the object does not exist or DCS `isExist` function returns false.
 function UNIT:IsAlive()
  self:F3( self.UnitName )

  local DCSUnit = self:GetDCSObject() -- DCS#Unit
  
-  if DCSUnit then
-    local UnitIsAlive  = DCSUnit:isExist() and DCSUnit:isActive() -- and DCSUnit:getLife() > 1
+  if DCSUnit and DCSUnit:isExist() then
+    local UnitIsAlive = DCSUnit:isActive()
    return UnitIsAlive
  end 
  
@@ -674,20 +698,27 @@ end

 --- Returns the Unit's ammunition.
 -- @param #UNIT self
-- @return DCS#Unit.Ammo Table with ammuntion of the unit (or nil). This can be a complex table!  
+-- @return DCS#Unit.Ammo Table with ammuntion of the unit (or nil). This can be a complex table! 
 function UNIT:GetAmmo()
  self:F2( self.UnitName )
-
  local DCSUnit = self:GetDCSObject()
-  
  if DCSUnit then
+    --local status, unitammo = pcall(
+      -- function()
+        -- local UnitAmmo = DCSUnit:getAmmo()
+        -- return UnitAmmo
+       --end
+    --)
+    --if status then
+      --return unitammo
+    --end
    local UnitAmmo = DCSUnit:getAmmo()
    return UnitAmmo
  end
-  
  return nil
 end

+
 --- Sets the Unit's Internal Cargo Mass, in kg
 -- @param #UNIT self
 -- @param #number mass to set cargo to
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;D&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Dynamic}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Moose_Framework/lua54/lua54.exe}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup/Moose_Create.lua&quot; &quot;D&quot; &quot;LOCAL&quot; &quot;${workspace_loc:/Moose_Framework/Moose Development/Moose}&quot; &quot;${workspace_loc:/Moose_Framework/Moose Setup}&quot;&#13;&#10;&quot;${workspace_loc:/Moose_Framework/MOOSE_INCLUDE\Moose_Include_Dynamic}&quot; 1"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Moose_Framework}"/>
 </launchConfiguration>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Static}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Moose_Framework/lua54/lua54.exe}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${workspace_loc:/Moose_Framework/Moose Development/Moose}&quot; &quot;${workspace_loc:/Moose_Framework/Moose Setup}&quot;&#13;&#10;&quot;${workspace_loc:/Moose_Framework/MOOSE_INCLUDE\Moose_Include_Static}&quot; 1"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Moose_Framework}"/>
 </launchConfiguration>
@@ -6,7 +6,6 @@ Utilities/Profiler.lua
 Utilities/Templates.lua
 Utilities/STTS.lua
 Utilities/FiFo.lua
-Utilities/Socket.lua

 Core/Base.lua
 Core/Beacon.lua
@@ -30,11 +29,10 @@ Core/SpawnStatic.lua
 Core/Timer.lua
 Core/Goal.lua
 Core/Spot.lua
-Core/MarkerOps_Base.lua
-Core/Astar.lua
-Core/Condition.lua
 Core/TextAndSound.lua
+Core/Condition.lua
 Core/Pathline.lua
+Core/ClientMenu.lua

 Wrapper/Object.lua
 Wrapper/Identifiable.lua
@@ -78,13 +76,39 @@ Functional/Warehouse.lua
 Functional/Fox.lua
 Functional/Mantis.lua
 Functional/Shorad.lua
+Functional/Autolase.lua
+Functional/AICSAR.lua
+Functional/AmmoTruck.lua

 Ops/Airboss.lua
 Ops/RecoveryTanker.lua
 Ops/RescueHelo.lua
 Ops/ATIS.lua
-Ops/CTLD.lua
+Ops/Auftrag.lua
+Ops/OpsGroup.lua
+Ops/FlightGroup.lua
+Ops/NavyGroup.lua
+Ops/Cohort.lua
+Ops/Squadron.lua
+Ops/Platoon.lua
+Ops/Flotilla.lua
+Ops/Legion.lua
+Ops/AirWing.lua
+Ops/Brigade.lua
+Ops/Fleet.lua
+Ops/Intelligence.lua
+Ops/Commander.lua
+Ops/Chief.lua
 Ops/CSAR.lua
+Ops/CTLD.lua
+Ops/Awacs.lua
+Ops/Operation.lua
+Ops/FlightControl.lua
+Ops/PlayerTask.lua
+Ops/PlayerRecce.lua
+
+Navigation/Navaid.lua
+Navigation/FlightPlan.lua

 AI/AI_Balancer.lua
 AI/AI_Air.lua
@@ -5,19 +5,32 @@ local MooseCommitHash = arg[2]
 local MooseDevelopmentPath = arg[3]
 local MooseSetupPath = arg[4]
 local MooseTargetPath = arg[5]
+local isWindows = arg[6]

+if not isWindows then
+  isWindows = 0
+end
 print( "Moose (D)ynamic (S)tatic  : " .. MooseDynamicStatic )
 print( "Commit Hash ID            : " .. MooseCommitHash )
 print( "Moose development path    : " .. MooseDevelopmentPath )
 print( "Moose setup path          : " .. MooseSetupPath )
 print( "Moose target path         : " .. MooseTargetPath )
+print( "isWindows                  : " .. isWindows)

+  
+function PathConvert(splatnixPath)
+  if isWindows == 0 then
+    return splatnixPath
+  end
+  return splatnixPath:gsub("/", "\\")
+end
+    
 local MooseModulesFilePath =  MooseDevelopmentPath .. "/Modules.lua"
 local LoaderFilePath = MooseTargetPath .. "/Moose.lua"

 print( "Reading Moose source list : " .. MooseModulesFilePath )
-
-local LoaderFile = io.open( LoaderFilePath, "w" )
+print("Opening Loaderfile " .. PathConvert(LoaderFilePath))
+local LoaderFile = assert(io.open( PathConvert(LoaderFilePath), "w+" ))

 if MooseDynamicStatic == "S" then
  LoaderFile:write( "env.info( '*** MOOSE GITHUB Commit Hash ID: " .. MooseCommitHash .. " ***' )\n" )
@@ -31,13 +44,14 @@ if MooseDynamicStatic == "S" then
  MooseLoaderPath = MooseSetupPath .. "/Moose Templates/Moose_Static_Loader.lua"
 end

-local MooseLoader = io.open( MooseLoaderPath, "r" )
+
+local MooseLoader = assert(io.open( PathConvert(MooseLoaderPath), "r" ))
 local MooseLoaderText = MooseLoader:read( "*a" )
 MooseLoader:close()

 LoaderFile:write( MooseLoaderText )

-local MooseSourcesFile = io.open( MooseModulesFilePath, "r" )
+local MooseSourcesFile = assert(io.open( PathConvert(MooseModulesFilePath), "r" ))
 local MooseSource = MooseSourcesFile:read("*l")

 while( MooseSource ) do
@@ -50,7 +64,7 @@ while( MooseSource ) do
    end
    if MooseDynamicStatic == "S" then
      print( "Load static: " .. MooseFilePath )
-      local MooseSourceFile = io.open( MooseFilePath, "r" )
+      local MooseSourceFile = assert(io.open( PathConvert(MooseFilePath), "r" ))
      local MooseSourceFileText = MooseSourceFile:read( "*a" )
      MooseSourceFile:close()
      
@@ -72,3 +86,8 @@ LoaderFile:write( "env.info( '*** MOOSE INCLUDE END *** ' )\n" )

 MooseSourcesFile:close()
 LoaderFile:close()
+
+print("Moose include generation complete.")
+if MooseDynamicStatic == "D" then
+  print("To enable dynamic moose loading, add a soft or hard link from \"<YOUR_DCS_INSTALL_DIRECTORY>\\Scripts\\Moose\" to the \"Moose Development\\Moose\" subdirectory of the Moose_Framework repository.")
+end