Merge remote-tracking branch 'origin/master' into develop

#UTILS
* Added new tanke callsigns
2025-08-15 10:47:21 +00:00 · 2023-10-27 09:10:04 +02:00 · 2023-10-27 09:09:36 +02:00 · 2023-10-26 12:46:20 +02:00 · 2023-10-26 12:46:16 +02:00 · 2023-10-26 12:45:45 +02:00
162 changed files with 85715 additions and 3470 deletions
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -0,0 +1,159 @@
+name: Moose-Docs
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+      - name: Build informations
+        run: |
+            echo "Triggered by:  ${{ github.event_name }}"
+            echo "Running on:    ${{ runner.os }}"
+            echo "Ref:           ${{ github.ref }}"
+            echo "Branch name:   ${{ steps.extract_branch.outputs.branch }}"
+            echo "Repository:    ${{ github.repository }}"
+            echo "Commit-Id:     ${{ github.sha }}"
+            echo "Owner:         ${{ github.repository_owner }}"
+            echo "FORCE_PUSH:    ${{ vars.FORCE_PUSH }}"
+
+      #########################################################################
+      # Prepare build environment
+      #########################################################################
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Prepare build output folders
+        run: |
+          mkdir -p build/tools
+          mkdir -p build/doc
+
+      - name: Checkout FlightControls modified luadocumentor
+        uses: actions/checkout@v4
+        with:
+          repository: Applevangelist/luadocumentor
+          path: './build/tools/luadocumentor'
+          ref: 'patch-1'
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Update apt-get (needed for act docker image)
+        run: |
+          sudo apt-get -qq update
+
+      - name: Install tree
+        run: |
+          sudo apt-get -qq install tree
+
+      #########################################################################
+      # Install all prerequisites for LuaDocumentor
+      #########################################################################
+      - name: Install Lua
+        run: |
+          sudo apt-get -qq install lua5.1
+
+      - name: Install LuaRocks
+        run: |
+          sudo apt-get -qq install luarocks -y
+
+      - name: Install markdown (prereq for LuaDocumentor)
+        run: |
+          sudo luarocks install markdown 0.32-2
+
+      - name: Install penlight (prereq for LuaDocumentor)
+        run: |
+          sudo luarocks install penlight 1.11.0-1
+
+      - name: Install metalua-compiler (prereq for LuaDocumentor)
+        run: |
+          sudo luarocks install metalua-compiler 0.7.3-1
+
+      - name: Install metalua-parser (prereq for LuaDocumentor)
+        run: |
+          sudo luarocks install metalua-parser 0.7.3-2
+
+      - name: Install checks (prereq for LuaDocumentor)
+        run: |
+          sudo luarocks install checks
+
+      #########################################################################
+      # Run LuaDocumentor
+      #########################################################################
+      - name: Run LuaDocumentor
+        run: |
+          lua luadocumentor.lua -d ${{ github.workspace }}/build/doc "${{ github.workspace }}/Moose Development/Moose"
+        working-directory: ${{ github.workspace }}/build/tools/luadocumentor
+
+      #########################################################################
+      # Replace <head> tag
+      #########################################################################
+      - name: Replace head tag
+        run: |
+          python3 "${{ github.workspace }}/Moose Development/docs-header.py"
+        working-directory: ${{ github.workspace }}/build/doc
+
+      - name: Check replacement of head tag
+        run: |
+          head -10 ${{ github.workspace }}/build/doc/AI.AI_A2A_Cap.html
+
+      #########################################################################
+      # Push to MOOSE_DOCS
+      #########################################################################
+      - name: Set docs repo for branch
+        shell: bash
+        id: set_doc_repo
+        run: |
+          if [[ $GITHUB_REF == 'refs/heads/master' ]]; then
+              echo "docrepo=MOOSE_DOCS" >> "$GITHUB_OUTPUT"
+          else
+              echo "docrepo=MOOSE_DOCS_DEVELOP" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Checkout ${{ steps.set_doc_repo.outputs.docrepo }} to folder MOOSE_DOCS
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/${{ steps.set_doc_repo.outputs.docrepo }}
+          path: './build/MOOSE_DOCS'
+          fetch-depth: 0
+          ref: 'master'
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Delete folder to remove deleted files
+        run: |
+          rm -rf ./build/MOOSE_DOCS/Documentation/
+
+      - name: Create target folder
+        run: mkdir -p build/MOOSE_DOCS/Documentation
+
+      - name: Copy build result to MOOSE_DOCS
+        run: |
+          cp ./build/doc/*.* ./build/MOOSE_DOCS/Documentation/
+
+      - name: Push result to docs repository
+        if: ${{ vars.FORCE_PUSH == 'true' }}
+        run: |
+          git config user.name "MooseBotter"
+          git config user.email "MooseBotter@users.noreply.github.com"
+          git add .
+          git commit --allow-empty -m "Auto commit by GitHub Actions Workflow"
+          git push --set-upstream origin master
+
+        working-directory: ${{ github.workspace }}/build/MOOSE_DOCS
+
+      #########################################################################
+      # Show the results
+      #########################################################################
+      - name: List files in the repository
+        run: |
+          tree ${{ github.workspace }}/build
+
+      - run: echo "This job's status is ${{ job.status }}."
--- a/.github/workflows/build-includes.yml
+++ b/.github/workflows/build-includes.yml
@@ -0,0 +1,141 @@
+name: Moose-Includes
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+      - name: Build informations
+        run: |
+            echo "Triggered by:  ${{ github.event_name }}"
+            echo "Running on:    ${{ runner.os }}"
+            echo "Ref:           ${{ github.ref }}"
+            echo "Branch name:   ${{ steps.extract_branch.outputs.branch }}"
+            echo "Repository:    ${{ github.repository }}"
+            echo "Commit-Id:     ${{ github.sha }}"
+            echo "Owner:         ${{ github.repository_owner }}"
+            echo "FORCE_PUSH:    ${{ vars.FORCE_PUSH }}"
+
+      #########################################################################
+      # Prepare build environment
+      #########################################################################
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Prepare build output folders
+        run: |
+          mkdir -p build/result/Moose_Include_Dynamic
+          mkdir -p build/result/Moose_Include_Static
+
+      - name: Update apt-get (needed for act docker image)
+        run: |
+          sudo apt-get -qq update
+
+      - name: Install tree
+        run: |
+          sudo apt-get -qq install tree
+
+      #########################################################################
+      # Install all prerequisites
+      #########################################################################
+      - name: Install Lua 5.3
+        run: |
+          sudo apt-get -qq install lua5.3 -y
+      - name: Check Lua version
+        run: |
+          lua -v
+
+      - name: Install LuaRocks
+        run: |
+          sudo apt-get -qq install luarocks -y
+      - name: Check LuaRocks version
+        run: |
+          luarocks --version
+
+      - name: Install Lua 5.3 Dev for prerequisites for LuaSrcDiet
+        run: |
+          sudo apt-get -qq install liblua5.3-dev -y
+
+      - name: Install LuaSrcDiet
+        run: |
+          sudo luarocks install luasrcdiet
+
+      - name: Install LuaCheck
+        run: |
+          sudo luarocks install luacheck
+
+      #########################################################################
+      # Build Include files
+      #########################################################################
+      - name: Build Include Static
+        run: |
+          export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict)
+          lua5.3 "./Moose Setup/Moose_Create.lua" S "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Static"
+
+      - name: Build Includes Dynamic
+        run: |
+          export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict)
+          lua5.3 "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic"
+
+      - name: Run LuaSrcDiet
+        run: |
+          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
+
+      #########################################################################
+      # Run LuaCheck
+      #########################################################################
+      - name: Run LuaCheck
+        if: ${{ vars.SKIP_LUACHECK != true }}
+        continue-on-error: true
+        run: |
+          luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose"
+
+      #########################################################################
+      # Push to MOOSE_INCLUDE
+      #########################################################################
+      - name: Checkout MOOSE_INCLUDE
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/MOOSE_INCLUDE
+          path: './build/MOOSE_INCLUDE'
+          fetch-depth: 0
+          ref: ${{ steps.extract_branch.outputs.branch }}
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Create target folder (needed if checkout is deactivated)
+        run: mkdir -p build/MOOSE_INCLUDE
+
+      - name: Copy build reseult to MOOSE_INCLUDE
+        run: |
+          cp -r ./build/result/* ./build/MOOSE_INCLUDE/
+
+      - name: Push result to MOOSE_INCLUDE repository
+        if: ${{ vars.FORCE_PUSH == 'true' }}
+        run: |
+          git config user.name "MooseBotter"
+          git config user.email "MooseBotter@users.noreply.github.com"
+          git add .
+          git commit --allow-empty -m "Auto commit by GitHub Actions Workflow"
+          git push --set-upstream origin ${{ steps.extract_branch.outputs.branch }}
+
+        working-directory: ${{ github.workspace }}/build/MOOSE_INCLUDE
+
+      #########################################################################
+      # Show the results
+      #########################################################################
+      - name: List files in the repository
+        run: |
+          tree ${{ github.workspace }}/build
+
+      - run: echo "This job's status is ${{ job.status }}."
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -0,0 +1,78 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll site to Pages
+
+on:
+  push:
+    branches: ["master"]
+    paths:
+      - 'docs/**'
+      - '.github/workflows/pages.yml'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+          working-directory: docs/
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v3
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+        working-directory: docs/
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: docs/_site/
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1
+
+  check:
+    runs-on: ubuntu-latest
+    needs: deploy
+    steps:
+      - name: Setup Node
+        uses: actions/setup-node@v3
+      - run: npm install linkinator
+      - run: npx linkinator https://flightcontrol-master.github.io/MOOSE/ --recurse
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,13 @@ local.properties
 .buildpath


+#####################
+## Visual Studio Code
+#####################
+*.code-workspace
+.vscode/
+
+
 #################
 ## Visual Studio
 #################
@@ -220,11 +227,12 @@ pip-log.txt
 _gsdata_/

 #GITHUB
-.gitattributes
-.gitignore
 Moose Test Missions/MOOSE_Test_Template.miz
 Moose Development/Moose/.vscode/launch.json
 MooseCodeWS.code-workspace
-.gitignore
-.gitignore
-/.gitignore
+
+# Excludes for act (https://github.com/nektos/act)
+.secrets
+.env
+.actrc
+.vars
--- a/Development/Moose/AI/AI_A2A_Cap.lua
+++ b/Development/Moose/AI/AI_A2A_Cap.lua
@@ -91,7 +91,12 @@
 -- An optional @{Core.Zone} can be set,
 -- that will define when the AI will engage with the detected airborne enemy targets.
 -- Use the method @{#AI_A2A_CAP.SetEngageZone}() to define that Zone.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --
 -- @field #AI_A2A_CAP
--- a/Development/Moose/AI/AI_A2A_Dispatcher.lua
+++ b/Development/Moose/AI/AI_A2A_Dispatcher.lua
@@ -176,7 +176,12 @@
 -- Per one, two, three, four?
 --
 -- **The default grouping is 1. That means, that each spawned defender will act individually.**
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --
 -- ### Authors: **FlightControl** rework of GCICAP + introduction of new concepts (squadrons).
--- a/Development/Moose/AI/AI_A2A_Gci.lua
+++ b/Development/Moose/AI/AI_A2A_Gci.lua
@@ -92,7 +92,12 @@
 -- An optional @{Core.Zone} can be set,
 -- that will define when the AI will engage with the detected airborne enemy targets.
 -- Use the method @{AI.AI_CAP#AI_CAP_ZONE.SetEngageZone}() to define that Zone.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --
 -- @field #AI_A2A_GCI
--- a/Development/Moose/AI/AI_A2A_Patrol.lua
+++ b/Development/Moose/AI/AI_A2A_Patrol.lua
@@ -111,7 +111,12 @@
 -- When the AI is damaged, it is required that a new Patrol is started. However, damage cannon be foreseen early on. 
 -- Therefore, when the damage threshold is reached, the AI will return immediately to the home base (RTB).
 -- Use the method @{#AI_A2A_PATROL.ManageDamage}() to have this proces in place.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_A2A_PATROL
--- a/Development/Moose/AI/AI_A2G_BAI.lua
+++ b/Development/Moose/AI/AI_A2G_BAI.lua
@@ -15,7 +15,12 @@
 -- @extends AI.AI_A2A_Engage#AI_A2A_Engage -- TODO: Documentation. This class does not exist, unable to determine what it extends.

 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_A2G_BAI
--- a/Development/Moose/AI/AI_A2G_CAS.lua
+++ b/Development/Moose/AI/AI_A2G_CAS.lua
@@ -15,7 +15,12 @@
 -- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL TODO: Documentation. This class does not exist, unable to determine what it extends.

 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_A2G_CAS
--- a/Development/Moose/AI/AI_A2G_Dispatcher.lua
+++ b/Development/Moose/AI/AI_A2G_Dispatcher.lua
@@ -253,7 +253,12 @@
 -- 
 -- **The default grouping is 1. That means, that each spawned defender will act individually.**
 -- But you can specify a number between 1 and 4, so that the defenders will act as a group.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- ### Author: **FlightControl** rework of GCICAP + introduction of new concepts (squadrons).
--- a/Development/Moose/AI/AI_A2G_SEAD.lua
+++ b/Development/Moose/AI/AI_A2G_SEAD.lua
@@ -68,7 +68,12 @@
 -- An optional @{Core.Zone} can be set, 
 -- that will define when the AI will engage with the detected airborne enemy targets.
 -- Use the method @{AI.AI_CAP#AI_CAP_ZONE.SetEngageZone}() to define that Zone. -- TODO: Documentation. Check that this is actually correct. The originally referenced class does not exist.
--  
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_A2G_SEAD
--- a/Development/Moose/AI/AI_Air.lua
+++ b/Development/Moose/AI/AI_Air.lua
@@ -45,7 +45,12 @@
 --   * **Start**: Start the transport process.
 --   * **Stop**: Stop the transport process.
 --   * **Monitor**: Monitor and take action.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- @field #AI_AIR
 AI_AIR = {
  ClassName = "AI_AIR",
--- a/Development/Moose/AI/AI_Air_Dispatcher.lua
+++ b/Development/Moose/AI/AI_Air_Dispatcher.lua
@@ -883,6 +883,11 @@ do -- AI_AIR_DISPATCHER
  -- However, the squadron will still stay alive. Any airplane that is airborne will continue its operations until all airborne airplanes
  -- of the squadron will be destroyed. This to keep consistency of air operations not to confuse the players.
  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
  -- @field #AI_AIR_DISPATCHER
  AI_AIR_DISPATCHER = {
    ClassName = "AI_AIR_DISPATCHER",
--- a/Development/Moose/AI/AI_Air_Engage.lua
+++ b/Development/Moose/AI/AI_Air_Engage.lua
@@ -68,7 +68,12 @@
 -- An optional @{Core.Zone} can be set, 
 -- that will define when the AI will engage with the detected airborne enemy targets.
 -- Use the method @{AI.AI_CAP#AI_AIR_ENGAGE.SetEngageZone}() to define that Zone.
--  
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_AIR_ENGAGE
--- a/Development/Moose/AI/AI_Air_Patrol.lua
+++ b/Development/Moose/AI/AI_Air_Patrol.lua
@@ -88,7 +88,12 @@
 -- An optional @{Core.Zone} can be set, 
 -- that will define when the AI will engage with the detected airborne enemy targets.
 -- Use the method @{AI.AI_CAP#AI_AIR_PATROL.SetEngageZone}() to define that Zone.
--  
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_AIR_PATROL
--- a/Development/Moose/AI/AI_Air_Squadron.lua
+++ b/Development/Moose/AI/AI_Air_Squadron.lua
@@ -18,7 +18,12 @@


 --- Implements the core functions modeling squadrons for airplanes and helicopters.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_AIR_SQUADRON
--- a/Development/Moose/AI/AI_BAI.lua
+++ b/Development/Moose/AI/AI_BAI.lua
@@ -130,7 +130,12 @@
 --      AIBAIZone:SearchOff()
 -- 
 -- Searching can be switched back on with the method @{#AI_BAI_ZONE.SearchOn}(). Use the method @{#AI_BAI_ZONE.SearchOnOff}() to flexibily switch searching on or off.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_BAI_ZONE
--- a/Development/Moose/AI/AI_Balancer.lua
+++ b/Development/Moose/AI/AI_Balancer.lua
@@ -85,7 +85,12 @@
 -- 
 -- Note that when AI returns to an airbase, the AI_BALANCER will trigger the **Return** event and the AI will return, 
 -- otherwise the AI_BALANCER will trigger a **Destroy** event, and the AI will be destroyed.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- @field #AI_BALANCER
 AI_BALANCER = {
  ClassName = "AI_BALANCER",
--- a/Development/Moose/AI/AI_CAP.lua
+++ b/Development/Moose/AI/AI_CAP.lua
@@ -112,7 +112,12 @@
 -- An optional @{Core.Zone} can be set, 
 -- that will define when the AI will engage with the detected airborne enemy targets.
 -- Use the method @{#AI_CAP_ZONE.SetEngageZone}() to define that Zone.
--  
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_CAP_ZONE
--- a/Development/Moose/AI/AI_CAS.lua
+++ b/Development/Moose/AI/AI_CAS.lua
@@ -118,7 +118,12 @@
 --   * **@{#AI_CAS_ZONE.Destroy}**: The AI has destroyed a target @{Wrapper.Unit}.
 --   * **@{#AI_CAS_ZONE.Destroyed}**: The AI has destroyed all target @{Wrapper.Unit}s assigned in the CAS task.
 --   * **Status**: The AI is checking status (fuel and damage). When the thresholds have been reached, the AI will RTB.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_CAS_ZONE
--- a/Development/Moose/AI/AI_Cargo.lua
+++ b/Development/Moose/AI/AI_Cargo.lua
@@ -25,7 +25,12 @@
 --    * @{AI.AI_Cargo_APC} - Cargo transportation using APCs and other vehicles between zones.
 --    * @{AI.AI_Cargo_Helicopter} - Cargo transportation using helicopters between zones.
 --    * @{AI.AI_Cargo_Airplane} - Cargo transportation using airplanes to and from airbases.
--    
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  -- 
 -- @field #AI_CARGO
 AI_CARGO = {
  ClassName = "AI_CARGO",
--- a/Development/Moose/AI/AI_Cargo_APC.lua
+++ b/Development/Moose/AI/AI_Cargo_APC.lua
@@ -75,7 +75,12 @@
 -- Using the @{#AI_CARGO_APC.Pickup}() method, you are able to direct the APCs towards a point on the battlefield to board/load the cargo at the specific coordinate. 
 -- The APCs will follow nearby roads as much as possible, to ensure fast and clean cargo transportation between the objects and villages in the simulation environment.
 -- 
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- 
 -- @field #AI_CARGO_APC
 AI_CARGO_APC = {
--- a/Development/Moose/AI/AI_Cargo_Airplane.lua
+++ b/Development/Moose/AI/AI_Cargo_Airplane.lua
@@ -41,7 +41,12 @@
 -- marginal impact on the overall battlefield simulation. Fortunately, the firing strength of infantry is limited, and thus, respacing healthy infantry every
 -- time is not so much of an issue ... 
 -- 
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- @field #AI_CARGO_AIRPLANE
 AI_CARGO_AIRPLANE = {
  ClassName = "AI_CARGO_AIRPLANE",
--- a/Development/Moose/AI/AI_Cargo_Dispatcher.lua
+++ b/Development/Moose/AI/AI_Cargo_Dispatcher.lua
@@ -100,7 +100,12 @@
 -- 
 -- Yes, please ensure that the zones are declared using the @{Core.Zone} classes.
 -- Possible zones that function at the moment are ZONE, ZONE_GROUP, ZONE_UNIT, ZONE_POLYGON.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- ### Author: **FlightControl**
--- a/Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua
+++ b/Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua
@@ -137,7 +137,12 @@
 -- Use @{#AI_CARGO_DISPATCHER_APC.SetHomeZone}() to specify the home zone.
 -- 
 -- If no home zone is specified, the APCs will wait near the deploy zone for a new pickup command.   
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_CARGO_DISPATCHER_APC
--- a/Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua
+++ b/Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua
@@ -108,7 +108,12 @@
 -- 
 -- **There are a lot of templates available that allows you to quickly setup an event handler for a specific event type!**
 -- 
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- 
 -- @field #AI_CARGO_DISPATCHER_AIRPLANE
 AI_CARGO_DISPATCHER_AIRPLANE = {
--- a/Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua
+++ b/Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua
@@ -140,7 +140,12 @@
 -- Use @{#AI_CARGO_DISPATCHER_HELICOPTER.SetHomeZone}() to specify the home zone.
 -- 
 -- If no home zone is specified, the helicopters will wait near the deploy zone for a new pickup command.   
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_CARGO_DISPATCHER_HELICOPTER
--- a/Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
+++ b/Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
@@ -130,7 +130,12 @@
 -- Use @{#AI_CARGO_DISPATCHER_SHIP.SetHomeZone}() to specify the home zone.
 -- 
 -- If no home zone is specified, the Ship will wait near the deploy zone for a new pickup command.   
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_CARGO_DISPATCHER_SHIP
--- a/Development/Moose/AI/AI_Cargo_Helicopter.lua
+++ b/Development/Moose/AI/AI_Cargo_Helicopter.lua
@@ -41,7 +41,12 @@
 -- marginal impact on the overall battlefield simulation. Fortunately, the firing strength of infantry is limited, and thus, respacing healthy infantry every
 -- time is not so much of an issue ... 
 -- 
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_CARGO_HELICOPTER
--- a/Development/Moose/AI/AI_Cargo_Ship.lua
+++ b/Development/Moose/AI/AI_Cargo_Ship.lua
@@ -54,7 +54,12 @@
 -- Using the @{#AI_CARGO_SHIP.Pickup}() method, you are able to direct the Ship towards a Pickup zone to board/load the cargo at the specified
 -- coordinate. The Ship will follow the Shipping Lane to ensure consistent cargo transportation within the simulation environment.
 --
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- @field #AI_CARGO_SHIP
 AI_CARGO_SHIP = {
    ClassName = "AI_CARGO_SHIP",
--- a/Development/Moose/AI/AI_Escort.lua
+++ b/Development/Moose/AI/AI_Escort.lua
@@ -147,8 +147,8 @@
 -- @image Escorting.JPG


-
--- @type AI_ESCORT
+---
+-- @type AI_ESCORT
 -- @extends AI.AI_Formation#AI_FORMATION


@@ -168,11 +168,18 @@
 -- 
 -- -- First find the GROUP object and the CLIENT object.
 -- local EscortUnit = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- local EscortGroup = SET_GROUP:New():FilterPrefixes("Escort"):FilterOnce() -- The the group name of the escorts contains "Escort".
 -- 
 -- -- Now use these 2 objects to construct the new EscortPlanes object.
 -- EscortPlanes = AI_ESCORT:New( EscortUnit, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
--
+-- EscortPlanes:MenusAirplanes() -- create menus for airplanes
+-- EscortPlanes:__Start(2)
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- @field #AI_ESCORT
 AI_ESCORT = {
  ClassName = "AI_ESCORT",
@@ -189,7 +196,7 @@ AI_ESCORT = {
  TaskPoints = {}
 }

--- @field Functional.Detection#DETECTION_AREAS
+-- @field Functional.Detection#DETECTION_AREAS
 AI_ESCORT.Detection = nil

 --- MENUPARAM type
@@ -211,10 +218,14 @@ AI_ESCORT.Detection = nil
 -- 
 -- -- First find the GROUP object and the CLIENT object.
 -- local EscortUnit = CLIENT:FindByName( "Unit Name" ) -- The Unit Name is the name of the unit flagged with the skill Client in the mission editor.
-- local EscortGroup = GROUP:FindByName( "Group Name" ) -- The Group Name is the name of the group that will escort the Escort Client.
+-- local EscortGroup = SET_GROUP:New():FilterPrefixes("Escort"):FilterOnce() -- The the group name of the escorts contains "Escort".
 -- 
 -- -- Now use these 2 objects to construct the new EscortPlanes object.
 -- EscortPlanes = AI_ESCORT:New( EscortUnit, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." )
+-- EscortPlanes:MenusAirplanes() -- create menus for airplanes
+-- EscortPlanes:__Start(2)
+-- 
+-- 
 function AI_ESCORT:New( EscortUnit, EscortGroupSet, EscortName, EscortBriefing )
  
  local self = BASE:Inherit( self, AI_FORMATION:New( EscortUnit, EscortGroupSet, EscortName, EscortBriefing ) ) -- #AI_ESCORT
@@ -227,10 +238,17 @@ function AI_ESCORT:New( EscortUnit, EscortGroupSet, EscortName, EscortBriefing )
  self.EscortGroupSet = EscortGroupSet
  
  self.EscortGroupSet:SetSomeIteratorLimit( 8 )
-  
+
  self.EscortBriefing = EscortBriefing
 
  self.Menu = {}
+  self.Menu.HoldAtEscortPosition = self.Menu.HoldAtEscortPosition or {}
+  self.Menu.HoldAtLeaderPosition = self.Menu.HoldAtLeaderPosition or {}
+  self.Menu.Flare = self.Menu.Flare or {}
+  self.Menu.Smoke = self.Menu.Smoke or {}
+  self.Menu.Targets = self.Menu.Targets or {}
+  self.Menu.ROE = self.Menu.ROE or {}
+  self.Menu.ROT = self.Menu.ROT or {}
  
 --  if not EscortBriefing then
 --    EscortGroup:MessageToClient( EscortGroup:GetCategoryName() .. " '" .. EscortName .. "' (" .. EscortGroup:GetCallsign() .. ") reporting! " ..
@@ -250,7 +268,7 @@ function AI_ESCORT:New( EscortUnit, EscortGroupSet, EscortName, EscortBriefing )


  EscortGroupSet:ForEachGroup(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      -- Set EscortGroup known at EscortUnit.
      if not self.PlayerUnit._EscortGroups then
@@ -325,14 +343,14 @@ function AI_ESCORT:_InitEscortRoute( EscortGroup )
 end


--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Core.Set#SET_GROUP EscortGroupSet
 function AI_ESCORT:onafterStart( EscortGroupSet )

  self:F()

  EscortGroupSet:ForEachGroup(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      EscortGroup:WayPointInitialize()
    
@@ -370,7 +388,7 @@ function AI_ESCORT:onafterStart( EscortGroupSet )
  self:_InitFlightMenus()
  
  self.EscortGroupSet:ForSomeGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )

      self:_InitEscortMenus( EscortGroup )
@@ -378,7 +396,7 @@ function AI_ESCORT:onafterStart( EscortGroupSet )

      self:SetFlightModeFormation( EscortGroup )
      
-      --- @param #AI_ESCORT self
+      -- @param #AI_ESCORT self
      -- @param Core.Event#EVENTDATA EventData
      function EscortGroup:OnEventDeadOrCrash( EventData )
        self:F( { "EventDead", EventData } )
@@ -394,14 +412,14 @@ function AI_ESCORT:onafterStart( EscortGroupSet )

 end

--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Core.Set#SET_GROUP EscortGroupSet
 function AI_ESCORT:onafterStop( EscortGroupSet )

  self:F()

  EscortGroupSet:ForEachGroup(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      EscortGroup:WayPointInitialize()
    
@@ -550,7 +568,7 @@ function AI_ESCORT:SetFlightMenuFormation( Formation )
    local MenuFlightFormationID = MENU_GROUP_COMMAND:New( self.PlayerGroup, Formation, FlightMenuFormation, 
      function ( self, Formation, ... )
        self.EscortGroupSet:ForSomeGroupAlive(
-          --- @param Core.Group#GROUP EscortGroup
+          -- @param Core.Group#GROUP EscortGroup
          function( EscortGroup, self, Formation, Arguments )
            if EscortGroup:IsAir() then
              self:E({FormationID=FormationID})
@@ -764,7 +782,7 @@ end

 function AI_ESCORT:SetFlightMenuHoldAtEscortPosition()

-  for _, MenuHoldAtEscortPosition in pairs( self.Menu.HoldAtEscortPosition ) do
+  for _, MenuHoldAtEscortPosition in pairs( self.Menu.HoldAtEscortPosition or {} ) do
    local FlightMenuReportNavigation = MENU_GROUP:New( self.PlayerGroup, "Navigation", self.FlightMenu )
  
    local FlightMenuHoldPosition = MENU_GROUP_COMMAND
@@ -785,7 +803,7 @@ end

 function AI_ESCORT:SetEscortMenuHoldAtEscortPosition( EscortGroup )

-  for _, HoldAtEscortPosition in pairs( self.Menu.HoldAtEscortPosition ) do
+  for _, HoldAtEscortPosition in pairs( self.Menu.HoldAtEscortPosition or {}) do
    if EscortGroup:IsAir() then
      local EscortGroupName = EscortGroup:GetName()
      local EscortMenuReportNavigation = MENU_GROUP:New( self.PlayerGroup, "Navigation", EscortGroup.EscortMenu )
@@ -853,7 +871,7 @@ end

 function AI_ESCORT:SetFlightMenuHoldAtLeaderPosition()

-  for _, MenuHoldAtLeaderPosition in pairs( self.Menu.HoldAtLeaderPosition ) do
+  for _, MenuHoldAtLeaderPosition in pairs( self.Menu.HoldAtLeaderPosition or {}) do
    local FlightMenuReportNavigation = MENU_GROUP:New( self.PlayerGroup, "Navigation", self.FlightMenu )
  
    local FlightMenuHoldAtLeaderPosition = MENU_GROUP_COMMAND
@@ -874,7 +892,7 @@ end

 function AI_ESCORT:SetEscortMenuHoldAtLeaderPosition( EscortGroup )

-  for _, HoldAtLeaderPosition in pairs( self.Menu.HoldAtLeaderPosition ) do
+  for _, HoldAtLeaderPosition in pairs( self.Menu.HoldAtLeaderPosition or {}) do
    if EscortGroup:IsAir() then
      
      local EscortGroupName = EscortGroup:GetName()
@@ -999,7 +1017,7 @@ end

 function AI_ESCORT:SetFlightMenuFlare()

-  for _, MenuFlare in pairs( self.Menu.Flare) do
+  for _, MenuFlare in pairs( self.Menu.Flare or {}) do
    local FlightMenuReportNavigation = MENU_GROUP:New( self.PlayerGroup, "Navigation", self.FlightMenu )
    local FlightMenuFlare = MENU_GROUP:New( self.PlayerGroup, MenuFlare.MenuText, FlightMenuReportNavigation )
  
@@ -1014,7 +1032,7 @@ end

 function AI_ESCORT:SetEscortMenuFlare( EscortGroup )

-  for _, MenuFlare in pairs( self.Menu.Flare) do
+  for _, MenuFlare in pairs( self.Menu.Flare or {}) do
    if EscortGroup:IsAir() then
      
      local EscortGroupName = EscortGroup:GetName()
@@ -1059,7 +1077,7 @@ end

 function AI_ESCORT:SetFlightMenuSmoke()

-  for _, MenuSmoke in pairs( self.Menu.Smoke) do
+  for _, MenuSmoke in pairs( self.Menu.Smoke or {}) do
    local FlightMenuReportNavigation = MENU_GROUP:New( self.PlayerGroup, "Navigation", self.FlightMenu )
    local FlightMenuSmoke = MENU_GROUP:New( self.PlayerGroup, MenuSmoke.MenuText, FlightMenuReportNavigation )
  
@@ -1076,7 +1094,7 @@ end

 function AI_ESCORT:SetEscortMenuSmoke( EscortGroup )

-  for _, MenuSmoke in pairs( self.Menu.Smoke) do
+  for _, MenuSmoke in pairs( self.Menu.Smoke or {}) do
    if EscortGroup:IsAir() then
      
      local EscortGroupName = EscortGroup:GetName()
@@ -1169,7 +1187,7 @@ function AI_ESCORT:SetFlightMenuTargets()
  local FlightMenuAttackNearbyAir = MENU_GROUP_COMMAND:New( self.PlayerGroup, "Attack nearest airborne targets",  self.FlightMenuAttack, AI_ESCORT._FlightAttackNearestTarget, self, self.__Enum.ReportType.Air ):SetTag( "Attack" )
  local FlightMenuAttackNearbyGround = MENU_GROUP_COMMAND:New( self.PlayerGroup, "Attack nearest ground targets",  self.FlightMenuAttack, AI_ESCORT._FlightAttackNearestTarget, self, self.__Enum.ReportType.Ground ):SetTag( "Attack" )
  
-  for _, MenuTargets in pairs( self.Menu.Targets) do
+  for _, MenuTargets in pairs( self.Menu.Targets or {}) do
    MenuTargets.FlightReportTargetsScheduler = SCHEDULER:New( self, self._FlightReportTargetsScheduler, {}, MenuTargets.Interval, MenuTargets.Interval )
  end

@@ -1179,7 +1197,7 @@ end

 function AI_ESCORT:SetEscortMenuTargets( EscortGroup )

-  for _, MenuTargets in pairs( self.Menu.Targets) do
+  for _, MenuTargets in pairs( self.Menu.Targets or {} or {}) do
    if EscortGroup:IsAir() then
      local EscortGroupName = EscortGroup:GetName()
      --local EscortMenuReportTargets = MENU_GROUP:New( self.PlayerGroup, "Report targets", EscortGroup.EscortMenu )
@@ -1231,7 +1249,7 @@ function AI_ESCORT:MenuAssistedAttack()
  self:F()

  self.EscortGroupSet:ForSomeGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if not EscortGroup:IsAir() then
        -- Request assistance from other escorts.
@@ -1246,7 +1264,7 @@ end

 function AI_ESCORT:SetFlightMenuROE()

-  for _, MenuROE in pairs( self.Menu.ROE) do
+  for _, MenuROE in pairs( self.Menu.ROE or {}) do
    local FlightMenuROE = MENU_GROUP:New( self.PlayerGroup, "Rule Of Engagement", self.FlightMenu )
  
    local FlightMenuROEHoldFire   = MENU_GROUP_COMMAND:New( self.PlayerGroup, "Hold fire",          FlightMenuROE, AI_ESCORT._FlightROEHoldFire,   self,  "Holding weapons!" )
@@ -1261,7 +1279,7 @@ end

 function AI_ESCORT:SetEscortMenuROE( EscortGroup )

-  for _, MenuROE in pairs( self.Menu.ROE) do
+  for _, MenuROE in pairs( self.Menu.ROE or {}) do
    if EscortGroup:IsAir() then

      local EscortGroupName = EscortGroup:GetName()
@@ -1302,7 +1320,7 @@ end

 function AI_ESCORT:SetFlightMenuROT()

-  for _, MenuROT in pairs( self.Menu.ROT) do
+  for _, MenuROT in pairs( self.Menu.ROT or {}) do
    local FlightMenuROT = MENU_GROUP:New( self.PlayerGroup, "Reaction On Threat", self.FlightMenu )
  
    local FlightMenuROTNoReaction     = MENU_GROUP_COMMAND:New( self.PlayerGroup, "Fight until death",             FlightMenuROT, AI_ESCORT._FlightROTNoReaction,     self, "Fighting until death!" )
@@ -1317,7 +1335,7 @@ end

 function AI_ESCORT:SetEscortMenuROT( EscortGroup )

-  for _, MenuROT in pairs( self.Menu.ROT) do
+  for _, MenuROT in pairs( self.Menu.ROT or {}) do
    if EscortGroup:IsAir() then

      local EscortGroupName = EscortGroup:GetName()
@@ -1375,7 +1393,7 @@ function AI_ESCORT:SetEscortMenuResumeMission( EscortGroup )
 end


--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Wrapper.Group#GROUP OrbitGroup
 -- @param Wrapper.Group#GROUP EscortGroup
 -- @param #number OrbitHeight
@@ -1419,7 +1437,7 @@ function AI_ESCORT:_HoldPosition( OrbitGroup, EscortGroup, OrbitHeight, OrbitSec
 end


--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Wrapper.Group#GROUP OrbitGroup
 -- @param #number OrbitHeight
 -- @param #number OrbitSeconds
@@ -1428,7 +1446,7 @@ function AI_ESCORT:_FlightHoldPosition( OrbitGroup, OrbitHeight, OrbitSeconds )
  local EscortUnit = self.PlayerUnit

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup, OrbitGroup )
      if EscortGroup:IsAir() then
        if OrbitGroup == nil then
@@ -1456,7 +1474,7 @@ end
 function AI_ESCORT:_FlightJoinUp()

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if EscortGroup:IsAir() then
        self:_JoinUp( EscortGroup )
@@ -1483,7 +1501,7 @@ end
 function AI_ESCORT:_FlightFormationTrail( XStart, XSpace, YStart )

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if EscortGroup:IsAir() then
        self:_EscortFormationTrail( EscortGroup, XStart, XSpace, YStart )
@@ -1510,7 +1528,7 @@ end
 function AI_ESCORT:_FlightFormationStack( XStart, XSpace, YStart, YSpace )

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if EscortGroup:IsAir() then
        self:_EscortFormationStack( EscortGroup, XStart, XSpace, YStart, YSpace )
@@ -1533,7 +1551,7 @@ end
 function AI_ESCORT:_FlightFlare( Color, Message )

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if EscortGroup:IsAir() then
        self:_Flare( EscortGroup, Color, Message )
@@ -1556,7 +1574,7 @@ end
 function AI_ESCORT:_FlightSmoke( Color, Message )

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if EscortGroup:IsAir() then
        self:_Smoke( EscortGroup, Color, Message )
@@ -1587,7 +1605,7 @@ end
 function AI_ESCORT:_FlightSwitchReportNearbyTargets( ReportTargets )

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup )
      if EscortGroup:IsAir() then
        self:_EscortSwitchReportNearbyTargets( EscortGroup, ReportTargets )
@@ -1679,7 +1697,7 @@ function AI_ESCORT:_ScanTargets( ScanDuration )

 end

--- @param Wrapper.Group#GROUP EscortGroup
+-- @param Wrapper.Group#GROUP EscortGroup
 -- @param #AI_ESCORT self
 function AI_ESCORT.___Resume( EscortGroup, self )

@@ -1701,7 +1719,7 @@ function AI_ESCORT.___Resume( EscortGroup, self )
 end


--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Wrapper.Group#GROUP EscortGroup
 -- @param #number WayPoint
 function AI_ESCORT:_ResumeMission( EscortGroup, WayPoint )
@@ -1723,7 +1741,7 @@ function AI_ESCORT:_ResumeMission( EscortGroup, WayPoint )
 end


--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Wrapper.Group#GROUP EscortGroup The escort group that will attack the detected item.
 -- @param Functional.Detection#DETECTION_BASE.DetectedItem DetectedItem
 function AI_ESCORT:_AttackTarget( EscortGroup, DetectedItem )
@@ -1743,7 +1761,7 @@ function AI_ESCORT:_AttackTarget( EscortGroup, DetectedItem )
    local AttackUnitTasks = {}

    DetectedSet:ForEachUnit(
-      --- @param Wrapper.Unit#UNIT DetectedUnit
+      -- @param Wrapper.Unit#UNIT DetectedUnit
      function( DetectedUnit, Tasks )
        if DetectedUnit:IsAlive() then
          AttackUnitTasks[#AttackUnitTasks+1] = EscortGroup:TaskAttackUnit( DetectedUnit )
@@ -1767,7 +1785,7 @@ function AI_ESCORT:_AttackTarget( EscortGroup, DetectedItem )
    local Tasks = {}

    DetectedSet:ForEachUnit(
-      --- @param Wrapper.Unit#UNIT DetectedUnit
+      -- @param Wrapper.Unit#UNIT DetectedUnit
      function( DetectedUnit, Tasks )
        if DetectedUnit:IsAlive() then
          Tasks[#Tasks+1] = EscortGroup:TaskFireAtPoint( DetectedUnit:GetVec2(), 50 )
@@ -1795,7 +1813,7 @@ end
 function AI_ESCORT:_FlightAttackTarget( DetectedItem )

  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Core.Group#GROUP EscortGroup
+    -- @param Core.Group#GROUP EscortGroup
    function( EscortGroup, DetectedItem )
      if EscortGroup:IsAir() then
        self:_AttackTarget( EscortGroup, DetectedItem )
@@ -1842,7 +1860,7 @@ end


 --- 
--- @param #AI_ESCORT self
+-- @param #AI_ESCORT self
 -- @param Wrapper.Group#GROUP EscortGroup The escort group that will attack the detected item.
 -- @param Functional.Detection#DETECTION_BASE.DetectedItem DetectedItem
 function AI_ESCORT:_AssistTarget( EscortGroup, DetectedItem )
@@ -1854,7 +1872,7 @@ function AI_ESCORT:_AssistTarget( EscortGroup, DetectedItem )
  local Tasks = {}

  DetectedSet:ForEachUnit(
-    --- @param Wrapper.Unit#UNIT DetectedUnit
+    -- @param Wrapper.Unit#UNIT DetectedUnit
    function( DetectedUnit, Tasks )
      if DetectedUnit:IsAlive() then
        Tasks[#Tasks+1] = EscortGroup:TaskFireAtPoint( DetectedUnit:GetVec2(), 50 )
@@ -1881,7 +1899,7 @@ end

 function AI_ESCORT:_FlightROEHoldFire( EscortROEMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROE( EscortGroup, EscortGroup.OptionROEHoldFire, EscortROEMessage )
    end
@@ -1890,7 +1908,7 @@ end

 function AI_ESCORT:_FlightROEOpenFire( EscortROEMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROE( EscortGroup, EscortGroup.OptionROEOpenFire, EscortROEMessage )
    end
@@ -1899,7 +1917,7 @@ end

 function AI_ESCORT:_FlightROEReturnFire( EscortROEMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROE( EscortGroup, EscortGroup.OptionROEReturnFire, EscortROEMessage )
    end
@@ -1908,7 +1926,7 @@ end

 function AI_ESCORT:_FlightROEWeaponFree( EscortROEMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROE( EscortGroup, EscortGroup.OptionROEWeaponFree, EscortROEMessage )
    end
@@ -1924,7 +1942,7 @@ end

 function AI_ESCORT:_FlightROTNoReaction( EscortROTMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROT( EscortGroup, EscortGroup.OptionROTNoReaction, EscortROTMessage )
    end
@@ -1933,7 +1951,7 @@ end

 function AI_ESCORT:_FlightROTPassiveDefense( EscortROTMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROT( EscortGroup, EscortGroup.OptionROTPassiveDefense, EscortROTMessage )
    end
@@ -1942,7 +1960,7 @@ end

 function AI_ESCORT:_FlightROTEvadeFire( EscortROTMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROT( EscortGroup, EscortGroup.OptionROTEvadeFire, EscortROTMessage )
    end
@@ -1951,7 +1969,7 @@ end

 function AI_ESCORT:_FlightROTVertical( EscortROTMessage )
  self.EscortGroupSet:ForEachGroupAlive(
-    --- @param Wrapper.Group#GROUP EscortGroup
+    -- @param Wrapper.Group#GROUP EscortGroup
    function( EscortGroup )
      self:_ROT( EscortGroup, EscortGroup.OptionROTVertical, EscortROTMessage )
    end
@@ -2178,5 +2196,3 @@ function AI_ESCORT:_FlightReportTargetsScheduler()
  
  return false
 end
-
-
--- a/Development/Moose/AI/AI_Escort_Dispatcher.lua
+++ b/Development/Moose/AI/AI_Escort_Dispatcher.lua
@@ -20,7 +20,12 @@


 --- Models the automatic assignment of AI escorts to player flights.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --   
 -- @field #AI_ESCORT_DISPATCHER
--- a/Development/Moose/AI/AI_Escort_Dispatcher_Request.lua
+++ b/Development/Moose/AI/AI_Escort_Dispatcher_Request.lua
@@ -20,7 +20,12 @@


 --- Models the assignment of AI escorts to player flights upon request using the radio menu.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --   
 -- @field #AI_ESCORT_DISPATCHER_REQUEST
--- a/Development/Moose/AI/AI_Escort_Request.lua
+++ b/Development/Moose/AI/AI_Escort_Request.lua
@@ -136,7 +136,12 @@
 -- 
 -- Escort groups can have their own mission. This menu item will allow the escort group to resume their Mission from a given waypoint.
 -- Note that this is really fantastic, as you now have the dynamic of taking control of the escort groups, and allowing them to resume their path or mission.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- ### Authors: **FlightControl** 
--- a/Development/Moose/AI/AI_Formation.lua
+++ b/Development/Moose/AI/AI_Formation.lua
@@ -92,7 +92,12 @@
 -- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" )
 -- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 )
 -- LargeFormation:__Start( 1 )
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- @field #AI_FORMATION 
 AI_FORMATION = {
  ClassName = "AI_FORMATION",
--- a/Development/Moose/AI/AI_Patrol.lua
+++ b/Development/Moose/AI/AI_Patrol.lua
@@ -144,7 +144,12 @@
 -- When the AI is damaged, it is required that a new AIControllable is started. However, damage cannon be foreseen early on. 
 -- Therefore, when the damage threshold is reached, the AI will return immediately to the home base (RTB).
 -- Use the method @{#AI_PATROL_ZONE.ManageDamage}() to have this process in place.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- @field #AI_PATROL_ZONE
--- a/Development/Moose/Actions/Act_Account.lua
+++ b/Development/Moose/Actions/Act_Account.lua
@@ -54,6 +54,11 @@ do -- ACT_ACCOUNT
  --     The state transition method needs to start with the name **OnAfter + the name of the state**.
  --     These state transition methods need to provide a return value, which is specified at the function description.
  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
  -- @type ACT_ACCOUNT
  -- @field Core.Set#SET_UNIT TargetSetUnit
  -- @extends Core.Fsm#FSM_PROCESS
--- a/Development/Moose/Actions/Act_Assign.lua
+++ b/Development/Moose/Actions/Act_Assign.lua
@@ -51,7 +51,12 @@
 --   * **After** the state transition.
 --     The state transition method needs to start with the name **OnAfter + the name of the state**.
 --     These state transition methods need to provide a return value, which is specified at the function description.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --
 -- # 1) @{#ACT_ASSIGN_ACCEPT} class, extends @{Core.Fsm.Assign#ACT_ASSIGN}
--- a/Development/Moose/Actions/Act_Assist.lua
+++ b/Development/Moose/Actions/Act_Assist.lua
@@ -57,7 +57,12 @@
 -- # 1.1) ACT_ASSIST_SMOKE_TARGETS_ZONE constructor:
 --
 --   * @{#ACT_ASSIST_SMOKE_TARGETS_ZONE.New}(): Creates a new ACT_ASSIST_SMOKE_TARGETS_ZONE object.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --
 -- @module Actions.Act_Assist
--- a/Development/Moose/Actions/Act_Route.lua
+++ b/Development/Moose/Actions/Act_Route.lua
@@ -69,7 +69,12 @@
 -- # 1.1) ACT_ROUTE_ZONE constructor:
 --
 --   * @{#ACT_ROUTE_ZONE.New}(): Creates a new ACT_ROUTE_ZONE object.
--
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 --
 -- @module Actions.Act_Route
--- a/Development/Moose/Cargo/Cargo.lua
+++ b/Development/Moose/Cargo/Cargo.lua
@@ -233,7 +233,12 @@
 --      Note that this option is optional, so can be omitted. The default value of the RR is 250 meters.
 --    * **NR=** Provide the maximum range in meters when the cargo units will be boarded within the carrier during boarding.
 --      Note that this option is optional, so can be omitted. The default value of the RR is 10 meters.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- ### Author: **FlightControl**
--- a/Development/Moose/Cargo/CargoCrate.lua
+++ b/Development/Moose/Cargo/CargoCrate.lua
@@ -36,7 +36,12 @@ do -- CARGO_CRATE
  -- 
  --   * @{Tasking.Task_Cargo_Transport#TASK_CARGO_TRANSPORT} to transport cargo by human players.
  --   * @{Tasking.Task_Cargo_Transport#TASK_CARGO_CSAR} to transport downed pilots by human players.
+  --
+  -- # Developer Note
  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
  -- ===
  -- 
  -- @field #CARGO_CRATE
--- a/Development/Moose/Cargo/CargoGroup.lua
+++ b/Development/Moose/Cargo/CargoGroup.lua
@@ -38,7 +38,12 @@ do -- CARGO_GROUP
  -- 
  --   * @{Tasking.Task_Cargo_Transport#TASK_CARGO_TRANSPORT} to transport cargo by human players.
  --   * @{Tasking.Task_Cargo_Transport#TASK_CARGO_CSAR} to transport downed pilots by human players.
+  --
+  -- # Developer Note
  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
  -- @field #CARGO_GROUP CARGO_GROUP
  -- 
  CARGO_GROUP = {
--- a/Development/Moose/Cargo/CargoSlingload.lua
+++ b/Development/Moose/Cargo/CargoSlingload.lua
@@ -29,7 +29,12 @@ do -- CARGO_SLINGLOAD
  -- 
  --   * @{Tasking.Task_Cargo_Transport#TASK_CARGO_TRANSPORT} to transport cargo by human players.
  --   * @{Tasking.Task_Cargo_Transport#TASK_CARGO_CSAR} to transport downed pilots by human players.
+  --
+  -- # Developer Note
  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
  -- ===
  -- 
  -- @field #CARGO_SLINGLOAD
--- a/Development/Moose/Cargo/CargoUnit.lua
+++ b/Development/Moose/Cargo/CargoUnit.lua
@@ -27,7 +27,12 @@ do -- CARGO_UNIT
  -- Note that ground forces behave in a group, and thus, act in formation, regardless if one unit is commanded to move.
  -- 
  -- This class is used in CARGO_GROUP, and is not meant to be used by mission designers individually.
+  --
+  -- # Developer Note
  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
  -- ===
  -- 
  -- @field #CARGO_UNIT CARGO_UNIT
--- a/Development/Moose/Core/Base.lua
+++ b/Development/Moose/Core/Base.lua
@@ -34,7 +34,8 @@ local _TraceClassMethod = {}

 local _ClassID = 0

--- @type BASE
+---
+-- @type BASE
 -- @field ClassName The name of the class.
 -- @field ClassID The ID number of the class.
 -- @field ClassNameAndID The name of the class concatenated with the ID number of the class.
@@ -201,10 +202,10 @@ BASE = {
  Scheduler = nil,
 }

--- @field #BASE.__
+-- @field #BASE.__
 BASE.__ = {}

--- @field #BASE._
+-- @field #BASE._
 BASE._ = {
  Schedules = {}, --- Contains the Schedulers Active
 }
@@ -229,7 +230,7 @@ FORMATION = {
 -- @param #BASE self
 -- @return #BASE
 function BASE:New()
-  --local self = routines.utils.deepCopy( self ) -- Create a new self instance
+  --local self = UTILS.DeepCopy( self ) -- Create a new self instance
  local self = UTILS.DeepCopy(self)

  _ClassID = _ClassID + 1
@@ -252,7 +253,7 @@ end
 function BASE:Inherit( Child, Parent )

  -- Create child.
-  local Child = routines.utils.deepCopy( Child )
+  local Child = UTILS.DeepCopy( Child )

  if Child ~= nil then

@@ -1167,7 +1168,7 @@ function BASE:_F( Arguments, DebugInfoCurrentParam, DebugInfoFromParam )
      if DebugInfoFrom then
        LineFrom = DebugInfoFrom.currentline
      end
-      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "F", self.ClassName, self.ClassID, Function, routines.utils.oneLineSerialize( Arguments ) ) )
+      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "F", self.ClassName, self.ClassID, Function, UTILS.BasicSerialize( Arguments ) ) )
    end
  end
 end
@@ -1241,7 +1242,7 @@ function BASE:_T( Arguments, DebugInfoCurrentParam, DebugInfoFromParam )
      if DebugInfoFrom then
        LineFrom = DebugInfoFrom.currentline
      end
-      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s", LineCurrent, LineFrom, "T", self.ClassName, self.ClassID, routines.utils.oneLineSerialize( Arguments ) ) )
+      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s", LineCurrent, LineFrom, "T", self.ClassName, self.ClassID, UTILS.BasicSerialize( Arguments ) ) )
    end
  end
 end
@@ -1311,9 +1312,9 @@ function BASE:E( Arguments )
      LineFrom = DebugInfoFrom.currentline
    end

-    env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "E", self.ClassName, self.ClassID, Function, routines.utils.oneLineSerialize( Arguments ) ) )
+    env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "E", self.ClassName, self.ClassID, Function, UTILS.BasicSerialize( Arguments ) ) )
  else
-    env.info( string.format( "%1s:%30s%05d(%s)", "E", self.ClassName, self.ClassID, routines.utils.oneLineSerialize( Arguments ) ) )
+    env.info( string.format( "%1s:%30s%05d(%s)", "E", self.ClassName, self.ClassID, UTILS.BasicSerialize( Arguments ) ) )
  end

 end
@@ -1338,9 +1339,9 @@ function BASE:I( Arguments )
      LineFrom = DebugInfoFrom.currentline
    end

-    env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "I", self.ClassName, self.ClassID, Function, routines.utils.oneLineSerialize( Arguments ) ) )
+    env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "I", self.ClassName, self.ClassID, Function, UTILS.BasicSerialize( Arguments ) ) )
  else
-    env.info( string.format( "%1s:%30s%05d(%s)", "I", self.ClassName, self.ClassID, routines.utils.oneLineSerialize( Arguments ) ) )
+    env.info( string.format( "%1s:%30s%05d(%s)", "I", self.ClassName, self.ClassID, UTILS.BasicSerialize( Arguments ) ) )
  end

 end
--- a/Development/Moose/Core/ClientMenu.lua
+++ b/Development/Moose/Core/ClientMenu.lua
@@ -0,0 +1,795 @@
+--- **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: Sept 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 #string groupname Group 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.1",
+  name = nil,
+  path = nil,
+  group = nil,
+  client = nil,
+  GroupID = nil,
+  Children = {},
+  Once = false,
+  Generic = false,
+  debug = false,
+  Controller = nil,
+  groupname = 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()
+    self.groupname = self.group:GetName() or "Unknown Groupname"
+  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,";"))
+    local function RemoveFunction()
+      return missionCommands.removeItemForGroup(self.GroupID , self.path )
+    end
+    local status, err = pcall(RemoveFunction)
+    if not status then
+      self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname))
+    end
+  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.1",
+  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,1,true) and string.find(Entry.UUID,Parent.UUID,1,true) then
+        table.insert(matches,_uuid)
+        table.insert(entries,Entry )
+        n=n+1
+      end
+    else
+      if Entry and string.find(Entry.name,Text,1,true) 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,1,true) 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. 
+-- @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,1,true) 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,1,true) 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
+--
+----------------------------------------------------------------------------------------------------------------
+
--- a/Development/Moose/Core/Database.lua
+++ b/Development/Moose/Core/Database.lua
@@ -31,11 +31,12 @@
 -- @module Core.Database
 -- @image Core_Database.JPG

-
--- @type DATABASE
+---
+-- @type DATABASE
 -- @field #string ClassName Name of the class.
 -- @field #table Templates Templates: Units, Groups, Statics, ClientsByName, ClientsByID.
 -- @field #table CLIENTS Clients.
+-- @field #table STORAGES DCS warehouse storages.
 -- @extends Core.Base#BASE

 --- Contains collections of wrapper objects defined within MOOSE that reflect objects within the simulator.
@@ -50,6 +51,7 @@
 --  * PLAYERSJOINED
 --  * PLAYERS
 --  * CARGOS
+--  * STORAGES (DCS warehouses)
 --
 -- On top, for internal MOOSE administration purposes, the DATABASE administers the Unit and Group TEMPLATES as defined within the Mission Editor.
 --
@@ -90,6 +92,7 @@ DATABASE = {
  FLIGHTCONTROLS = {},
  OPSZONES = {},
  PATHLINES = {},
+  STORAGES = {},
 }

 local _DATABASECoalition =
@@ -246,6 +249,38 @@ function DATABASE:FindAirbase( AirbaseName )
 end


+
+--- Adds a STORAGE (DCS warehouse wrapper) based on the Airbase Name to the DATABASE.
+-- @param #DATABASE self
+-- @param #string AirbaseName The name of the airbase.
+-- @return Wrapper.Storage#STORAGE Storage object.
+function DATABASE:AddStorage( AirbaseName )
+
+  if not self.STORAGES[AirbaseName] then
+    self.STORAGES[AirbaseName] = STORAGE:New( AirbaseName )
+  end
+
+  return self.STORAGES[AirbaseName]
+end
+
+
+--- Deletes a STORAGE from the DATABASE based on the name of the associated airbase.
+-- @param #DATABASE self
+-- @param #string AirbaseName The name of the airbase.
+function DATABASE:DeleteStorage( AirbaseName )
+  self.STORAGES[AirbaseName] = nil
+end
+
+
+--- Finds an STORAGE based on the name of the associated airbase.
+-- @param #DATABASE self
+-- @param #string AirbaseName Name of the airbase.
+-- @return Wrapper.Storage#STORAGE The found STORAGE.
+function DATABASE:FindStorage( AirbaseName )
+  local storage = self.STORAGES[AirbaseName]
+  return storage
+end
+
 do -- Zones and Pathlines

  --- Finds a @{Core.Zone} based on the zone name.
@@ -1124,7 +1159,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


@@ -1333,7 +1368,7 @@ function DATABASE:_EventOnBirth( Event )
      if PlayerName then

        -- Debug info.
-        self:I(string.format("Player '%s' joint unit '%s' of group '%s'", tostring(PlayerName), tostring(Event.IniDCSUnitName), tostring(Event.IniDCSGroupName)))
+        self:I(string.format("Player '%s' joined unit '%s' of group '%s'", tostring(PlayerName), tostring(Event.IniDCSUnitName), tostring(Event.IniDCSGroupName)))

        -- Add client in case it does not exist already.
        if not client then
@@ -1813,13 +1848,13 @@ function DATABASE:GetFlightControl(airbasename)
  return self.FLIGHTCONTROLS[airbasename]
 end

--- @param #DATABASE self
+-- @param #DATABASE self
 function DATABASE:_RegisterTemplates()
  self:F2()

  self.Navpoints = {}
  self.UNITS = {}
-  --Build routines.db.units and self.Navpoints
+  --Build self.Navpoints
  for CoalitionName, coa_data in pairs(env.mission.coalition) do
    self:T({CoalitionName=CoalitionName})

@@ -1841,7 +1876,7 @@ function DATABASE:_RegisterTemplates()
        for nav_ind, nav_data in pairs(coa_data.nav_points) do

          if type(nav_data) == 'table' then
-            self.Navpoints[CoalitionName][nav_ind] = routines.utils.deepCopy(nav_data)
+            self.Navpoints[CoalitionName][nav_ind] = UTILS.DeepCopy(nav_data)

            self.Navpoints[CoalitionName][nav_ind]['name'] = nav_data.callsignStr  -- name is a little bit more self-explanatory.
            self.Navpoints[CoalitionName][nav_ind]['point'] = {}  -- point is used by SSE, support it.
--- a/Development/Moose/Core/Message.lua
+++ b/Development/Moose/Core/Message.lua
@@ -52,7 +52,7 @@
 -- ===
 --
 -- ### Author: **FlightControl**
-- ### Contributions:
+-- ### Contributions: **Applevangelist**
 --
 -- ===
 --
@@ -371,7 +371,9 @@ function MESSAGE:ToCoalition( CoalitionSide, Settings )
      trigger.action.outTextForCoalition( CoalitionSide, self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
    end
  end
-
+  
+  self.CoalitionSide = CoalitionSide
+  
  return self
 end

@@ -454,3 +456,138 @@ function MESSAGE:ToLogIf( Condition )
  end
  return self
 end
+
+_MESSAGESRS = {}
+
+--- Set up MESSAGE generally to allow Text-To-Speech via SRS and TTS functions.
+-- @param #string PathToSRS Path to SRS Folder, defaults to "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone".
+-- @param #number Port Port number of SRS, defaults to 5002.
+-- @param #string PathToCredentials (optional) Path to credentials file for e.g. Google.
+-- @param #number Frequency Frequency in MHz. Can also be given as a #table of frequencies.
+-- @param #number Modulation Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations.
+-- @param #string Gender (optional) Gender, i.e. "male" or "female", defaults to "male".
+-- @param #string Culture (optional) Culture, e.g. "en-US", defaults to "en-GB"
+-- @param #string Voice (optional) Voice. Will override gender and culture settings, e.g. MSRS.Voices.Microsoft.Hazel or MSRS.Voices.Google.Standard.de_DE_Standard_D. Hint on Microsoft voices - working voices are limited to Hedda, Hazel, David, Zira and Hortense. **Must** be installed on your Desktop or Server!
+-- @param #number Coalition (optional) Coalition, can be coalition.side.RED, coalition.side.BLUE or coalition.side.NEUTRAL. Defaults to coalition.side.NEUTRAL.
+-- @param #number Volume (optional) Volume, can be between 0.0 and 1.0 (loudest).
+-- @param #string Label (optional) Label, defaults to "MESSAGE" or the Message Category set.
+-- @param Core.Point#COORDINATE Coordinate (optional) Coordinate this messages originates from.
+-- @usage
+--          -- Mind the dot here, not using the colon this time around!
+--          -- Needed once only
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
+--          -- later on in your code
+--          MESSAGE:New("Test message!",15,"SPAWN"):ToSRS()
+--          
+function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate)
+  _MESSAGESRS.MSRS = MSRS:New(PathToSRS,Frequency,Modulation,Volume)
+  _MESSAGESRS.MSRS:SetCoalition(Coalition)
+  _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
+  _MESSAGESRS.MSRS:SetCulture(Culture)
+  _MESSAGESRS.Culture = Culture
+  --_MESSAGESRS.MSRS:SetFrequencies(Frequency)
+  _MESSAGESRS.MSRS:SetGender(Gender)
+  _MESSAGESRS.Gender = Gender
+  _MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
+  _MESSAGESRS.MSRS:SetLabel(Label or "MESSAGE")
+  --_MESSAGESRS.MSRS:SetModulations(Modulation)
+  --_MESSAGESRS.MSRS:SetPath(PathToSRS)
+  _MESSAGESRS.MSRS:SetPort(Port)
+ -- _MESSAGESRS.MSRS:SetVolume(Volume)
+  _MESSAGESRS.MSRS:SetVoice(Voice)
+  _MESSAGESRS.Voice = Voice
+  _MESSAGESRS.SRSQ = MSRSQUEUE:New(Label or "MESSAGE")
+  env.info(_MESSAGESRS.MSRS.provider,false)
+end
+
+--- Sends a message via SRS.
+-- @param #MESSAGE self
+-- @param #number frequency (optional) Frequency in MHz. Can also be given as a #table of frequencies. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #number modulation (optional) Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #string gender (optional) Gender, i.e. "male" or "female". Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string culture (optional) Culture, e.g. "en-US. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string voice (optional) Voice. Will override gender and culture settings. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #number coalition (optional) Coalition, can be coalition.side.RED, coalition.side.BLUE or coalition.side.NEUTRAL. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #number volume (optional) Volume, can be between 0.0 and 1.0 (loudest). Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param Core.Point#COORDINATE coordinate (optional) Coordinate this messages originates from. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @return #MESSAGE self
+-- @usage
+--          -- Mind the dot here, not using the colon this time around!
+--          -- Needed once only
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
+--          -- later on in your code
+--          MESSAGE:New("Test message!",15,"SPAWN"):ToSRS()
+--          
+function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volume,coordinate)
+  if _MESSAGESRS.SRSQ then
+      _MESSAGESRS.MSRS:SetVoice(voice or _MESSAGESRS.Voice)
+      _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency,modulation,gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,voice or _MESSAGESRS.Voice,volume,self.MessageCategory)
+  end
+  return self
+end
+
+--- Sends a message via SRS on the blue coalition side.
+-- @param #MESSAGE self
+-- @param #number frequency (optional) Frequency in MHz. Can also be given as a #table of frequencies. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #number modulation (optional) Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #string gender (optional) Gender, i.e. "male" or "female". Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string culture (optional) Culture, e.g. "en-US. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string voice (optional) Voice. Will override gender and culture settings. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #number volume (optional) Volume, can be between 0.0 and 1.0 (loudest). Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param Core.Point#COORDINATE coordinate (optional) Coordinate this messages originates from. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @return #MESSAGE self
+-- @usage
+--          -- Mind the dot here, not using the colon this time around!
+--          -- Needed once only
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
+--          -- later on in your code
+--          MESSAGE:New("Test message!",15,"SPAWN"):ToSRSBlue()
+--          
+function MESSAGE:ToSRSBlue(frequency,modulation,gender,culture,voice,volume,coordinate)
+  self:ToSRS(frequency,modulation,gender,culture,voice,coalition.side.BLUE,volume,coordinate)
+  return self
+end
+
+--- Sends a message via SRS on the red coalition side.
+-- @param #MESSAGE self
+-- @param #number frequency (optional) Frequency in MHz. Can also be given as a #table of frequencies. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #number modulation (optional) Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #string gender (optional) Gender, i.e. "male" or "female". Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string culture (optional) Culture, e.g. "en-US. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string voice (optional) Voice. Will override gender and culture settings. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #number volume (optional) Volume, can be between 0.0 and 1.0 (loudest). Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param Core.Point#COORDINATE coordinate (optional) Coordinate this messages originates from. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @return #MESSAGE self
+-- @usage
+--          -- Mind the dot here, not using the colon this time around!
+--          -- Needed once only
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.RED)
+--          -- later on in your code
+--          MESSAGE:New("Test message!",15,"SPAWN"):ToSRSRed()
+--          
+function MESSAGE:ToSRSRed(frequency,modulation,gender,culture,voice,volume,coordinate)
+  self:ToSRS(frequency,modulation,gender,culture,voice,coalition.side.RED,volume,coordinate)
+  return self
+end
+
+--- Sends a message via SRS to all - via the neutral coalition side.
+-- @param #MESSAGE self
+-- @param #number frequency (optional) Frequency in MHz. Can also be given as a #table of frequencies. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #number modulation (optional) Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
+-- @param #string gender (optional) Gender, i.e. "male" or "female". Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string culture (optional) Culture, e.g. "en-US. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #string voice (optional) Voice. Will override gender and culture settings. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param #number volume (optional) Volume, can be between 0.0 and 1.0 (loudest). Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @param Core.Point#COORDINATE coordinate (optional) Coordinate this messages originates from. Only needed if you want to change defaults set with `MESSAGE.SetMSRS()`.
+-- @return #MESSAGE self
+-- @usage
+--          -- Mind the dot here, not using the colon this time around!
+--          -- Needed once only
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.NEUTRAL)
+--          -- later on in your code
+--          MESSAGE:New("Test message!",15,"SPAWN"):ToSRSAll()
+--          
+function MESSAGE:ToSRSAll(frequency,modulation,gender,culture,voice,volume,coordinate)
+  self:ToSRS(frequency,modulation,gender,culture,voice,coalition.side.NEUTRAL,volume,coordinate)
+  return self
+end
--- a/Development/Moose/Core/Point.lua
+++ b/Development/Moose/Core/Point.lua
@@ -2389,7 +2389,6 @@ do -- COORDINATE
    end

    --- Creates a free form shape on the F10 map. The first point is the current COORDINATE. The remaining points need to be specified.
-    -- **NOTE**: A free form polygon must have **at least three points** in total and currently only **up to 15 points** in total are supported.
    -- @param #COORDINATE self
    -- @param #table Coordinates Table of coordinates of the remaining points of the shape.
    -- @param #number Coalition Coalition: All=-1, Neutral=0, Red=1, Blue=2. Default -1=All.
@@ -2463,9 +2462,30 @@ do -- COORDINATE
                                                         vecs[11], vecs[12], vecs[13], vecs[14], vecs[15],
                                                         Color, FillColor, LineType, ReadOnly, Text or "")
      else
-        self:E("ERROR: Currently a free form polygon can only have 15 points in total!")
+        
        -- Unfortunately, unpack(vecs) does not work! So no idea how to generalize this :(
-        trigger.action.markupToAll(7, Coalition, MarkID, unpack(vecs), Color, FillColor, LineType, ReadOnly, Text or "")
+        --trigger.action.markupToAll(7, Coalition, MarkID, unpack(vecs), Color, FillColor, LineType, ReadOnly, Text or "")
+        
+        -- Write command as string and execute that. Idea by Grimes https://forum.dcs.world/topic/324201-mark-to-all-function/#comment-5273793
+        local s=string.format("trigger.action.markupToAll(7, %d, %d,", Coalition, MarkID)
+        for _,vec in pairs(vecs) do
+          s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
+        end
+        s=s..string.format("%s, %s, %s, %s", UTILS._OneLineSerialize(Color), UTILS._OneLineSerialize(FillColor), tostring(LineType), tostring(ReadOnly))
+        if Text and Text~="" then
+          s=s..string.format(", \"%s\"", Text)
+        end
+        s=s..")"
+        
+        
+        -- Execute string command
+        local success=UTILS.DoString(s)
+                
+        if not success then
+          self:E("ERROR: Could not draw polygon")
+          env.info(s)
+        end
+        
      end

      return MarkID
@@ -2944,8 +2964,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
--- a/Development/Moose/Core/Scheduler.lua
+++ b/Development/Moose/Core/Scheduler.lua
@@ -208,7 +208,7 @@ SCHEDULER = {
 -- @param #number RandomizeFactor Specifies a randomization factor between 0 and 1 to randomize the Repeat.
 -- @param #number Stop Specifies the amount of seconds when the scheduler will be stopped.
 -- @return #SCHEDULER self.
-- @return #table The ScheduleID of the planned schedule.
+-- @return #string The ScheduleID of the planned schedule.
 function SCHEDULER:New( MasterObject, SchedulerFunction, SchedulerArguments, Start, Repeat, RandomizeFactor, Stop )

  local self = BASE:Inherit( self, BASE:New() ) -- #SCHEDULER
--- a/Development/Moose/Core/Set.lua
+++ b/Development/Moose/Core/Set.lua
@@ -35,6 +35,13 @@
 --   * Validate the presence of objects in the SET.
 --   * Trigger events when objects in the SET change a zone presence.
 --
+-- ## Notes on `FilterPrefixes()`:  
+-- 
+-- This filter always looks for a **partial match** somewhere in the given field. LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+-- Have a read through the following to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching).  
+-- For example, setting a filter like so `FilterPrefixes("Huey")` is perfectly all right, whilst `FilterPrefixes("UH-1H Al-Assad")` might not be due to the minus signs. A quick fix here is to use a dot (.) 
+-- in place of the special character, or escape it with a percentage sign (%), i.e. either `FilterPrefixes("UH.1H Al.Assad")` or `FilterPrefixes("UH%-1H Al%-Assad")` will give you the expected results.
+--
 -- ===
 --
 -- ### Author: **FlightControl**
@@ -46,8 +53,9 @@
 -- @image Core_Sets.JPG

 do -- SET_BASE
-
-  --- @type SET_BASE
+  
+  ---
+  -- @type SET_BASE
  -- @field #table Filter Table of filters.
  -- @field #table Set Table of objects.
  -- @field #table Index Table of indices.
@@ -242,7 +250,7 @@ do -- SET_BASE
  function SET_BASE:Add( ObjectName, Object )
  
    -- Debug info.
-    self:T( { ObjectName = ObjectName, Object = Object } )
+    self:T2( { ObjectName = ObjectName, Object = Object } )

    -- Ensure that the existing element is removed from the Set before a new one is inserted to the Set
    if self.Set[ObjectName] then
@@ -257,6 +265,8 @@ do -- SET_BASE

    -- Trigger Added event.
    self:Added( ObjectName, Object )
+    
+    return self
  end

  --- Adds a @{Core.Base#BASE} object in the @{Core.Set#SET_BASE}, using the Object Name as the index.
@@ -429,7 +439,7 @@ do -- SET_BASE
  function SET_BASE:SetDatabase( BaseSet )

    -- Copy the filter criteria of the BaseSet
-    local OtherFilter = routines.utils.deepCopy( BaseSet.Filter )
+    local OtherFilter = UTILS.DeepCopy( BaseSet.Filter )
    self.Filter = OtherFilter

    -- Now base the new Set on the BaseSet
@@ -578,8 +588,8 @@ do -- SET_BASE
  end

  ----- Private method that registers all alive players in the mission.
-  ---- @param #SET_BASE self
-  ---- @return #SET_BASE self
+  -- @param #SET_BASE self
+  -- @return #SET_BASE self
  -- function SET_BASE:_RegisterPlayers()
  --
  --  local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) }
@@ -796,8 +806,8 @@ do -- SET_BASE


  ----- Iterate the SET_BASE and call an iterator function for each **alive** unit, providing the Unit and optional parameters.
-  ---- @param #SET_BASE self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive unit in the SET_BASE. The function needs to accept a UNIT parameter.
+  -- @param #SET_BASE self
+  -- @param #function IteratorFunction The function that will be called when there is an alive unit in the SET_BASE. The function needs to accept a UNIT parameter.
  ---- @return #SET_BASE self
  -- function SET_BASE:ForEachDCSUnitAlive( IteratorFunction, ... )
  --  self:F3( arg )
@@ -808,8 +818,8 @@ do -- SET_BASE
  -- end
  --
  ----- Iterate the SET_BASE and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
-  ---- @param #SET_BASE self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a UNIT parameter.
+  -- @param #SET_BASE self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a UNIT parameter.
  ---- @return #SET_BASE self
  -- function SET_BASE:ForEachPlayer( IteratorFunction, ... )
  --  self:F3( arg )
@@ -821,8 +831,8 @@ do -- SET_BASE
  --
  --
  ----- Iterate the SET_BASE and call an iterator function for each client, providing the Client to the function and optional parameters.
-  ---- @param #SET_BASE self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a CLIENT parameter.
+  -- @param #SET_BASE self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a CLIENT parameter.
  ---- @return #SET_BASE self
  -- function SET_BASE:ForEachClient( IteratorFunction, ... )
  --  self:F3( arg )
@@ -850,8 +860,10 @@ do -- SET_BASE
    self:F3( Object )
    local outcome = false
    local name = Object:GetName()
+    --self:I("SET_BASE: Objectname = "..name)
    self:ForEach(
      function(object)
+        --self:I("SET_BASE: In set objectname = "..object:GetName())
        if object:GetName() == name then
          outcome = true
        end
@@ -901,9 +913,12 @@ do -- SET_BASE

 end

-do -- SET_GROUP
+do 

-  --- @type SET_GROUP #SET_GROUP
+  -- SET_GROUP
+  
+  ---
+  -- @type SET_GROUP #SET_GROUP
  -- @field Core.Timer#TIMER ZoneTimer
  -- @field #number ZoneTimerInterval
  -- @extends Core.Set#SET_BASE
@@ -934,7 +949,8 @@ do -- SET_GROUP
  --    * @{#SET_GROUP.FilterCoalitions}: Builds the SET_GROUP with the groups belonging to the coalition(s).
  --    * @{#SET_GROUP.FilterCategories}: Builds the SET_GROUP with the groups belonging to the category(ies).
  --    * @{#SET_GROUP.FilterCountries}: Builds the SET_GROUP with the groups belonging to the country(ies).
-  --    * @{#SET_GROUP.FilterPrefixes}: Builds the SET_GROUP with the groups *containing* the given string in the group name. **Attention!** Bad naming convention, as this not really filtering *prefixes*.
+  --    * @{#SET_GROUP.FilterPrefixes}: Builds the SET_GROUP with the groups *containing* the given string in the group name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --    * @{#SET_GROUP.FilterActive}: Builds the SET_GROUP with the groups that are only active. Groups that are inactive (late activation) won't be included in the set!
  --
  -- For the Category Filter, extra methods have been added:
@@ -1568,7 +1584,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsCompletelyInZone( ZoneObject ) then
@@ -1590,7 +1606,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsPartlyInZone( ZoneObject ) then
@@ -1612,7 +1628,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsNotInZone( ZoneObject ) then
@@ -1659,7 +1675,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsAnyInZone( ZoneObject ) then
@@ -1857,8 +1873,8 @@ do -- SET_GROUP
  end

  ----- Iterate the SET_GROUP and call an iterator function for each **alive** player, providing the Group of the player and optional parameters.
-  ---- @param #SET_GROUP self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a GROUP parameter.
+  -- @param #SET_GROUP self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a GROUP parameter.
  ---- @return #SET_GROUP self
  -- function SET_GROUP:ForEachPlayer( IteratorFunction, ... )
  --  self:F2( arg )
@@ -1870,8 +1886,8 @@ do -- SET_GROUP
  --
  --
  ----- Iterate the SET_GROUP and call an iterator function for each client, providing the Client to the function and optional parameters.
-  ---- @param #SET_GROUP self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a CLIENT parameter.
+  -- @param #SET_GROUP self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a CLIENT parameter.
  ---- @return #SET_GROUP self
  -- function SET_GROUP:ForEachClient( IteratorFunction, ... )
  --  self:F2( arg )
@@ -1945,7 +1961,7 @@ do -- SET_GROUP
    if self.Filter.Zones then
      local MGroupZone = false
      for ZoneName, Zone in pairs( self.Filter.Zones ) do
-        --self:I( "Zone:", ZoneName )
+        --self:T( "Zone:", ZoneName )
        if MGroup:IsInZone(Zone) then
          MGroupZone = true
        end
@@ -2011,8 +2027,9 @@ do -- SET_GROUP
 end

 do -- SET_UNIT
-
-  --- @type SET_UNIT
+  
+  ---
+  -- @type SET_UNIT
  -- @field Core.Timer#TIMER ZoneTimer
  -- @field #number ZoneTimerInterval
  -- @extends Core.Set#SET_BASE
@@ -2045,7 +2062,8 @@ do -- SET_UNIT
  --    * @{#SET_UNIT.FilterCategories}: Builds the SET_UNIT with the units belonging to the category(ies).
  --    * @{#SET_UNIT.FilterTypes}: Builds the SET_UNIT with the units belonging to the unit type(s).
  --    * @{#SET_UNIT.FilterCountries}: Builds the SET_UNIT with the units belonging to the country(ies).
-  --    * @{#SET_UNIT.FilterPrefixes}: Builds the SET_UNIT with the units sharing the same string(s) in their name. **ATTENTION!** Bad naming convention as this *does not* only filter *prefixes*.
+  --    * @{#SET_UNIT.FilterPrefixes}: Builds the SET_UNIT with the units sharing the same string(s) in their name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --    * @{#SET_UNIT.FilterActive}: Builds the SET_UNIT with the units that are only active. Units that are inactive (late activation) won't be included in the set!
  --    * @{#SET_UNIT.FilterZones}: Builds the SET_UNIT with the units within a @{Core.Zone#ZONE}.
  --    
@@ -2672,7 +2690,7 @@ do -- SET_UNIT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Unit#UNIT UnitObject
      function( ZoneObject, UnitObject )
        if UnitObject:IsInZone( ZoneObject ) then
@@ -2694,7 +2712,7 @@ do -- SET_UNIT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Unit#UNIT UnitObject
      function( ZoneObject, UnitObject )
        if UnitObject:IsNotInZone( ZoneObject ) then
@@ -3011,8 +3029,8 @@ do -- SET_UNIT


  ----- Iterate the SET_UNIT and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
-  ---- @param #SET_UNIT self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a UNIT parameter.
+  -- @param #SET_UNIT self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a UNIT parameter.
  ---- @return #SET_UNIT self
  -- function SET_UNIT:ForEachPlayer( IteratorFunction, ... )
  --  self:F2( arg )
@@ -3024,8 +3042,8 @@ do -- SET_UNIT
  --
  --
  ----- Iterate the SET_UNIT and call an iterator function for each client, providing the Client to the function and optional parameters.
-  ---- @param #SET_UNIT self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a CLIENT parameter.
+  -- @param #SET_UNIT self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a CLIENT parameter.
  ---- @return #SET_UNIT self
  -- function SET_UNIT:ForEachClient( IteratorFunction, ... )
  --  self:F2( arg )
@@ -3040,7 +3058,7 @@ do -- SET_UNIT
  -- @param Wrapper.Unit#UNIT MUnit
  -- @return #SET_UNIT self
  function SET_UNIT:IsIncludeObject( MUnit )
-    self:F2( MUnit )
+    self:F2( {MUnit} )

    local MUnitInclude = false

@@ -3191,8 +3209,9 @@ do -- SET_UNIT
 end

 do -- SET_STATIC
-
-  --- @type SET_STATIC
+  
+  ---
+  -- @type SET_STATIC
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the SET_STATIC class to build sets of Statics belonging to certain:
@@ -3223,7 +3242,8 @@ do -- SET_STATIC
  --    * @{#SET_STATIC.FilterCategories}: Builds the SET_STATIC with the units belonging to the category(ies).
  --    * @{#SET_STATIC.FilterTypes}: Builds the SET_STATIC with the units belonging to the unit type(s).
  --    * @{#SET_STATIC.FilterCountries}: Builds the SET_STATIC with the units belonging to the country(ies).
-  --    * @{#SET_STATIC.FilterPrefixes}: Builds the SET_STATIC with the units containing the same string(s) in their name. **ATTENTION** bad naming convention as this *does not** only filter *prefixes*.
+  --    * @{#SET_STATIC.FilterPrefixes}: Builds the SET_STATIC with the units containing the same string(s) in their name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --    * @{#SET_STATIC.FilterZones}: Builds the SET_STATIC with the units within a @{Core.Zone#ZONE}.
  --    
  -- Once the filter criteria have been set for the SET_STATIC, you can start filtering using:
@@ -3612,7 +3632,7 @@ do -- SET_STATIC
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Static#STATIC StaticObject
      function( ZoneObject, StaticObject )
        if StaticObject:IsInZone( ZoneObject ) then
@@ -3634,7 +3654,7 @@ do -- SET_STATIC
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Static#STATIC StaticObject
      function( ZoneObject, StaticObject )
        if StaticObject:IsNotInZone( ZoneObject ) then
@@ -3945,8 +3965,9 @@ do -- SET_STATIC
 end

 do -- SET_CLIENT
-
-  --- @type SET_CLIENT
+  
+  ---
+  -- @type SET_CLIENT
  -- @field Core.Timer#TIMER ZoneTimer
  -- @field #number ZoneTimerInterval
  -- @extends Core.Set#SET_BASE
@@ -3979,7 +4000,8 @@ do -- SET_CLIENT
  --    * @{#SET_CLIENT.FilterCategories}: Builds the SET_CLIENT with the clients belonging to the category(ies).
  --    * @{#SET_CLIENT.FilterTypes}: Builds the SET_CLIENT with the clients belonging to the client type(s).
  --    * @{#SET_CLIENT.FilterCountries}: Builds the SET_CLIENT with the clients belonging to the country(ies).
-  --    * @{#SET_CLIENT.FilterPrefixes}: Builds the SET_CLIENT with the clients containing the same string(s) in their unit/pilot name. **ATTENTION!** Bad naming convention as this *does not* only filter *prefixes*.
+  --    * @{#SET_CLIENT.FilterPrefixes}: Builds the SET_CLIENT with the clients containing the same string(s) in their unit/pilot name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --    * @{#SET_CLIENT.FilterActive}: Builds the SET_CLIENT with the units that are only active. Units that are inactive (late activation) won't be included in the set!
  --    * @{#SET_CLIENT.FilterZones}: Builds the SET_CLIENT with the clients within a @{Core.Zone#ZONE}.
  --    
@@ -4059,7 +4081,7 @@ do -- SET_CLIENT

  --- Remove CLIENT(s) from SET_CLIENT.
  -- @param Core.Set#SET_CLIENT self
-  -- @param Wrapper.Client#CLIENT RemoveClientNames A single name or an array of CLIENT names.
+  -- @param Wrapper.Client#CLIENT RemoveClientNames A single object or an array of CLIENT objects.
  -- @return self
  function SET_CLIENT:RemoveClientsByName( RemoveClientNames )

@@ -4310,7 +4332,6 @@ do -- SET_CLIENT
  function SET_CLIENT:FilterStart()

    if _DATABASE then
-      self:_FilterStart()
      self:HandleEvent( EVENTS.Birth, self._EventOnBirth )
      self:HandleEvent( EVENTS.Dead, self._EventOnDeadOrCrash )
      self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash )
@@ -4319,6 +4340,7 @@ do -- SET_CLIENT
        local timing = self.ZoneTimerInterval or 30
        self.ZoneTimer:Start(timing,timing)
      end
+      self:_FilterStart()
    end

    return self
@@ -4369,7 +4391,7 @@ do -- SET_CLIENT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsInZone( ZoneObject ) then
@@ -4391,7 +4413,7 @@ do -- SET_CLIENT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsNotInZone( ZoneObject ) then
@@ -4459,7 +4481,7 @@ do -- SET_CLIENT
        if self.Filter.Active == false or (self.Filter.Active == true and MClient:IsActive() == true and MClient:IsAlive() == true) then
          MClientActive = true
        end
-        --self:I( { "Evaluated Active", MClientActive } )
+        --self:T( { "Evaluated Active", MClientActive } )
        MClientInclude = MClientInclude and MClientActive
      end

@@ -4541,7 +4563,7 @@ do -- SET_CLIENT
    if self.Filter.Playernames then
      local MClientPlayername = false
      local playername = MClient:GetPlayerName() or "Unknown"
-      --self:I(playername)
+      --self:T(playername)
      for _,_Playername in pairs(self.Filter.Playernames) do
        if playername and string.find(playername,_Playername) then
          MClientPlayername = true
@@ -4556,7 +4578,7 @@ do -- SET_CLIENT
      local callsign = MClient:GetCallsign()
      --self:I(callsign)
      for _,_Callsign in pairs(self.Filter.Callsigns) do
-        if callsign and string.find(callsign,_Callsign) then
+        if callsign and string.find(callsign,_Callsign,1,true) then
          MClientCallsigns = true
        end
      end
@@ -4573,7 +4595,8 @@ end

 do -- SET_PLAYER

-  --- @type SET_PLAYER
+  ---
+  -- @type SET_PLAYER
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_PLAYER} class to build sets of units belonging to alive players:
@@ -4593,7 +4616,8 @@ do -- SET_PLAYER
  --    * @{#SET_PLAYER.FilterCategories}: Builds the SET_PLAYER with the clients belonging to the category(ies).
  --    * @{#SET_PLAYER.FilterTypes}: Builds the SET_PLAYER with the clients belonging to the client type(s).
  --    * @{#SET_PLAYER.FilterCountries}: Builds the SET_PLAYER with the clients belonging to the country(ies).
-  --    * @{#SET_PLAYER.FilterPrefixes}: Builds the SET_PLAYER with the clients sharing the same string(s) in their unit/pilot name. **ATTENTION** Bad naming convention as this *does not* only filter prefixes.
+  --    * @{#SET_PLAYER.FilterPrefixes}: Builds the SET_PLAYER with the clients sharing the same string(s) in their unit/pilot name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --
  -- Once the filter criteria have been set for the SET_PLAYER, you can start filtering using:
  --
@@ -4868,7 +4892,7 @@ do -- SET_PLAYER
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsInZone( ZoneObject ) then
@@ -4890,7 +4914,7 @@ do -- SET_PLAYER
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsNotInZone( ZoneObject ) then
@@ -4998,8 +5022,9 @@ do -- SET_PLAYER
 end

 do -- SET_AIRBASE
-
-  --- @type SET_AIRBASE
+  
+  ---
+  -- @type SET_AIRBASE
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_AIRBASE} class to build sets of airbases optionally belonging to certain:
@@ -5341,8 +5366,9 @@ do -- SET_AIRBASE
 end

 do -- SET_CARGO
-
-  --- @type SET_CARGO
+  
+  ---
+  -- @type SET_CARGO
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_CARGO} class to build sets of cargos optionally belonging to certain:
@@ -5368,7 +5394,8 @@ do -- SET_CARGO
  -- Filter criteria are defined by:
  --
  --    * @{#SET_CARGO.FilterCoalitions}: Builds the SET_CARGO with the cargos belonging to the coalition(s).
-  --    * @{#SET_CARGO.FilterPrefixes}: Builds the SET_CARGO with the cargos containing the same string(s). **ATTENTION** Bad naming convention as this *does not* only filter *prefixes*.
+  --    * @{#SET_CARGO.FilterPrefixes}: Builds the SET_CARGO with the cargos containing the same string(s). **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --    * @{#SET_CARGO.FilterTypes}: Builds the SET_CARGO with the cargos belonging to the cargo type(s).
  --    * @{#SET_CARGO.FilterCountries}: Builds the SET_CARGO with the cargos belonging to the country(ies).
  --
@@ -5767,8 +5794,9 @@ do -- SET_CARGO
 end

 do -- SET_ZONE
-
-  --- @type SET_ZONE
+  
+  ---
+  -- @type SET_ZONE
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_ZONE} class to build sets of zones of various types.
@@ -5789,7 +5817,8 @@ do -- SET_ZONE
  -- You can set filter criteria to build the collection of zones in SET_ZONE.
  -- Filter criteria are defined by:
  --
-  --    * @{#SET_ZONE.FilterPrefixes}: Builds the SET_ZONE with the zones having a certain text pattern in their name. **ATTENTION!** Bad naming convention as this *does not* only filter *prefixes*.
+  --    * @{#SET_ZONE.FilterPrefixes}: Builds the SET_ZONE with the zones having a certain text pattern in their name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --
  -- Once the filter criteria have been set for the SET_ZONE, you can start filtering using:
  --
@@ -5813,6 +5842,7 @@ do -- SET_ZONE
    },
      FilterMeta = {
    },
+    Checktime = 5,
  }

  --- Creates a new SET_ZONE object, building a set of zones.
@@ -6023,7 +6053,29 @@ do -- SET_ZONE

    return self
  end
-
+  
+  --- Get the average aggregated coordinate of this set of zones.
+  -- @param #SET_ZONE self
+  -- @return Core.Point#COORDINATE
+  function SET_ZONE:GetAverageCoordinate()
+    local x,y,z = 0,0,0
+    local count = 0
+    for _,_zone in pairs(self.Set) do
+      local zone=_zone --Core.Zone#ZONE
+      local vec3 = zone:GetVec3()
+      x = x + vec3.x
+      y = y + vec3.y
+      z = z + vec3.z
+      count = count + 1
+    end
+    if count > 1 then
+      x = x/count
+      y = y/count
+      z = z/count
+    end
+    local coord = COORDINATE:New(x,y,z)
+    return coord
+  end

  --- Private function.
  -- @param #SET_ZONE self
@@ -6131,12 +6183,176 @@ do -- SET_ZONE

    return zmin, dmin
  end  
-
+  
+  --- Set the check time for SET_ZONE:Trigger()
+  -- @param #SET_ZONE self
+  -- @param #number seconds Check every seconds for objects entering or leaving the zone. Defaults to 5 secs.
+  -- @return #SET_ZONE self
+  function SET_ZONE:SetCheckTime(seconds)
+    self.Checktime = seconds or 5
+    return self
+  end
+  
+  --- Start watching if the Object or Objects move into or out of our set of zones.
+  -- @param #SET_ZONE self
+  -- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT
+  -- @return #SET_ZONE self
+  -- @usage
+  --          -- Create a SET_GROUP and a SET_ZONE for this:
+  -- 
+  --          local groupset = SET_GROUP:New():FilterPrefixes("Aerial"):FilterStart()
+  --          
+  --          -- Trigger will check each zone of the SET_ZONE every 5 secs for objects entering or leaving from the groupset
+  --          local zoneset = SET_ZONE:New():FilterPrefixes("Target Zone"):FilterOnce():Trigger(groupset)
+  --          
+  --          -- Draw zones on map so we see what's going on
+  --          zoneset:ForEachZone(
+  --            function(zone)
+  --              zone:DrawZone(-1, {0,1,0}, Alpha, FillColor, FillAlpha, 4, ReadOnly)
+  --            end 
+  --          )
+  --          
+  --          -- This FSM function will be called for entering objects
+  --          function zoneset:OnAfterEnteredZone(From,Event,To,Controllable,Zone)
+  --            MESSAGE:New("Group "..Controllable:GetName() .. " entered zone "..Zone:GetName(),10,"Set Trigger"):ToAll()
+  --          end
+  --          
+  --          -- This FSM function will be called for leaving objects
+  --          function zoneset:OnAfterLeftZone(From,Event,To,Controllable,Zone)
+  --            MESSAGE:New("Group "..Controllable:GetName() .. " left zone "..Zone:GetName(),10,"Set Trigger"):ToAll()
+  --          end
+  --          
+  --          -- Stop watching after 1 hour
+  --          zoneset:__TriggerStop(3600)
+  function SET_ZONE:Trigger(Objects)
+    --self:I("Added Set_Zone Trigger")
+    self:AddTransition("*","TriggerStart","TriggerRunning")
+    self:AddTransition("*","EnteredZone","*")
+    self:AddTransition("*","LeftZone","*")
+    self:AddTransition("*","TriggerRunCheck","*")
+    self:AddTransition("*","TriggerStop","TriggerStopped")
+    self:TriggerStart()
+    self.checkobjects = Objects
+    if UTILS.IsInstanceOf(Objects,"SET_BASE") then
+      self.objectset = Objects.Set
+    else
+      self.objectset = {Objects}
+    end
+    self:_TriggerCheck(true)
+    self:__TriggerRunCheck(self.Checktime)
+    return self
+    
+    ------------------------
+    --- Pseudo Functions ---
+    ------------------------
+    
+    --- Triggers the FSM event "TriggerStop". Stops the SET_ZONE Trigger.
+    -- @function [parent=#SET_ZONE] TriggerStop
+    -- @param #SET_ZONE self
+  
+    --- Triggers the FSM event "TriggerStop" after a delay. 
+    -- @function [parent=#SET_ZONE] __TriggerStop
+    -- @param #SET_ZONE self
+    -- @param #number delay Delay in seconds.
+    
+    --- On After "EnteredZone" event. An observed object has entered the zone.
+    -- @function [parent=#SET_ZONE] OnAfterEnteredZone
+    -- @param #SET_ZONE self
+    -- @param #string From From state.
+    -- @param #string Event Event.
+    -- @param #string To To state.
+    -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable entering the zone.
+    -- @param Core.Zone#ZONE_BASE Zone The zone entered.
+  
+    --- On After "LeftZone" event. An observed object has left the zone.
+    -- @function [parent=#SET_ZONE] OnAfterLeftZone
+    -- @param #SET_ZONE self
+    -- @param #string From From state.
+    -- @param #string Event Event.
+    -- @param #string To To state.
+    -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable leaving the zone.
+    -- @param Core.Zone#ZONE_BASE Zone The zone left.
+  end
+  
+  --- (Internal) Check the assigned objects for being in/out of the zone
+  -- @param #SET_ZONE self
+  -- @param #boolean fromstart If true, do the init of the objects
+  -- @return #SET_ZONE self
+  function SET_ZONE:_TriggerCheck(fromstart)
+    --self:I("_TriggerCheck | FromStart = "..tostring(fromstart))
+    if fromstart then
+      for _,_object in pairs(self.objectset) do
+        local obj = _object -- Wrapper.Controllable#CONTROLLABLE
+        if obj and obj:IsAlive() then
+          for _,_zone in pairs(self.Set) do
+            if not obj.TriggerInZone then obj.TriggerInZone = {} end
+            if _zone:IsCoordinateInZone(obj:GetCoordinate()) then
+              obj.TriggerInZone[_zone.ZoneName] = true
+            else
+              obj.TriggerInZone[_zone.ZoneName] = false
+            end
+            --self:I("Object "..obj:GetName().." is in zone = "..tostring(obj.TriggerInZone[_zone.ZoneName]))
+          end
+        end
+      end
+    else
+      for _,_object in pairs(self.objectset) do
+        local obj = _object -- Wrapper.Controllable#CONTROLLABLE
+        if obj and obj:IsAlive() then
+          for _,_zone in pairs(self.Set) do
+            -- Check for pop-up objects
+            if not obj.TriggerInZone then
+              -- has not been tagged previously - wasn't in set! 
+              obj.TriggerInZone = {}
+            end
+            if not obj.TriggerInZone[_zone.ZoneName] then
+              -- has not been tagged previously - wasn't in set! 
+              obj.TriggerInZone[_zone.ZoneName] = false 
+            end
+            -- is obj in zone?
+            local inzone = _zone:IsCoordinateInZone(obj:GetCoordinate())
+            --self:I("Object "..obj:GetName().." is in zone: "..tostring(inzone))
+            if inzone and not obj.TriggerInZone[_zone.ZoneName] then
+              -- wasn't in zone before
+              --self:I("Newly entered")
+              self:__EnteredZone(0.5,obj,_zone)
+              obj.TriggerInZone[_zone.ZoneName] = true
+            elseif (not inzone) and obj.TriggerInZone[_zone.ZoneName] then
+              -- has left the zone
+              --self:I("Newly left")
+              self:__LeftZone(0.5,obj,_zone)
+              obj.TriggerInZone[_zone.ZoneName] = false
+            else
+              --self:I("Not left or not entered, or something went wrong!")
+            end
+          end
+        end
+      end
+    end 
+    return self
+  end
+  
+  --- (Internal) Check the assigned objects for being in/out of the zone
+  -- @param #SET_ZONE self
+  -- @param #string From
+  -- @param #string Event
+  -- @param #string to
+  -- @return #SET_ZONE self
+  function SET_ZONE:onafterTriggerRunCheck(From,Event,To)
+    --self:I("onafterTriggerRunCheck")
+    --self:I({From, Event, To})  
+    if self:GetState() ~= "TriggerStopped" then
+      self:_TriggerCheck()
+      self:__TriggerRunCheck(self.Checktime)
+    end
+    return self
+  end
 end

 do -- SET_ZONE_GOAL
-
-  --- @type SET_ZONE_GOAL
+  
+  ---
+  -- @type SET_ZONE_GOAL
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_ZONE_GOAL} class to build sets of zones of various types.
@@ -6157,7 +6373,8 @@ do -- SET_ZONE_GOAL
  -- You can set filter criteria to build the collection of zones in SET_ZONE_GOAL.
  -- Filter criteria are defined by:
  --
-  --    * @{#SET_ZONE_GOAL.FilterPrefixes}: Builds the SET_ZONE_GOAL with the zones having a certain text pattern in their name. **ATTENTION!** Bad naming convention as this *does not* only filter *prefixes*.
+  --    * @{#SET_ZONE_GOAL.FilterPrefixes}: Builds the SET_ZONE_GOAL with the zones having a certain text pattern in their name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --
  -- Once the filter criteria have been set for the SET_ZONE_GOAL, you can start filtering using:
  --
@@ -6446,8 +6663,9 @@ do -- SET_ZONE_GOAL
 end

 do -- SET_OPSZONE
-
-  --- @type SET_OPSZONE
+  
+  ---
+  -- @type SET_OPSZONE
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_OPSZONE} class to build sets of zones of various types.
@@ -6468,7 +6686,8 @@ do -- SET_OPSZONE
  -- You can set filter criteria to build the collection of zones in SET_OPSZONE.
  -- Filter criteria are defined by:
  --
-  --    * @{#SET_OPSZONE.FilterPrefixes}: Builds the SET_OPSZONE with the zones having a certain text pattern in their name. **ATTENTION!** Bad naming convention as this *does not* only filter *prefixes*.
+  --    * @{#SET_OPSZONE.FilterPrefixes}: Builds the SET_OPSZONE with the zones having a certain text pattern in their name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --
  -- Once the filter criteria have been set for the SET_OPSZONE, you can start filtering using:
  --
@@ -6903,8 +7122,9 @@ end


 do -- SET_OPSGROUP
-
-  --- @type SET_OPSGROUP
+  
+  ---
+  -- @type SET_OPSGROUP
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_OPSGROUP} class to build sets of OPS groups belonging to certain:
@@ -6933,7 +7153,8 @@ do -- SET_OPSGROUP
  --    * @{#SET_OPSGROUP.FilterCoalitions}: Builds the SET_OPSGROUP with the groups belonging to the coalition(s).
  --    * @{#SET_OPSGROUP.FilterCategories}: Builds the SET_OPSGROUP with the groups belonging to the category(ies).
  --    * @{#SET_OPSGROUP.FilterCountries}: Builds the SET_OPSGROUP with the groups belonging to the country(ies).
-  --    * @{#SET_OPSGROUP.FilterPrefixes}: Builds the SET_OPSGROUP with the groups *containing* the given string in the group name. **Attention!** Bad naming convention, as this not really filtering *prefixes*.
+  --    * @{#SET_OPSGROUP.FilterPrefixes}: Builds the SET_OPSGROUP with the groups *containing* the given string in the group name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
+  -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
  --    * @{#SET_OPSGROUP.FilterActive}: Builds the SET_OPSGROUP with the groups that are only active. Groups that are inactive (late activation) won't be included in the set!
  --
  -- For the Category Filter, extra methods have been added:
@@ -7571,6 +7792,7 @@ do -- SET_SCENERY
    Scenerys = {},
    Filter = {
      SceneryPrefixes = nil,
+      SceneryRoles = nil,
      Zones = nil,
    },
  }
@@ -7593,7 +7815,7 @@ do -- SET_SCENERY
    
    if ZoneSet then
      for _,_zone in pairs(ZoneSet.Set) do
-         self:T("Zone type handed: "..tostring(_zone.ClassName))
+        self:T("Zone type handed: "..tostring(_zone.ClassName))
        table.insert(zonenames,_zone:GetName())
      end   
      self:AddSceneryByName(zonenames)
@@ -7617,7 +7839,7 @@ do -- SET_SCENERY
  
  --- Add SCENERY(s) to SET_SCENERY.
  -- @param #SET_SCENERY self
-  -- @param #string AddScenery A single SCENERY.
+  -- @param Wrapper.Scenery#SCENERY AddScenery A single SCENERY object.
  -- @return #SET_SCENERY self
  function SET_SCENERY:AddScenery( AddScenery )
    self:F2( AddScenery:GetName() )
@@ -7687,6 +7909,7 @@ do -- SET_SCENERY
    end
    for _,Zone in pairs( zones ) do
      local zonename = Zone:GetName()
+      self:T(zonename)
      self.Filter.Zones[zonename] = Zone
    end
    return self
@@ -7705,11 +7928,30 @@ do -- SET_SCENERY
      Prefixes = { Prefixes }
    end
    for PrefixID, Prefix in pairs( Prefixes ) do
+      --self:T(Prefix)
      self.Filter.SceneryPrefixes[Prefix] = Prefix
    end
    return self
  end
-
+  
+  --- Builds a set of SCENERYs that **contain** an exact match of the "ROLE" property.
+  -- @param #SET_SCENERY self
+  -- @param #string Role The string pattern(s) that needs to exactly match the scenery "ROLE" property from the ME quad-zone properties. Can also be passed as a `#table` of strings.
+  -- @return #SET_SCENERY self
+  function SET_SCENERY:FilterRoles( Role )
+    if not self.Filter.SceneryRoles then
+      self.Filter.SceneryRoles = {}
+    end
+    if type( Role ) ~= "table" then
+      Role = { Role }
+    end
+    for PrefixID, Prefix in pairs( Role ) do
+      --self:T(Prefix)
+      self.Filter.SceneryRoles[Prefix] = Prefix
+    end
+    return self
+  end
+  
  --- Iterate the SET_SCENERY and count how many SCENERYSs are alive.
  -- @param #SET_SCENERY self
  -- @return #number The number of SCENERYSs alive.
@@ -7802,10 +8044,76 @@ do -- SET_SCENERY
  -- @param Wrapper.Scenery#SCENERY MScenery
  -- @return #SET_SCENERY self
  function SET_SCENERY:IsIncludeObject( MScenery )
-    self:F2( MScenery )
-  return true
+    self:T( MScenery.SceneryName )
+
+    local MSceneryInclude = true
+    
+    if MScenery then
+      local MSceneryName = MScenery:GetName()
+      
+      -- Filter Prefixes
+      if self.Filter.Prefixes then
+        local MSceneryPrefix = false
+        for ZonePrefixId, ZonePrefix in pairs( self.Filter.Prefixes ) do
+          self:T( { "Prefix:", string.find( MSceneryName, ZonePrefix, 1 ), ZonePrefix } )
+          if string.find( MSceneryName, ZonePrefix, 1 ) then
+            MSceneryPrefix = true
+          end
+        end
+        self:T( { "Evaluated Prefix", MSceneryPrefix } )
+        MSceneryInclude = MSceneryInclude and MSceneryPrefix
+      end
+      
+      if self.Filter.Zones then
+        local MSceneryZone = false
+        for ZoneName, Zone in pairs( self.Filter.Zones ) do
+          --self:T( "Zone:", ZoneName )
+          local coord = MScenery:GetCoordinate()
+          if coord and Zone:IsCoordinateInZone(coord) then
+            MSceneryZone = true
+          end
+          self:T( { "Evaluated Zone", MSceneryZone } )
+        end
+        MSceneryInclude = MSceneryInclude and MSceneryZone
+      end
+
+      -- Filter Roles
+      if self.Filter.SceneryRoles then
+        local MSceneryRole = false
+        local Role = MScenery:GetProperty("ROLE") or "none"
+        for ZoneRoleId, ZoneRole in pairs( self.Filter.SceneryRoles ) do
+          self:T( { "Role:", ZoneRole, Role } )
+          if ZoneRole == Role then
+            MSceneryRole = true
+          end
+        end
+        self:T( { "Evaluated Role ", MSceneryRole } )
+        MSceneryInclude = MSceneryInclude and MSceneryRole
+      end
+    end
+
+    self:T2( MSceneryInclude )
+    return MSceneryInclude
  end
  
+  --- Filters for the defined collection.
+  -- @param #SET_SCENERY self
+  -- @return #SET_SCENERY self
+  function SET_SCENERY:FilterOnce()
+
+    for ObjectName, Object in pairs( self:GetSet() ) do
+      self:T(ObjectName)
+      if self:IsIncludeObject( Object ) then
+        self:Add( ObjectName, Object )
+      else
+        self:Remove(ObjectName, true)
+      end
+    end
+
+    return self --FilteredSet
+  end
+  
+  
  --- Count overall initial (Life0) lifepoints of the SET objects.
  -- @param #SET_SCENERY self
  -- @return #number LIfe0Points
@@ -7843,7 +8151,7 @@ do -- SET_SCENERY
  function SET_SCENERY:GetRelativeLife()
    local life = self:GetLife()
    local life0 = self:GetLife0()
-    self:T3(string.format("Set Lifepoints: %d life0 | %d life",life0,life))
+    self:T2(string.format("Set Lifepoints: %d life0 | %d life",life0,life))
    local rlife = math.floor((life / life0) * 100)
    return rlife
  end
--- a/Development/Moose/Core/Settings.lua
+++ b/Development/Moose/Core/Settings.lua
@@ -744,7 +744,7 @@ do -- SETTINGS

      self.PlayerMenu = PlayerMenu

-      self:I( string.format( "Setting menu for player %s", tostring( PlayerName ) ) )
+      self:T( string.format( "Setting menu for player %s", tostring( PlayerName ) ) )

      local submenu = MENU_GROUP:New( PlayerGroup, "LL Accuracy", PlayerMenu )
      MENU_GROUP_COMMAND:New( PlayerGroup, "LL 0 Decimals", submenu, self.MenuGroupLL_DDM_AccuracySystem, self, PlayerUnit, PlayerGroup, PlayerName, 0 )
@@ -989,7 +989,7 @@ do -- SETTINGS
  do
    --- @param #SETTINGS self
    function SETTINGS:MenuGroupA2GSystem( PlayerUnit, PlayerGroup, PlayerName, A2GSystem )
-      BASE:E( { self, PlayerUnit:GetName(), A2GSystem } )
+      --BASE:E( {PlayerUnit:GetName(), A2GSystem } )
      self.A2GSystem = A2GSystem
      MESSAGE:New( string.format( "Settings: A2G format set to %s for player %s.", A2GSystem, PlayerName ), 5 ):ToGroup( PlayerGroup )
      if _SETTINGS.MenuStatic == false then
--- a/Development/Moose/Core/Spawn.lua
+++ b/Development/Moose/Core/Spawn.lua
@@ -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,8 @@ 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.
@@ -317,6 +328,8 @@ function SPAWN:New( SpawnTemplatePrefix )
    self.SpawnInitModu = nil -- No special modulation.
    self.SpawnInitRadio = nil -- No radio comms setting.
    self.SpawnInitModex = nil
+    self.SpawnInitModexPrefix = nil
+    self.SpawnInitModexPostfix = nil
    self.SpawnInitAirbase = nil
    self.TweakedTemplate = false -- Check if the user is using self made template.

@@ -371,6 +384,8 @@ function SPAWN:NewWithAlias( SpawnTemplatePrefix, SpawnAliasPrefix )
    self.SpawnInitModu = nil -- No special modulation.
    self.SpawnInitRadio = nil -- No radio communication setting.
    self.SpawnInitModex = nil
+    self.SpawnInitModexPrefix = nil
+    self.SpawnInitModexPostfix = nil
    self.SpawnInitAirbase = nil
    self.TweakedTemplate = false -- Check if the user is using self made template.

@@ -388,9 +403,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 +506,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
@@ -530,9 +545,14 @@ function SPAWN:NewFromTemplate( SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPr
    self.SpawnInitModu = nil -- No special modulation.
    self.SpawnInitRadio = nil -- No radio communication setting.
    self.SpawnInitModex = nil
+    self.SpawnInitModexPrefix = nil
+    self.SpawnInitModexPostfix = 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
@@ -798,12 +818,17 @@ end
 --- Sets the modex of the first unit of the group. If more units are in the group, the number is increased by one with every unit.
 -- @param #SPAWN self
 -- @param #number modex Modex of the first unit.
+-- @param #string prefix (optional) String to prefix to modex, e.g. for French AdA Modex, eg. -L-102 then "-L-" would be the prefix.
+-- @param #string postfix (optional) String to postfix to modex, example tbd.
 -- @return #SPAWN self
-function SPAWN:InitModex( modex )
+function SPAWN:InitModex( modex, prefix, postfix )

  if modex then
    self.SpawnInitModex = tonumber( modex )
  end
+  
+  self.SpawnInitModexPrefix = prefix
+  self.SpawnInitModexPostfix = postfix

  return self
 end
@@ -1044,7 +1069,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 +1099,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...
@@ -1164,7 +1214,6 @@ function SPAWN:InitCleanUp( SpawnCleanUpInterval )
  local SpawnGroup, SpawnCursor = self:GetFirstAliveGroup()
  self:T( { "CleanUp Scheduler:", SpawnGroup } )

-  -- self.CleanUpFunction = routines.scheduleFunction( self._SpawnCleanUpScheduler, { self }, timer.getTime() + 1, SpawnCleanUpInterval )
  self.CleanUpScheduler = SCHEDULER:New( self, self._SpawnCleanUpScheduler, {}, 1, SpawnCleanUpInterval, 0.2 )
  return self
 end
@@ -1373,7 +1422,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
@@ -1528,7 +1582,10 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
        -- Set tail number.
        if self.SpawnInitModex then
          for UnitID = 1, #SpawnTemplate.units do
-            SpawnTemplate.units[UnitID].onboard_num = string.format( "%03d", self.SpawnInitModex + (UnitID - 1) )
+            local modexnumber = string.format( "%03d", self.SpawnInitModex + (UnitID - 1) )
+            if self.SpawnInitModexPrefix then modexnumber = self.SpawnInitModexPrefix..modexnumber end
+            if self.SpawnInitModexPostfix then modexnumber = modexnumber..self.SpawnInitModexPostfix end
+            SpawnTemplate.units[UnitID].onboard_num = modexnumber
          end
        end

@@ -1611,7 +1668,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
@@ -2135,14 +2192,18 @@ end
 -- @param #table Spots Table of parking spot IDs. Note that these in general are different from the numbering in the mission editor!
 -- @param #SPAWN.Takeoff Takeoff (Optional) Takeoff type, i.e. either SPAWN.Takeoff.Cold or SPAWN.Takeoff.Hot. Default is Hot.
 -- @return Wrapper.Group#GROUP The group that was spawned or nil when nothing was spawned.
-function SPAWN:SpawnAtParkingSpot( Airbase, Spots, Takeoff ) -- R2.5
+function SPAWN:SpawnAtParkingSpot( Airbase, Spots, Takeoff )
  self:F( { Airbase = Airbase, Spots = Spots, Takeoff = Takeoff } )
-
+  
  -- Ensure that Spots parameter is a table.
  if type( Spots ) ~= "table" then
    Spots = { Spots }
  end
-
+  
+  if type(Airbase) == "string" then
+    Airbase = AIRBASE:FindByName(Airbase)
+  end
+  
  -- Get template group.
  local group = GROUP:FindByName( self.SpawnTemplatePrefix )

@@ -3124,7 +3185,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 +3223,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 +3358,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 +3528,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 +3548,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 )
--- a/Development/Moose/Core/Spot.lua
+++ b/Development/Moose/Core/Spot.lua
@@ -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
--- a/Development/Moose/Core/Timer.lua
+++ b/Development/Moose/Core/Timer.lua
@@ -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
--- a/Development/Moose/Core/Zone.lua
+++ b/Development/Moose/Core/Zone.lua
@@ -53,7 +53,8 @@
 -- @module Core.Zone
 -- @image Core_Zones.JPG

--- @type ZONE_BASE
+---
+-- @type ZONE_BASE
 -- @field #string ZoneName Name of the zone.
 -- @field #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability.
 -- @field #number DrawID Unique ID of the drawn zone on the F10 map.
@@ -63,6 +64,7 @@
 -- @field #number ZoneID ID of zone. Only zones defined in the ME have an ID!
 -- @field #table Table of any trigger zone properties from the ME. The key is the Name of the property, and the value is the property's Value.
 -- @field #number Surface Type of surface. Only determined at the center of the zone!
+-- @field #number Checktime Check every Checktime seconds, used for ZONE:Trigger()
 -- @extends Core.Fsm#FSM


@@ -121,6 +123,7 @@ ZONE_BASE = {
  ZoneID=nil,
  Properties={},
  Surface=nil,
+  Checktime = 5,
 }

 --- The ZONE_BASE.BoundingSquare
@@ -189,13 +192,14 @@ end
 -- @param Core.Point#COORDINATE Coordinate The coordinate to test.
 -- @return #boolean true if the coordinate is within the zone.
 function ZONE_BASE:IsCoordinateInZone( Coordinate )
+  if not Coordinate then return false end
  local InZone = self:IsVec2InZone( Coordinate:GetVec2() )
  return InZone
 end

 --- Returns if a PointVec2 is within the zone. (Name is misleading, actually takes a #COORDINATE)
 -- @param #ZONE_BASE self
-- @param Core.Point#COORDINATE PointVec2 The coordinate to test.
+-- @param Core.Point#COORDINATE Coordinate The coordinate to test.
 -- @return #boolean true if the PointVec2 is within the zone.
 function ZONE_BASE:IsPointVec2InZone( Coordinate )
  local InZone = self:IsVec2InZone( Coordinate:GetVec2() )
@@ -555,6 +559,154 @@ function ZONE_BASE:GetZoneMaybe()
  end
 end

+--- Set the check time for ZONE:Trigger()
+-- @param #ZONE_BASE self
+-- @param #number seconds Check every seconds for objects entering or leaving the zone. Defaults to 5 secs.
+-- @return #ZONE_BASE self
+function ZONE_BASE:SetCheckTime(seconds)
+  self.Checktime = seconds or 5
+  return self
+end
+
+--- Start watching if the Object or Objects move into or out of a zone.
+-- @param #ZONE_BASE self
+-- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT
+-- @return #ZONE_BASE self
+-- @usage
+--            -- Create a new zone and start watching it every 5 secs for a defined GROUP entering or leaving
+--            local triggerzone = ZONE:New("ZonetoWatch"):Trigger(GROUP:FindByName("Aerial-1"))
+--            
+--            -- This FSM function will be called when the group enters the zone
+--            function triggerzone:OnAfterEnteredZone(From,Event,To,Group)
+--              MESSAGE:New("Group has entered zone!",15):ToAll()
+--            end
+--            
+--            -- This FSM function will be called when the group leaves the zone
+--            function triggerzone:OnAfterLeftZone(From,Event,To,Group)
+--              MESSAGE:New("Group has left zone!",15):ToAll()
+--            end
+--            
+--            -- Stop watching the zone after 1 hour
+--           triggerzone:__TriggerStop(3600)
+function ZONE_BASE:Trigger(Objects)
+  --self:I("Added Zone Trigger")
+  self:SetStartState("TriggerStopped")
+  self:AddTransition("TriggerStopped","TriggerStart","TriggerRunning")
+  self:AddTransition("*","EnteredZone","*")
+  self:AddTransition("*","LeftZone","*")
+  self:AddTransition("*","TriggerRunCheck","*")
+  self:AddTransition("*","TriggerStop","TriggerStopped")
+  self:TriggerStart()
+  self.checkobjects = Objects
+  if UTILS.IsInstanceOf(Objects,"SET_BASE") then
+    self.objectset = Objects.Set
+  else
+    self.objectset = {Objects}
+  end
+  self:_TriggerCheck(true)
+  self:__TriggerRunCheck(self.Checktime)
+  return self
+  
+  ------------------------
+  --- Pseudo Functions ---
+  ------------------------
+  
+  --- Triggers the FSM event "TriggerStop". Stops the ZONE_BASE Trigger.
+  -- @function [parent=#ZONE_BASE] TriggerStop
+  -- @param #ZONE_BASE self
+
+  --- Triggers the FSM event "TriggerStop" after a delay. 
+  -- @function [parent=#ZONE_BASE] __TriggerStop
+  -- @param #ZONE_BASE self
+  -- @param #number delay Delay in seconds.
+  
+  --- On After "EnteredZone" event. An observed object has entered the zone.
+  -- @function [parent=#ZONE_BASE] OnAfterEnteredZone
+  -- @param #ZONE_BASE self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable entering the zone.
+
+  --- On After "LeftZone" event. An observed object has left the zone.
+  -- @function [parent=#ZONE_BASE] OnAfterLeftZone
+  -- @param #ZONE_BASE self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable leaving the zone.
+end
+
+--- (Internal) Check the assigned objects for being in/out of the zone
+-- @param #ZONE_BASE self
+-- @param #boolean fromstart If true, do the init of the objects
+-- @return #ZONE_BASE self
+function ZONE_BASE:_TriggerCheck(fromstart)
+  --self:I("_TriggerCheck | FromStart = "..tostring(fromstart))
+  local objectset = self.objectset or {}
+  if fromstart then
+    -- just earmark everyone in/out
+    for _,_object in pairs(objectset) do
+      local obj = _object -- Wrapper.Controllable#CONTROLLABLE
+      if not obj.TriggerInZone then obj.TriggerInZone = {} end
+      if obj and obj:IsAlive() and self:IsCoordinateInZone(obj:GetCoordinate()) then
+        obj.TriggerInZone[self.ZoneName] = true
+      else
+        obj.TriggerInZone[self.ZoneName] = false
+      end
+      --self:I("Object "..obj:GetName().." is in zone = "..tostring(obj.TriggerInZone[self.ZoneName]))
+    end
+  else
+    -- Check for changes
+    for _,_object in pairs(objectset) do
+      local obj = _object -- Wrapper.Controllable#CONTROLLABLE
+      if obj and obj:IsAlive() then
+        if not obj.TriggerInZone then
+          -- has not been tagged previously - wasn't in set! 
+          obj.TriggerInZone = {}
+        end
+        if not obj.TriggerInZone[self.ZoneName] then
+          -- has not been tagged previously - wasn't in set! 
+          obj.TriggerInZone[self.ZoneName] = false 
+        end
+        -- is obj in zone?
+        local inzone = self:IsCoordinateInZone(obj:GetCoordinate())
+        --self:I("Object "..obj:GetName().." is in zone: "..tostring(inzone))
+        if inzone and not obj.TriggerInZone[self.ZoneName] then
+          -- wasn't in zone before
+          --self:I("Newly entered")
+          self:__EnteredZone(0.5,obj)
+          obj.TriggerInZone[self.ZoneName] = true
+        elseif (not inzone) and obj.TriggerInZone[self.ZoneName] then
+          -- has left the zone
+          --self:I("Newly left")
+          self:__LeftZone(0.5,obj)
+          obj.TriggerInZone[self.ZoneName] = false
+        else
+          --self:I("Not left or not entered, or something went wrong!")
+        end
+      end
+    end
+  end  
+  return self
+end
+
+--- (Internal) Check the assigned objects for being in/out of the zone
+-- @param #ZONE_BASE self
+-- @param #string From
+-- @param #string Event
+-- @param #string to
+-- @return #ZONE_BASE self
+function ZONE_BASE:onafterTriggerRunCheck(From,Event,To)
+  if self:GetState() ~= "TriggerStopped" then
+    self:_TriggerCheck()
+    self:__TriggerRunCheck(self.Checktime)
+  end
+  return self
+end
+
+
+
 --- Returns the Value of the zone with the given PropertyName, or nil if no matching property exists.
 -- @param #ZONE_BASE self
 -- @param #string PropertyName The name of a the TriggerZone Property to be retrieved.
@@ -953,7 +1105,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )

        local Include = false
        if not UnitCategories then
-          -- Anythink found is included.
+          -- Anything found is included.
          Include = true
        else
          -- Check if found object is in specified categories.
@@ -984,9 +1136,9 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
      if ObjectCategory == Object.Category.SCENERY then
        local SceneryType = ZoneObject:getTypeName()
        local SceneryName = ZoneObject:getName()
-        --BASE:I("SceneryType "..SceneryType.."SceneryName"..SceneryName)
+        --BASE:I("SceneryType "..SceneryType.." SceneryName "..tostring(SceneryName))
        self.ScanData.Scenery[SceneryType] = self.ScanData.Scenery[SceneryType] or {}
-        self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( SceneryName, ZoneObject )
+        self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( tostring(SceneryName), ZoneObject)
        table.insert(self.ScanData.SceneryTable,self.ScanData.Scenery[SceneryType][SceneryName] )
        self:T( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
      end
@@ -1442,8 +1594,11 @@ function ZONE_RADIUS:GetRandomCoordinateWithoutBuildings(inner,outer,distance,ma
  local T1 = timer.getTime()

  local buildings = {}
+  local buildingzones = {}
+  
  if self.ScanData and self.ScanData.BuildingCoordinates then
    buildings = self.ScanData.BuildingCoordinates
+    buildingzones = self.ScanData.BuildingZones
  else
    -- build table of buildings coordinates
    for _,_object in pairs (objects) do
@@ -1455,28 +1610,32 @@ function ZONE_RADIUS:GetRandomCoordinateWithoutBuildings(inner,outer,distance,ma
            MARKER:New(scenery:GetCoordinate(),"Building"):ToAll()
          end
          buildings[#buildings+1] = scenery:GetCoordinate()
+          local bradius = scenery:GetBoundingRadius() or dist
+          local bzone = ZONE_RADIUS:New("Building-"..math.random(1,100000),scenery:GetVec2(),bradius,false)
+          buildingzones[#buildingzones+1] = bzone
+          --bzone:DrawZone(-1,{1,0,0},Alpha,FillColor,FillAlpha,1,ReadOnly)
         end
      end
    end
    self.ScanData.BuildingCoordinates = buildings
+    self.ScanData.BuildingZones = buildingzones
  end

  -- max 1000 tries
  local rcoord = nil  
-  local found = false
+  local found = true
  local iterations = 0

  for i=1,1000 do
    iterations = iterations + 1
    rcoord = self:GetRandomCoordinate(inner,outer)
-    found = false
-    for _,_coord in pairs (buildings) do
-      local coord = _coord -- Core.Point#COORDINATE
+    found = true
+    for _,_coord in pairs (buildingzones) do
+      local zone = _coord -- Core.Zone#ZONE_RADIUS
      -- keep >50m dist from buildings
-      if coord:Get3DDistance(rcoord) > dist then
-        found = true
-      else
+      if zone:IsPointVec2InZone(rcoord) then
        found = false
+        break
      end
    end
    if found then 
@@ -1488,15 +1647,43 @@ function ZONE_RADIUS:GetRandomCoordinateWithoutBuildings(inner,outer,distance,ma
    end
  end
  
+  if not found then
+    -- max 1000 tries
+    local rcoord = nil  
+    local found = true
+    local iterations = 0
+  
+    for i=1,1000 do
+      iterations = iterations + 1
+      rcoord = self:GetRandomCoordinate(inner,outer)
+      found = true
+      for _,_coord in pairs (buildings) do
+        local coord = _coord -- Core.Point#COORDINATE
+        -- keep >50m dist from buildings
+        if coord:Get3DDistance(rcoord) < dist then
+          found = false
+        end
+      end
+      if found then 
+        -- we have a winner!
+        if markfinal then
+          MARKER:New(rcoord,"FREE"):ToAll()
+        end
+        break 
+      end
+    end
+  end
+  
  T1=timer.getTime()
  
-  self:T(string.format("Found a coordinate: %s | Iterations: %d | Time: %d",tostring(found),iterations,T1-T0))
+  self:T(string.format("Found a coordinate: %s | Iterations: %d | Time: %.3f",tostring(found),iterations,T1-T0))
  
  if found then return rcoord else return nil end
  
 end

--- @type ZONE
+---
+-- @type ZONE
 -- @extends #ZONE_RADIUS


@@ -1580,8 +1767,8 @@ function ZONE:FindByName( ZoneName )
 end


-
--- @type ZONE_UNIT
+---
+-- @type ZONE_UNIT
 -- @field Wrapper.Unit#UNIT ZoneUNIT
 -- @extends Core.Zone#ZONE_RADIUS

@@ -1616,7 +1803,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 +1815,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
@@ -1721,7 +1910,8 @@ function ZONE_UNIT:GetVec3( Height )
  return Vec3
 end

--- @type ZONE_GROUP
+---
+-- @type ZONE_GROUP
 -- @extends #ZONE_RADIUS


@@ -1807,7 +1997,8 @@ function ZONE_GROUP:GetRandomPointVec2( inner, outer )
 end


--- @type ZONE_POLYGON_BASE
+---
+-- @type ZONE_POLYGON_BASE
 -- @field #ZONE_POLYGON_BASE.ListVec2 Polygon The polygon defined by an array of @{DCS#Vec2}.
 -- @extends #ZONE_BASE

@@ -2456,7 +2647,8 @@ function ZONE_POLYGON_BASE:Boundary(Coalition, Color, Radius, Alpha, Segments, C
    return self
 end

--- @type ZONE_POLYGON
+---
+-- @type ZONE_POLYGON
 -- @extends #ZONE_POLYGON_BASE


@@ -2584,7 +2776,7 @@ function ZONE_POLYGON:Scan( ObjectCategories, UnitCategories )
  local minmarkcoord = COORDINATE:NewFromVec3(minVec3)
  local maxmarkcoord = COORDINATE:NewFromVec3(maxVec3)
  local ZoneRadius = minmarkcoord:Get2DDistance(maxmarkcoord)/2
-  
+--  self:I("Scan Radius:" ..ZoneRadius)
  local CenterVec3 = self:GetCoordinate():GetVec3()
  
 --[[ this a bit shaky in functionality it seems
@@ -2907,7 +3099,7 @@ end

 do -- ZONE_ELASTIC

-  --- @type ZONE_ELASTIC
+  -- @type ZONE_ELASTIC
  -- @field #table points Points in 2D.
  -- @field #table setGroups Set of GROUPs.
  -- @field #table setOpsGroups Set of OPSGROUPS.
@@ -3107,7 +3299,7 @@ end

 do -- ZONE_AIRBASE

-  --- @type ZONE_AIRBASE
+  -- @type ZONE_AIRBASE
  -- @field #boolean isShip If `true`, airbase is a ship.
  -- @field #boolean isHelipad If `true`, airbase is a helipad.
  -- @field #boolean isAirdrome If `true`, airbase is an airdrome.
--- a/Development/Moose/DCS.lua
+++ b/Development/Moose/DCS.lua
@@ -135,6 +135,22 @@ do -- env
  
 end -- env

+do -- radio
+
+  ---@type radio
+  -- @field #radio.modulation modulation
+  
+  ---
+  -- @type radio.modulation
+  -- @field AM
+  -- @field FM
+  
+  radio = {}
+  radio.modulation = {}
+  radio.modulation.AM = 0  
+  radio.modulation.FM = 1
+  
+end

 do -- timer

@@ -329,11 +345,11 @@ end -- country

 do -- Command

-  --- @type Command
+  -- @type Command
  -- @field #string id
  -- @field #Command.params params
  
-  --- @type Command.params
+  -- @type Command.params

 end -- Command

@@ -374,7 +390,7 @@ end -- coalition

 do -- Types

-  --- @type Desc
+  -- @type Desc
  -- @field #number speedMax0 Max speed in meters/second at zero altitude.
  -- @field #number massEmpty Empty mass in kg.
  -- @field #number tankerType Type of refueling system: 0=boom, 1=probe.
@@ -471,16 +487,16 @@ do -- Types
  -- @type AttributeNameArray 
  -- @list <#AttributeName>

-  --- @type Zone
+  -- @type Zone
  -- @field DCSVec3#Vec3 point
  -- @field #number radius

  Zone = {}

-  --- @type ModelTime
+  -- @type ModelTime
  -- @extends #number
  
-  --- @type Time
+  -- @type Time
  -- @extends #number
  
  --- A task descriptor (internal structure for DCS World). See [https://wiki.hoggitworld.com/view/Category:Tasks](https://wiki.hoggitworld.com/view/Category:Tasks).
@@ -489,7 +505,7 @@ do -- Types
  -- @field #string id
  -- @field #Task.param param
  
-  --- @type Task.param
+  -- @type Task.param
  
  --- List of @{#Task}
  -- @type TaskArray
@@ -536,7 +552,7 @@ do -- Object
  -- @field SCENERY
  -- @field CARGO
  
-  --- @type Object.Desc
+  -- @type Object.Desc
  -- @extends #Desc
  -- @field #number life initial life level
  -- @field #Box3 box bounding box of collision geometry
@@ -793,11 +809,118 @@ do -- Airbase
  -- @function [parent=#Airbase] getDesc
  -- @param self
  -- @return #Airbase.Desc
-  
+
+  --- Returns the warehouse object associated with the airbase object. Can then be used to call the warehouse class functions to modify the contents of the warehouse.
+  -- @function [parent=#Airbase] getWarehouse
+  -- @param self
+  -- @return #Warehouse The DCS warehouse object of this airbase.
+
+  --- Enables or disables the airbase and FARP auto capture game mechanic where ownership of a base can change based on the presence of ground forces or the 
+  -- default setting assigned in the editor.
+  -- @function [parent=#Airbase] autoCapture
+  -- @param self
+  -- @param #boolean setting `true` : enables autoCapture behavior, `false` : disables autoCapture behavior
+
+  --- Returns the current autoCapture setting for the passed base.
+  -- @function [parent=#Airbase] autoCaptureIsOn
+  -- @param self
+  -- @return #boolean `true` if autoCapture behavior is enabled and `false` otherwise.
+
+  --- Changes the passed airbase object's coalition to the set value. Must be used with Airbase.autoCapture to disable auto capturing of the base, 
+  -- otherwise the base can revert back to a different coalition depending on the situation and built in game capture rules.
+  -- @function [parent=#Airbase] setCoalition
+  -- @param self
+  -- @param #number coa The new owner coalition: 0=neutra, 1=red, 2=blue.
+
+  --- Returns the wsType of every object that exists in DCS. A wsType is a table consisting of 4 entries indexed numerically. 
+  -- It can be used to broadly categorize object types. The table can be broken down as: {mainCategory, subCat1, subCat2, index}
+  -- @function [parent=#Airbase] getResourceMap
+  -- @param self
+  -- @return #table wsType of every object that exists in DCS.
+
  Airbase = {} --#Airbase

 end -- Airbase

+
+do -- Warehouse
+
+  --- [DCS Class Warehouse](https://wiki.hoggitworld.com/view/DCS_Class_Warehouse)
+  -- The warehouse class gives control over warehouses that exist in airbase objects. These warehouses can limit the aircraft, munitions, and fuel available to coalition aircraft.
+  -- @type Warehouse
+
+  
+  --- Get a warehouse by passing its name.
+  -- @function [parent=#Warehouse] getByName
+  -- @param #string Name Name of the warehouse.
+  -- @return #Warehouse The warehouse object.
+
+  --- Adds the passed amount of a given item to the warehouse.
+  -- itemName is the typeName associated with the item: "weapons.missiles.AIM_54C_Mk47"
+  -- A wsType table can also be used, however the last digit with wsTypes has been known to change. {4, 4, 7, 322}
+  -- @function [parent=#Warehouse] addItem
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @param #number count Number of items to add.
+
+  --- Returns the number of the passed type of item currently in a warehouse object.
+  -- @function [parent=#Warehouse] getItemCount
+  -- @param self
+  -- @param #string itemName Name of the item.
+
+  --- Sets the passed amount of a given item to the warehouse.
+  -- @function [parent=#Warehouse] setItem
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @param #number count Number of items to add.
+
+  --- Removes the amount of the passed item from the warehouse.
+  -- @function [parent=#Warehouse] removeItem
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @param #number count Number of items to be removed.
+
+  --- Adds the passed amount of a liquid fuel into the warehouse inventory.
+  -- @function [parent=#Warehouse] addLiquid
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @param #number count Amount of liquid to add.
+
+  --- Returns the amount of the passed liquid type within a given warehouse.
+  -- @function [parent=#Warehouse] getLiquidAmount
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @return #number Amount of liquid.
+
+  --- Sets the passed amount of a liquid fuel into the warehouse inventory.
+  -- @function [parent=#Warehouse] setLiquidAmount
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @param #number count Amount of liquid.
+
+  --- Removes the set amount of liquid from the inventory in a warehouse.
+  -- @function [parent=#Warehouse] setLiquidAmount
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @param #number count Amount of liquid.
+
+  --- Returns the airbase object associated with the warehouse object.
+  -- @function [parent=#Warehouse] getOwner
+  -- @param self
+  -- @return #Airbase The airbase object owning this warehouse.
+
+  --- Returns a full itemized list of everything currently in a warehouse. If a category is set to unlimited then the table will be returned empty.
+  -- Aircraft and weapons are indexed by strings. Liquids are indexed by number.
+  -- @function [parent=#Warehouse] getInventory
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @return #table Itemized list of everything currently in a warehouse
+
+
+  Warehouse = {} --#Warehouse 
+
+end
+
 do -- Spot

  --- [DCS Class Spot](https://wiki.hoggitworld.com/view/DCS_Class_Spot)
@@ -860,7 +983,7 @@ do -- Spot
 end -- Spot

 do -- Controller
-  --- Controller is an object that performs A.I.-routines. Other words controller is an instance of A.I.. Controller stores current main task, active enroute tasks and behavior options. Controller performs commands. Please, read DCS A-10C GUI Manual EN.pdf chapter "Task Planning for Unit Groups", page 91 to understand A.I. system of DCS:A-10C. 
+  --- Controller is an object that performs A.I.-tasks. Other words controller is an instance of A.I.. Controller stores current main task, active enroute tasks and behavior options. Controller performs commands. Please, read DCS A-10C GUI Manual EN.pdf chapter "Task Planning for Unit Groups", page 91 to understand A.I. system of DCS:A-10C. 
  -- 
  -- This class has 2 types of functions:
  -- 
@@ -978,7 +1101,7 @@ end -- Controller

 do -- Unit

-  --- @type Unit
+  -- @type Unit
  -- @extends #CoalitionObject
  -- @field ID Identifier of an unit. It assigned to an unit by the Mission Editor automatically. 
  -- @field #Unit.Category Category
@@ -1093,15 +1216,18 @@ do -- Unit
  -- @field #Distance detectionDistanceHRM detection distance for RCS=1m^2 in high-resolution mapping mode, nil if radar has no HRM
  -- @field #Unit.Radar.detectionDistanceAir detectionDistanceAir detection distance for RCS=1m^2 airborne target, nil if radar doesn't support air search
  
-  --- @type Unit.Radar.detectionDistanceAir 
+  --- A radar.
+  -- @type Unit.Radar.detectionDistanceAir 
  -- @field #Unit.Radar.detectionDistanceAir.upperHemisphere upperHemisphere
  -- @field #Unit.Radar.detectionDistanceAir.lowerHemisphere lowerHemisphere
  
-  --- @type Unit.Radar.detectionDistanceAir.upperHemisphere
+  --- A radar.
+  -- @type Unit.Radar.detectionDistanceAir.upperHemisphere
  -- @field #Distance headOn
  -- @field #Distance tailOn
  
-  --- @type Unit.Radar.detectionDistanceAir.lowerHemisphere 
+  --- A radar.
+  -- @type Unit.Radar.detectionDistanceAir.lowerHemisphere 
  -- @field #Distance headOn
  -- @field #Distance tailOn
  
@@ -1403,22 +1529,26 @@ do -- AI
  -- @field IR_POINTER
  -- @field LASER
  
-  --- @type AI.Task.WaypointType
+  ---
+  -- @type AI.Task.WaypointType
  -- @field TAKEOFF
  -- @field TAKEOFF_PARKING
  -- @field TURNING_POINT
  -- @field TAKEOFF_PARKING_HOT
  -- @field LAND
  
-  --- @type AI.Task.TurnMethod
+  ---
+  -- @type AI.Task.TurnMethod
  -- @field FLY_OVER_POINT
  -- @field FIN_POINT
  
-  --- @type AI.Task.AltitudeType
+  ---
+  -- @type AI.Task.AltitudeType
  -- @field BARO
  -- @field RADIO
  
-  --- @type AI.Task.VehicleFormation
+  ---
+  -- @type AI.Task.VehicleFormation
  -- @field OFF_ROAD
  -- @field ON_ROAD
  -- @field RANK
@@ -1428,27 +1558,30 @@ do -- AI
  -- @field ECHELON_LEFT
  -- @field ECHELON_RIGHT
  
-  --- @type AI.Option
+  ---
+  -- @type AI.Option
  -- @field #AI.Option.Air                          Air
  -- @field #AI.Option.Ground                       Ground
  -- @field #AI.Option.Naval                        Naval
  
-  --- @type AI.Option.Air
+  ---
+  -- @type AI.Option.Air
  -- @field #AI.Option.Air.id                       id
  -- @field #AI.Option.Air.val                      val
  
-  --- @type AI.Option.Ground
+  ---
+  -- @type AI.Option.Ground
  -- @field #AI.Option.Ground.id                    id
  -- @field #AI.Option.Ground.val                   val
  -- @field #AI.Option.Ground.mid                   mid
  -- @field #AI.Option.Ground.mval                  mval
  -- 
-  --- @type AI.Option.Naval
+  -- @type AI.Option.Naval
  -- @field #AI.Option.Naval.id                     id
  -- @field #AI.Option.Naval.val                    val
 
- 
-  --- @type AI.Option.Air.id
+  ---
+  -- @type AI.Option.Air.id
  -- @field NO_OPTION
  -- @field ROE
  -- @field REACTION_ON_THREAT
@@ -1470,73 +1603,61 @@ do -- AI
  -- @field OPTION_RADIO_USAGE_KILL
  -- @field JETT_TANKS_IF_EMPTY
  -- @field FORCED_ATTACK
-  
-  --- @type AI.Option.Air.id.FORMATION
-  -- @field LINE_ABREAST
-  -- @field TRAIL
-  -- @field WEDGE
-  -- @field ECHELON_RIGHT
-  -- @field ECHELON_LEFT
-  -- @field FINGER_FOUR
-  -- @field SPREAD_FOUR
-  -- @field WW2_BOMBER_ELEMENT
-  -- @field WW2_BOMBER_ELEMENT_HEIGHT
-  -- @field WW2_FIGHTER_VIC
-  -- @field HEL_WEDGE
-  -- @field HEL_ECHELON
-  -- @field HEL_FRONT
-  -- @field HEL_COLUMN
-  -- @field COMBAT_BOX
-  -- @field JAVELIN_DOWN

-  
-  --- @type AI.Option.Air.val
+  ---
+  -- @type AI.Option.Air.val
  -- @field #AI.Option.Air.val.ROE ROE
  -- @field #AI.Option.Air.val.REACTION_ON_THREAT REACTION_ON_THREAT
  -- @field #AI.Option.Air.val.RADAR_USING RADAR_USING
  -- @field #AI.Option.Air.val.FLARE_USING FLARE_USING
  
-  --- @type AI.Option.Air.val.ROE
+  ---
+  -- @type AI.Option.Air.val.ROE
  -- @field WEAPON_FREE
  -- @field OPEN_FIRE_WEAPON_FREE
  -- @field OPEN_FIRE
  -- @field RETURN_FIRE
  -- @field WEAPON_HOLD
-   
-  --- @type AI.Option.Air.val.REACTION_ON_THREAT
+  
+  --- 
+  -- @type AI.Option.Air.val.REACTION_ON_THREAT
  -- @field NO_REACTION
  -- @field PASSIVE_DEFENCE
  -- @field EVADE_FIRE
  -- @field BYPASS_AND_ESCAPE
  -- @field ALLOW_ABORT_MISSION
  
-  --- @type AI.Option.Air.val.RADAR_USING
+  ---
+  -- @type AI.Option.Air.val.RADAR_USING
  -- @field NEVER
  -- @field FOR_ATTACK_ONLY
  -- @field FOR_SEARCH_IF_REQUIRED
  -- @field FOR_CONTINUOUS_SEARCH
  
-  --- @type AI.Option.Air.val.FLARE_USING
+  ---
+  -- @type AI.Option.Air.val.FLARE_USING
  -- @field NEVER
  -- @field AGAINST_FIRED_MISSILE
  -- @field WHEN_FLYING_IN_SAM_WEZ
  -- @field WHEN_FLYING_NEAR_ENEMIES
-
-  --- @type AI.Option.Air.val.ECM_USING
+  
+  ---
+  -- @type AI.Option.Air.val.ECM_USING
  -- @field NEVER_USE
  -- @field USE_IF_ONLY_LOCK_BY_RADAR
  -- @field USE_IF_DETECTED_LOCK_BY_RADAR
  -- @field ALWAYS_USE
-
-  --- @type AI.Option.Air.val.MISSILE_ATTACK
+  
+  ---
+  -- @type AI.Option.Air.val.MISSILE_ATTACK
  -- @field MAX_RANGE
  -- @field NEZ_RANGE
  -- @field HALF_WAY_RMAX_NEZ
  -- @field TARGET_THREAT_EST
  -- @field RANDOM_RANGE

-  
-  --- @type AI.Option.Ground.id
+  ---
+  -- @type AI.Option.Ground.id
  -- @field NO_OPTION
  -- @field ROE @{#AI.Option.Ground.val.ROE}
  -- @field FORMATION
@@ -1545,42 +1666,51 @@ do -- AI
  -- @field ENGAGE_AIR_WEAPONS
  -- @field AC_ENGAGEMENT_RANGE_RESTRICTION
  
-  --- @type AI.Option.Ground.mid -- Moose added
+  ---
+  -- @type AI.Option.Ground.mid -- Moose added
  -- @field RESTRICT_AAA_MIN        27
  -- @field RESTRICT_AAA_MAX        29
  -- @field RESTRICT_TARGETS @{#AI.Option.Ground.mval.ENGAGE_TARGETS}  28
  
-  --- @type AI.Option.Ground.val
+  ---
+  -- @type AI.Option.Ground.val
  -- @field #AI.Option.Ground.val.ROE               ROE
  -- @field #AI.Option.Ground.val.ALARM_STATE       ALARM_STATE
  -- @field #AI.Option.Ground.val.ENGAGE_TARGETS    RESTRICT_TARGETS
  
-  --- @type AI.Option.Ground.val.ROE
+  ---
+  -- @type AI.Option.Ground.val.ROE
  -- @field OPEN_FIRE
  -- @field RETURN_FIRE
  -- @field WEAPON_HOLD
  
-  --- @type AI.Option.Ground.mval -- Moose added
+  ---
+  -- @type AI.Option.Ground.mval -- Moose added
  -- @field #AI.Option.Ground.mval.ENGAGE_TARGETS   ENGAGE_TARGETS
  
-  --- @type AI.Option.Ground.mval.ENGAGE_TARGETS -- Moose added
+  ---
+  -- @type AI.Option.Ground.mval.ENGAGE_TARGETS -- Moose added
  -- @field ANY_TARGET -- 0
  -- @field AIR_UNITS_ONLY -- 1
  -- @field GROUND_UNITS_ONLY -- 2
  
-  --- @type AI.Option.Ground.val.ALARM_STATE
+  ---
+  -- @type AI.Option.Ground.val.ALARM_STATE
  -- @field AUTO
  -- @field GREEN
  -- @field RED
  
-  --- @type AI.Option.Naval.id
+  ---
+  -- @type AI.Option.Naval.id
  -- @field NO_OPTION
  -- @field ROE
  
-  --- @type AI.Option.Naval.val
+  ---
+  -- @type AI.Option.Naval.val
  -- @field #AI.Option.Naval.val.ROE ROE
  
-  --- @type AI.Option.Naval.val.ROE
+  ---
+  -- @type AI.Option.Naval.val.ROE
  -- @field OPEN_FIRE
  -- @field RETURN_FIRE
  -- @field WEAPON_HOLD
--- a/Development/Moose/Functional/AICSAR.lua
+++ b/Development/Moose/Functional/AICSAR.lua
--- a/Development/Moose/Functional/AmmoTruck.lua
+++ b/Development/Moose/Functional/AmmoTruck.lua
@@ -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
--- a/Development/Moose/Functional/Artillery.lua
+++ b/Development/Moose/Functional/Artillery.lua
@@ -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.
--- a/Development/Moose/Functional/Autolase.lua
+++ b/Development/Moose/Functional/Autolase.lua
--- a/Development/Moose/Functional/Detection.lua
+++ b/Development/Moose/Functional/Detection.lua
@@ -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 )
--- a/Development/Moose/Functional/Escort.lua
+++ b/Development/Moose/Functional/Escort.lua
@@ -108,8 +108,8 @@
 -- @image Escorting.JPG


-
--- @type ESCORT
+---
+-- @type ESCORT
 -- @extends Core.Base#BASE
 -- @field Wrapper.Client#CLIENT EscortClient
 -- @field Wrapper.Group#GROUP EscortGroup
@@ -600,7 +600,7 @@ function ESCORT:MenuReportTargets( Seconds )
  self.EscortMenuAttackNearbyTargets = MENU_GROUP:New( self.EscortClient:GetGroup(), "Attack targets", self.EscortMenu )


-  self.ReportTargetsScheduler = SCHEDULER:New( self, self._ReportTargetsScheduler, {}, 1, Seconds )
+  self.ReportTargetsScheduler, self.ReportTargetsSchedulerID = SCHEDULER:New( self, self._ReportTargetsScheduler, {}, 1, Seconds )

  return self
 end
@@ -693,7 +693,7 @@ function ESCORT:MenuResumeMission()
 end


--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_HoldPosition( OrbitGroup, OrbitHeight, OrbitSeconds )

  local EscortGroup = self.EscortGroup
@@ -733,7 +733,7 @@ function ESCORT:_HoldPosition( OrbitGroup, OrbitHeight, OrbitSeconds )

 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_JoinUpAndFollow( Distance )

  local EscortGroup = self.EscortGroup
@@ -766,7 +766,7 @@ function ESCORT:JoinUpAndFollow( EscortGroup, EscortClient, Distance )
  EscortGroup:MessageToClient( "Rejoining and Following at " .. Distance .. "!", 30, EscortClient )
 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_Flare( Color, Message )

  local EscortGroup = self.EscortGroup
@@ -776,7 +776,7 @@ function ESCORT:_Flare( Color, Message )
  EscortGroup:MessageToClient( Message, 10, EscortClient )
 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_Smoke( Color, Message )

  local EscortGroup = self.EscortGroup
@@ -787,7 +787,7 @@ function ESCORT:_Smoke( Color, Message )
 end


--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_ReportNearbyTargetsNow()

  local EscortGroup = self.EscortGroup
@@ -809,12 +809,12 @@ function ESCORT:_SwitchReportNearbyTargets( ReportTargets )
      self.ReportTargetsScheduler:Schedule( self, self._ReportTargetsScheduler, {}, 1, 30 )
    end
  else
-    routines.removeFunction( self.ReportTargetsScheduler )
+    self.ReportTargetsScheduler:Remove(self.ReportTargetsSchedulerID)
    self.ReportTargetsScheduler = nil
  end
 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_ScanTargets( ScanDuration )

  local EscortGroup = self.EscortGroup -- Wrapper.Group#GROUP
@@ -844,7 +844,7 @@ function ESCORT:_ScanTargets( ScanDuration )

 end

--- @param Wrapper.Group#GROUP EscortGroup
+-- @param Wrapper.Group#GROUP EscortGroup
 function _Resume( EscortGroup )
  env.info( '_Resume' )

@@ -856,7 +856,7 @@ function _Resume( EscortGroup )

 end

--- @param #ESCORT self
+-- @param #ESCORT self
 -- @param Functional.Detection#DETECTION_BASE.DetectedItem DetectedItem
 function ESCORT:_AttackTarget( DetectedItem )

@@ -877,7 +877,7 @@ function ESCORT:_AttackTarget( DetectedItem )
    local Tasks = {}

    DetectedSet:ForEachUnit(
-      --- @param Wrapper.Unit#UNIT DetectedUnit
+      -- @param Wrapper.Unit#UNIT DetectedUnit
      function( DetectedUnit, Tasks )
        if DetectedUnit:IsAlive() then
          Tasks[#Tasks+1] = EscortGroup:TaskAttackUnit( DetectedUnit )
@@ -900,7 +900,7 @@ function ESCORT:_AttackTarget( DetectedItem )
    local Tasks = {}

    DetectedSet:ForEachUnit(
-      --- @param Wrapper.Unit#UNIT DetectedUnit
+      -- @param Wrapper.Unit#UNIT DetectedUnit
      function( DetectedUnit, Tasks )
        if DetectedUnit:IsAlive() then
          Tasks[#Tasks+1] = EscortGroup:TaskFireAtPoint( DetectedUnit:GetVec2(), 50 )
@@ -921,7 +921,7 @@ function ESCORT:_AttackTarget( DetectedItem )
 end

 --- 
--- @param #ESCORT self
+-- @param #ESCORT self
 -- @param Functional.Detection#DETECTION_BASE.DetectedItem DetectedItem
 function ESCORT:_AssistTarget( EscortGroupAttack, DetectedItem )

@@ -939,7 +939,7 @@ function ESCORT:_AssistTarget( EscortGroupAttack, DetectedItem )
    local Tasks = {}

    DetectedSet:ForEachUnit(
-      --- @param Wrapper.Unit#UNIT DetectedUnit
+      -- @param Wrapper.Unit#UNIT DetectedUnit
      function( DetectedUnit, Tasks )
        if DetectedUnit:IsAlive() then
          Tasks[#Tasks+1] = EscortGroupAttack:TaskAttackUnit( DetectedUnit )
@@ -961,7 +961,7 @@ function ESCORT:_AssistTarget( EscortGroupAttack, DetectedItem )
    local Tasks = {}

    DetectedSet:ForEachUnit(
-      --- @param Wrapper.Unit#UNIT DetectedUnit
+      -- @param Wrapper.Unit#UNIT DetectedUnit
      function( DetectedUnit, Tasks )
        if DetectedUnit:IsAlive() then
          Tasks[#Tasks+1] = EscortGroupAttack:TaskFireAtPoint( DetectedUnit:GetVec2(), 50 )
@@ -981,7 +981,7 @@ function ESCORT:_AssistTarget( EscortGroupAttack, DetectedItem )

 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_ROE( EscortROEFunction, EscortROEMessage )

  local EscortGroup = self.EscortGroup
@@ -991,7 +991,7 @@ function ESCORT:_ROE( EscortROEFunction, EscortROEMessage )
  EscortGroup:MessageToClient( EscortROEMessage, 10, EscortClient )
 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_ROT( EscortROTFunction, EscortROTMessage )

  local EscortGroup = self.EscortGroup
@@ -1001,7 +1001,7 @@ function ESCORT:_ROT( EscortROTFunction, EscortROTMessage )
  EscortGroup:MessageToClient( EscortROTMessage, 10, EscortClient )
 end

--- @param #MENUPARAM MenuParam
+-- @param #MENUPARAM MenuParam
 function ESCORT:_ResumeMission( WayPoint )

  local EscortGroup = self.EscortGroup
@@ -1036,7 +1036,7 @@ function ESCORT:RegisterRoute()
  return TaskPoints
 end

--- @param Functional.Escort#ESCORT self
+-- @param Functional.Escort#ESCORT self
 function ESCORT:_FollowScheduler()
  self:F( { self.FollowDistance } )

--- a/Development/Moose/Functional/Fox.lua
+++ b/Development/Moose/Functional/Fox.lua
@@ -113,14 +113,9 @@
 --     -- Start missile trainer.
 --     fox:Start()
 -- 
-- # Fine Tuning
-- 
-- Todo!
-- 
-- # Special Events
-- 
-- Todo!
+-- # Notes
 -- 
+-- The script needs to be running before you enter an airplane slot. If FOX is not available to you, go back to observers and then join a slot again.
 -- 
 -- @field #FOX
 FOX = {
--- a/Development/Moose/Functional/Mantis.lua
+++ b/Development/Moose/Functional/Mantis.lua
@@ -22,7 +22,7 @@
 -- @module Functional.Mantis
 -- @image Functional.Mantis.jpg
 --
-- Last Update: Oct 2022
+-- Last Update: Sept 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,37 @@ 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" },
+ ["LAV-AD CH"] = { Range=8, Blindspot=0.2, Height=4.8, Type="Short", Radar="CH_LAVAD" }, 
+ ["HQ-22 CH"] = { Range=170, Blindspot=5, Height=27, Type="Long", Radar="CH_HQ22_LN" }, 
+}
+
 -----------------------------------------------------------------------
 -- MANTIS System
 -----------------------------------------------------------------------
@@ -431,6 +467,7 @@ do
  --@param #string awacs Group name of your Awacs (optional)
  --@param #boolean EmOnOff Make MANTIS switch Emissions on and off instead of changing the alarm state between RED and GREEN (optional)
  --@param #number Padding For #SEAD - Extra number of seconds to add to radar switch-back-on time (optional)
+  --@param #table Zones Table of Core.Zone#ZONE Zones Consider SAM groups in this zone(s) only for this MANTIS instance, must be handed as #table of Zone objects
  --@return #MANTIS self
  --@usage Start up your MANTIS with a basic setting
  --
@@ -449,7 +486,7 @@ do
  --        mybluemantis = MANTIS:New("bluemantis","Blue SAM","Blue EWR",nil,"blue",false,"Blue Awacs")
  --        mybluemantis:Start()
  --
-  function MANTIS:New(name,samprefix,ewrprefix,hq,coalition,dynamic,awacs, EmOnOff, Padding)
+  function MANTIS:New(name,samprefix,ewrprefix,hq,coalition,dynamic,awacs, EmOnOff, Padding, Zones)

    -- DONE: Create some user functions for these
    -- DONE: Make HQ useful
@@ -510,6 +547,7 @@ do
    self.maxclassic = 6
    self.autoshorad = true
    self.ShoradGroupSet = SET_GROUP:New() -- Core.Set#SET_GROUP
+    self.FilterZones = Zones
    
    self.UseEmOnOff = true
    if EmOnOff == false then
@@ -559,16 +597,23 @@ do
    
    self:T({self.ewr_templates})
    
+    self.SAM_Group = SET_GROUP:New():FilterPrefixes(self.SAM_Templates_Prefix):FilterCoalitions(self.Coalition)
+    self.EWR_Group = SET_GROUP:New():FilterPrefixes(self.ewr_templates):FilterCoalitions(self.Coalition)
+    
+    if self.FilterZones then
+      self.SAM_Group:FilterZones(self.FilterZones)
+    end
+    
    if self.dynamic then
      -- Set SAM SET_GROUP
-      self.SAM_Group = SET_GROUP:New():FilterPrefixes(self.SAM_Templates_Prefix):FilterCoalitions(self.Coalition):FilterStart()
+      self.SAM_Group:FilterStart()
      -- Set EWR SET_GROUP
-      self.EWR_Group = SET_GROUP:New():FilterPrefixes(self.ewr_templates):FilterCoalitions(self.Coalition):FilterStart()
+      self.EWR_Group:FilterStart()
    else
      -- Set SAM SET_GROUP
-      self.SAM_Group = SET_GROUP:New():FilterPrefixes(self.SAM_Templates_Prefix):FilterCoalitions(self.Coalition):FilterOnce()
+      self.SAM_Group:FilterOnce()
      -- Set EWR SET_GROUP
-      self.EWR_Group = SET_GROUP:New():FilterPrefixes(self.ewr_templates):FilterCoalitions(self.Coalition):FilterOnce()
+      self.EWR_Group:FilterOnce()
    end

    -- set up CC
@@ -578,7 +623,7 @@ do
    
    -- TODO Version
    -- @field #string version
-    self.version="0.8.9"
+    self.version="0.8.14"
    self:I(string.format("***** Starting MANTIS Version %s *****", self.version))

    --- FSM Functions ---
@@ -1299,11 +1344,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 +1364,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 +1412,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 +1437,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
--- a/Development/Moose/Functional/MissileTrainer.lua
+++ b/Development/Moose/Functional/MissileTrainer.lua
@@ -50,6 +50,11 @@
 --     * **100 meter**: Destroys the missile when the distance to the aircraft is below or equal to 100 meter.
 --     * **150 meter**: Destroys the missile when the distance to the aircraft is below or equal to 150 meter.
 --     * **200 meter**: Destroys the missile when the distance to the aircraft is below or equal to 200 meter.
+--     
+-- # Developer Note
+-- 
+-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE.
+-- Therefore, this class is considered to be deprecated and superseded by the [Functional.Fox](https://flightcontrol-master.github.io/MOOSE_DOCS_DEVELOP/Documentation/Functional.Fox.html) class, which provides the same functionality.
 --
 -- ===
 --
@@ -67,8 +72,8 @@
 -- @module Functional.MissileTrainer
 -- @image Missile_Trainer.JPG

-
--- @type MISSILETRAINER
+---
+-- @type MISSILETRAINER
 -- @field Core.Set#SET_CLIENT DBClients
 -- @extends Core.Base#BASE

@@ -97,6 +102,11 @@
 --  * @{#MISSILETRAINER.InitRangeOnOff}: Sets by default the display of range information of missiles ON of OFF.
 --  * @{#MISSILETRAINER.InitBearingOnOff}: Sets by default the display of bearing information of missiles ON of OFF.
 --  * @{#MISSILETRAINER.InitMenusOnOff}: Allows to configure the options through the radio menu.
+--  
+-- # Developer Note
+-- 
+-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE.
+-- Therefore, this class is considered to be deprecated and superseded by the [Functional.Fox](https://flightcontrol-master.github.io/MOOSE_DOCS_DEVELOP/Documentation/Functional.Fox.html) class, which provides the same functionality.
 --
 -- @field #MISSILETRAINER
 MISSILETRAINER = {
@@ -205,7 +215,7 @@ function MISSILETRAINER:New( Distance, Briefing )


 --  	self.DB:ForEachClient(
--  	 --- @param Wrapper.Client#CLIENT Client
+--  	 -- @param Wrapper.Client#CLIENT Client
 --  	 function( Client )
 --
 --        ... actions ...
@@ -555,7 +565,7 @@ function MISSILETRAINER:_AddBearing( Client, TrainerWeapon )

    local DirectionVector = { x = PositionMissile.x - TargetVec3.x, y = PositionMissile.y - TargetVec3.y, z = PositionMissile.z - TargetVec3.z }
    local DirectionRadians = math.atan2( DirectionVector.z, DirectionVector.x )
-    --DirectionRadians = DirectionRadians + routines.getNorthCorrection( PositionTarget )
+
    if DirectionRadians < 0 then
      DirectionRadians = DirectionRadians + 2 * math.pi
    end
--- a/Development/Moose/Functional/Movement.lua
+++ b/Development/Moose/Functional/Movement.lua
@@ -10,7 +10,8 @@
 -- @module Functional.Movement
 -- @image MOOSE.JPG

--- @type MOVEMENT
+---
+-- @type MOVEMENT
 -- @extends Core.Base#BASE

 ---
@@ -55,7 +56,6 @@ end
 --- Call this function to start the MOVEMENT scheduling.
 function MOVEMENT:ScheduleStart()
 	self:F()
-	--self.MoveFunction = routines.scheduleFunction( self._Scheduler, { self }, timer.getTime() + 1, 120 )
  self.MoveFunction = SCHEDULER:New( self, self._Scheduler, {}, 1, 120 )
 end

--- a/Development/Moose/Functional/RAT.lua
+++ b/Development/Moose/Functional/RAT.lua
@@ -3483,7 +3483,7 @@ function RAT:Status(message, forID)
    -- Get group.
    local group=ratcraft.group  --Wrapper.Group#GROUP

-    if group and group:IsAlive() then
+    if group and group:IsAlive() and (group:GetCoordinate() or group:GetVec3()) then
      nalive=nalive+1

      -- Gather some information.
@@ -3491,8 +3491,11 @@ function RAT:Status(message, forID)
      local life=self:_GetLife(group)
      local fuel=group:GetFuel()*100.0
      local airborne=group:InAir()
-      local coords=group:GetCoordinate()
-      local alt=coords.y or 1000
+      local coords=group:GetCoordinate() or group:GetVec3()
+      local alt=1000
+      if coords then
+        alt=coords.y or 1000
+      end  
      --local vel=group:GetVelocityKMH()
      local departure=ratcraft.departure:GetName()
      local destination=ratcraft.destination:GetName()
@@ -5490,7 +5493,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 +5674,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 +5719,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 +5835,7 @@ RATMANAGER={
  rat={},
  name={},
  alive={},
+  planned={},
  min={},
  nrat=0,
  ntot=nil,
@@ -5880,6 +5884,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 +6025,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 +6072,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 +6102,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 +6122,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 +6154,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 +6169,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)
--- a/Development/Moose/Functional/Range.lua
+++ b/Development/Moose/Functional/Range.lua
@@ -591,7 +591,7 @@ RANGE.MenuF10Root = nil

 --- Range script version.
 -- @field #string version
-RANGE.version = "2.7.0"
+RANGE.version = "2.7.1"

 -- TODO list:
 -- TODO: Verbosity level for messages.
@@ -2044,6 +2044,7 @@ function RANGE:OnEventShot( EventData )
    -- Attack parameters.
    local attackHdg=_unit:GetHeading()
    local attackAlt=_unit:GetHeight()
+    attackAlt = UTILS.MetersToFeet(attackAlt)
    local attackVel=_unit:GetVelocityKNOTS()    

    -- Tracking info and init of last bomb position.
--- a/Development/Moose/Functional/Scoring.lua
+++ b/Development/Moose/Functional/Scoring.lua
@@ -226,6 +226,7 @@ SCORING = {
  ClassID = 0,
  Players = {},
  AutoSave = true,
+  version = "1.17.1"
 }

 local _SCORINGCoalition = {
@@ -659,7 +660,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
        self.Players[PlayerName].Penalty = self.Players[PlayerName].Penalty + self.CoalitionChangePenalty or 50
        self.Players[PlayerName].PenaltyCoalition = self.Players[PlayerName].PenaltyCoalition + 1
        MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' changed coalition from " .. _SCORINGCoalition[self.Players[PlayerName].UnitCoalition] .. " to " .. _SCORINGCoalition[UnitCoalition] ..
-          "(changed " .. self.Players[PlayerName].PenaltyCoalition .. " times the coalition). ".. self.CoalitionChangePenalty .."Penalty points added.",
+          "(changed " .. self.Players[PlayerName].PenaltyCoalition .. " times the coalition). ".. self.CoalitionChangePenalty .." penalty points added.",
          MESSAGE.Type.Information
        ):ToAll()
        self:ScoreCSV( PlayerName, "", "COALITION_PENALTY",  1, -1*self.CoalitionChangePenalty, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType,
@@ -715,11 +716,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 +739,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 +748,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 +786,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 +823,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 +852,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
@@ -1415,7 +1421,7 @@ function SCORING:ReportDetailedPlayerHits( PlayerName )
          Penalty = Penalty + UnitData.Penalty
          PenaltyHit = UnitData.PenaltyHit
        end
-        local ScoreMessageHit = string.format( "%s:%d  ", CategoryName, Score - Penalty )
+        local ScoreMessageHit = string.format( "%s: %d  ", CategoryName, Score - Penalty )
        self:T( ScoreMessageHit )
        ScoreMessageHits = ScoreMessageHits .. ScoreMessageHit
        PlayerScore = PlayerScore + Score
@@ -1471,7 +1477,7 @@ function SCORING:ReportDetailedPlayerDestroys( PlayerName )
          end
        end

-        local ScoreMessageDestroy = string.format( "  %s:%d  ", CategoryName, Score - Penalty )
+        local ScoreMessageDestroy = string.format( "  %s: %d  ", CategoryName, Score - Penalty )
        self:T( ScoreMessageDestroy )
        ScoreMessageDestroys = ScoreMessageDestroys .. ScoreMessageDestroy

@@ -1762,9 +1768,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
--- a/Development/Moose/Functional/Sead.lua
+++ b/Development/Moose/Functional/Sead.lua
@@ -1,4 +1,4 @@
--- **Functional** - Make SAM sites execute evasive and defensive behaviour when being fired upon.
+--- **Functional** - Make SAM sites evasive and execute defensive behaviour when being fired upon.
 --
 -- ===
 --
@@ -19,7 +19,7 @@
 --
 -- ### Authors: **FlightControl**, **applevangelist**
 --
-- Last Update: Feb 2022
+-- Last Update: September 2023
 --
 -- ===
 --
@@ -66,7 +66,7 @@ SEAD = {
  -- @field Harms
  SEAD.Harms = {
  ["AGM_88"] = "AGM_88",
-  ["AGM_45"] = "AGM_45",
+  --["AGM_45"] = "AGM_45",
  ["AGM_122"] = "AGM_122",
  ["AGM_84"] = "AGM_84",
  ["AGM_45"] = "AGM_45",
@@ -143,7 +143,7 @@ function SEAD:New( SEADGroupPrefixes, Padding )
  self:AddTransition("*",             "ManageEvasion",                "*")
  self:AddTransition("*",             "CalculateHitZone",             "*")
  
-  self:I("*** SEAD - Started Version 0.4.3")
+  self:I("*** SEAD - Started Version 0.4.4")
  return self
 end

@@ -203,7 +203,7 @@ function SEAD:SwitchEmissions(Switch)
  return self
 end

--- Add an object to call back when going evasive.
+--- Set an object to call back when going evasive.
 -- @param #SEAD self
 -- @param #table Object The object to call. Needs to have object functions as follows:
 -- `:SeadSuppressionPlanned(Group, Name, SuppressionStartTime, SuppressionEndTime)` 
@@ -369,7 +369,7 @@ function SEAD:onafterManageEvasion(From,Event,To,_targetskill,_targetgroup,SEADP
      local reach = 10
      if hit then
        local wpndata = SEAD.HarmData[data]
-        reach = wpndata[1] * 1,1
+        reach = wpndata[1] * 1.1
        local mach = wpndata[2]
        wpnspeed = math.floor(mach * 340.29)
      end
@@ -405,7 +405,7 @@ function SEAD:onafterManageEvasion(From,Event,To,_targetskill,_targetgroup,SEADP
        local function SuppressionStop(args)
          self:T(string.format("*** SEAD - %s Radar On",args[2]))
          local grp = args[1]  -- Wrapper.Group#GROUP
-          local name = args[2] -- #string Group Nam
+          local name = args[2] -- #string Group Name
          if self.UseEmissionsOnOff then
            grp:EnableEmission(true)
          end
@@ -424,7 +424,7 @@ function SEAD:onafterManageEvasion(From,Event,To,_targetskill,_targetgroup,SEADP
        if _tti > 600 then delay =  _tti - 90 end -- shot from afar, 600 is default shorad ontime
  
        local SuppressionStartTime = timer.getTime() + delay
-        local SuppressionEndTime = timer.getTime() + _tti + self.Padding
+        local SuppressionEndTime = timer.getTime() + delay + _tti + self.Padding + delay
        local _targetgroupname = _targetgroup:GetName()
        if not self.SuppressedGroups[_targetgroupname] then
          self:T(string.format("*** SEAD - %s | Parameters TTI %ds | Switch-Off in %ds",_targetgroupname,_tti,delay))
--- a/Development/Moose/Functional/Warehouse.lua
+++ b/Development/Moose/Functional/Warehouse.lua
@@ -3616,9 +3616,10 @@ function WAREHOUSE:onafterStatus(From, Event, To)
  end

  -- Print queue after processing requests.
-  self:_PrintQueue(self.queue, "Queue waiting")
-  self:_PrintQueue(self.pending, "Queue pending")
-
+  if self.verbosity > 2 then
+    self:_PrintQueue(self.queue, "Queue waiting")
+    self:_PrintQueue(self.pending, "Queue pending")
+  end
  -- Check fuel for all assets.
  --self:_CheckFuel()

@@ -4101,9 +4102,9 @@ function WAREHOUSE:_RegisterAsset(group, ngroups, forceattribute, forcecargobay,
  -- Get the size of an object.
  local function _GetObjectSize(DCSdesc)
    if DCSdesc.box then
-      local x=DCSdesc.box.max.x+math.abs(DCSdesc.box.min.x)  --length
-      local y=DCSdesc.box.max.y+math.abs(DCSdesc.box.min.y)  --height
-      local z=DCSdesc.box.max.z+math.abs(DCSdesc.box.min.z)  --width
+      local x=DCSdesc.box.max.x-DCSdesc.box.min.x  --length
+      local y=DCSdesc.box.max.y-DCSdesc.box.min.y  --height
+      local z=DCSdesc.box.max.z-DCSdesc.box.min.z  --width
      return math.max(x,z), x , y, z
    end
    return 0,0,0,0
@@ -5498,8 +5499,13 @@ function WAREHOUSE:onafterAssetDead(From, Event, To, asset, request)
      ---
  
      -- Remove dead group from cargo group set.
-      request.cargogroupset:Remove(groupname, NoTriggerEvent)
-      self:T(self.lid..string.format("Removed selfpropelled cargo %s: ncargo=%d.", groupname, request.cargogroupset:Count()))
+      if request.cargogroupset then
+        -- cargogroupset was nil for user case. Difficult to reproduce so we add a nil check.
+        request.cargogroupset:Remove(groupname, NoTriggerEvent)
+        self:T(self.lid..string.format("Removed selfpropelled cargo %s: ncargo=%d.", groupname, request.cargogroupset:Count()))
+      else
+        self:E(self.lid..string.format("ERROR: cargogroupset is nil for request ID=%s!", tostring(request.uid)))
+      end
  
    else
  
@@ -6671,7 +6677,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

@@ -6761,7 +6773,7 @@ function WAREHOUSE:_UnitDead(deadunit, deadgroup, request)
  -- Dont trigger a Remove event for the group sets.
  local NoTriggerEvent=true

-  if not request.transporttype==WAREHOUSE.TransportType.SELFPROPELLED then
+  if request.transporttype~=WAREHOUSE.TransportType.SELFPROPELLED then

    ---
    -- Complicated case: Dead unit could be:
@@ -8223,7 +8235,7 @@ end
 -- @return #number Request ID.
 function WAREHOUSE:_GetIDsFromGroupName(groupname)

-  ---@param #string text The text to analyse.
+  -- @param #string text The text to analyse.
  local function analyse(text)

    -- Get rid of #0001 tail from spawn.
--- a/Development/Moose/Functional/ZoneGoalCargo.lua
+++ b/Development/Moose/Functional/ZoneGoalCargo.lua
@@ -4,7 +4,12 @@
 -- 
 -- ZONE_GOAL_CARGO models processes that have a Goal with a defined achievement involving a Zone and Cargo.  
 -- Derived classes implement the ways how the achievements can be realized.
-- 
+  --
+  -- # Developer Note
+  -- 
+  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- Therefore, this class is considered to be deprecated
+  --
 -- ===
 -- 
 -- ### Author: **FlightControl**
--- a/Development/Moose/Functional/ZoneGoalCoalition.lua
+++ b/Development/Moose/Functional/ZoneGoalCoalition.lua
@@ -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.
 --
 -- ===
 --
--- a/Development/Moose/Modules.lua
+++ b/Development/Moose/Modules.lua
@@ -1,53 +1,55 @@
 __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/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' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Storage.lua' )

 __Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' )
 __Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' )
@@ -55,35 +57,64 @@ __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/Ops/EasyGCICAP.lua' )

 __Moose.Include( 'Scripts/Moose/AI/AI_Balancer.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_Air.lua' )
@@ -98,9 +129,9 @@ __Moose.Include( 'Scripts/Moose/AI/AI_A2G_CAS.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_A2G_SEAD.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_A2G_Dispatcher.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_Patrol.lua' )
-__Moose.Include( 'Scripts/Moose/AI/AI_Cap.lua' )
-__Moose.Include( 'Scripts/Moose/AI/AI_Cas.lua' )
-__Moose.Include( 'Scripts/Moose/AI/AI_Bai.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_CAP.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_CAS.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_BAI.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_Formation.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_Escort.lua' )
 __Moose.Include( 'Scripts/Moose/AI/AI_Escort_Request.lua' )
@@ -122,12 +153,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' )
@@ -139,7 +170,7 @@ __Moose.Include( 'Scripts/Moose/Tasking/Task_A2G_Dispatcher.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Task_A2G.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Task_A2A_Dispatcher.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Task_A2A.lua' )
-__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_CARGO.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Transport.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_CSAR.lua' )
 __Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Dispatcher.lua' )
--- a/Development/Moose/Modules_local.lua
+++ b/Development/Moose/Modules_local.lua
@@ -0,0 +1,172 @@
+__Moose.Include( 'Utilities\\Enums.lua' )
+__Moose.Include( 'Utilities\\Routines.lua' )
+__Moose.Include( 'Utilities\\Utils.lua' )
+__Moose.Include( 'Utilities\\Profiler.lua' )
+__Moose.Include( 'Utilities\\Templates.lua' )
+__Moose.Include( 'Utilities\\STTS.lua' )
+__Moose.Include( 'Utilities\\FiFo.lua' )
+__Moose.Include( 'Utilities\\Socket.lua' )
+
+__Moose.Include( 'Core\\Base.lua' )
+__Moose.Include( 'Core\\Beacon.lua' )
+__Moose.Include( 'Core\\UserFlag.lua' )
+__Moose.Include( 'Core\\Report.lua' )
+__Moose.Include( 'Core\\Scheduler.lua' )
+__Moose.Include( 'Core\\ScheduleDispatcher.lua' )
+__Moose.Include( 'Core\\Event.lua' )
+__Moose.Include( 'Core\\Settings.lua' )
+__Moose.Include( 'Core\\Menu.lua' )
+__Moose.Include( 'Core\\Zone.lua' )
+__Moose.Include( 'Core\\Zone_Detection.lua' )
+__Moose.Include( 'Core\\Database.lua' )
+__Moose.Include( 'Core\\Set.lua' )
+__Moose.Include( 'Core\\Point.lua' )
+__Moose.Include( 'Core\\Velocity.lua' )
+__Moose.Include( 'Core\\Message.lua' )
+__Moose.Include( 'Core\\Fsm.lua' )
+__Moose.Include( 'Core\\Spawn.lua' )
+__Moose.Include( 'Core\\SpawnStatic.lua' )
+__Moose.Include( 'Core\\Timer.lua' )
+__Moose.Include( 'Core\\Goal.lua' )
+__Moose.Include( 'Core\\Spot.lua' )
+__Moose.Include( 'Core\\Astar.lua' )
+__Moose.Include( 'Core\\MarkerOps_Base.lua' )
+__Moose.Include( 'Core\\TextAndSound.lua' )
+__Moose.Include( 'Core\\Condition.lua' )
+__Moose.Include( 'Core\\ClientMenu.lua' )
+
+__Moose.Include( 'Wrapper\\Object.lua' )
+__Moose.Include( 'Wrapper\\Identifiable.lua' )
+__Moose.Include( 'Wrapper\\Positionable.lua' )
+__Moose.Include( 'Wrapper\\Controllable.lua' )
+__Moose.Include( 'Wrapper\\Group.lua' )
+__Moose.Include( 'Wrapper\\Unit.lua' )
+__Moose.Include( 'Wrapper\\Client.lua' )
+__Moose.Include( 'Wrapper\\Static.lua' )
+__Moose.Include( 'Wrapper\\Airbase.lua' )
+__Moose.Include( 'Wrapper\\Scenery.lua' )
+__Moose.Include( 'Wrapper\\Marker.lua' )
+
+__Moose.Include( 'Cargo\\Cargo.lua' )
+__Moose.Include( 'Cargo\\CargoUnit.lua' )
+__Moose.Include( 'Cargo\\CargoSlingload.lua' )
+__Moose.Include( 'Cargo\\CargoCrate.lua' )
+__Moose.Include( 'Cargo\\CargoGroup.lua' )
+
+__Moose.Include( 'Functional\\Scoring.lua' )
+__Moose.Include( 'Functional\\CleanUp.lua' )
+__Moose.Include( 'Functional\\Movement.lua' )
+__Moose.Include( 'Functional\\Sead.lua' )
+__Moose.Include( 'Functional\\Escort.lua' )
+__Moose.Include( 'Functional\\MissileTrainer.lua' )
+__Moose.Include( 'Functional\\ATC_Ground.lua' )
+__Moose.Include( 'Functional\\Detection.lua' )
+__Moose.Include( 'Functional\\DetectionZones.lua' )
+__Moose.Include( 'Functional\\Designate.lua' )
+__Moose.Include( 'Functional\\RAT.lua' )
+__Moose.Include( 'Functional\\Range.lua' )
+__Moose.Include( 'Functional\\ZoneGoal.lua' )
+__Moose.Include( 'Functional\\ZoneGoalCoalition.lua' )
+__Moose.Include( 'Functional\\ZoneCaptureCoalition.lua' )
+__Moose.Include( 'Functional\\Artillery.lua' )
+__Moose.Include( 'Functional\\Suppression.lua' )
+__Moose.Include( 'Functional\\PseudoATC.lua' )
+__Moose.Include( 'Functional\\Warehouse.lua' )
+__Moose.Include( 'Functional\\Fox.lua' )
+__Moose.Include( 'Functional\\Mantis.lua' )
+__Moose.Include( 'Functional\\Shorad.lua' )
+__Moose.Include( 'Functional\\Autolase.lua' )
+__Moose.Include( 'Functional\\AICSAR.lua' )
+
+__Moose.Include( 'Ops\\Airboss.lua' )
+__Moose.Include( 'Ops\\RecoveryTanker.lua' )
+__Moose.Include( 'Ops\\RescueHelo.lua' )
+__Moose.Include( 'Ops\\ATIS.lua' )
+__Moose.Include( 'Ops\\Auftrag.lua' )
+__Moose.Include( 'Ops\\Target.lua' )
+__Moose.Include( 'Ops\\OpsGroup.lua' )
+__Moose.Include( 'Ops\\FlightGroup.lua' )
+__Moose.Include( 'Ops\\NavyGroup.lua' )
+__Moose.Include( 'Ops\\ArmyGroup.lua' )
+__Moose.Include( 'Ops\\Cohort.lua' )
+__Moose.Include( 'Ops\\Squadron.lua' )
+__Moose.Include( 'Ops\\Platoon.lua' )
+__Moose.Include( 'Ops\\Legion.lua' )
+__Moose.Include( 'Ops\\AirWing.lua' )
+__Moose.Include( 'Ops\\Brigade.lua' )
+__Moose.Include( 'Ops\\Intelligence.lua' )
+__Moose.Include( 'Ops\\Commander.lua' )
+__Moose.Include( 'Ops\\OpsTransport.lua' )
+__Moose.Include( 'Ops\\CSAR.lua' )
+__Moose.Include( 'Ops\\CTLD.lua' )
+__Moose.Include( 'Ops\\OpsZone.lua' )
+__Moose.Include( 'Ops\\Chief.lua' )
+__Moose.Include( 'Ops\\Flotilla.lua' )
+__Moose.Include( 'Ops\\Fleet.lua' )
+__Moose.Include( 'Ops\\Awacs.lua' )
+__Moose.Include( 'Ops\\PlayerTask.lua' )
+__Moose.Include( 'Ops\\Operation.lua' )
+__Moose.Include( 'Ops\\FlightControl.lua' )
+
+__Moose.Include( 'AI\\AI_Balancer.lua' )
+__Moose.Include( 'AI\\AI_Air.lua' )
+__Moose.Include( 'AI\\AI_Air_Patrol.lua' )
+__Moose.Include( 'AI\\AI_Air_Engage.lua' )
+__Moose.Include( 'AI\\AI_A2A_Patrol.lua' )
+__Moose.Include( 'AI\\AI_A2A_Cap.lua' )
+__Moose.Include( 'AI\\AI_A2A_Gci.lua' )
+__Moose.Include( 'AI\\AI_A2A_Dispatcher.lua' )
+__Moose.Include( 'AI\\AI_A2G_BAI.lua' )
+__Moose.Include( 'AI\\AI_A2G_CAS.lua' )
+__Moose.Include( 'AI\\AI_A2G_SEAD.lua' )
+__Moose.Include( 'AI\\AI_A2G_Dispatcher.lua' )
+__Moose.Include( 'AI\\AI_Patrol.lua' )
+__Moose.Include( 'AI\\AI_Cap.lua' )
+__Moose.Include( 'AI\\AI_Cas.lua' )
+__Moose.Include( 'AI\\AI_Bai.lua' )
+__Moose.Include( 'AI\\AI_Formation.lua' )
+__Moose.Include( 'AI\\AI_Escort.lua' )
+__Moose.Include( 'AI\\AI_Escort_Request.lua' )
+__Moose.Include( 'AI\\AI_Escort_Dispatcher.lua' )
+__Moose.Include( 'AI\\AI_Escort_Dispatcher_Request.lua' )
+__Moose.Include( 'AI\\AI_Cargo.lua' )
+__Moose.Include( 'AI\\AI_Cargo_APC.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Helicopter.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Airplane.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Ship.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Dispatcher.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Dispatcher_APC.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Helicopter.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Airplane.lua' )
+__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Ship.lua' )
+
+__Moose.Include( 'Actions\\Act_Assign.lua' )
+__Moose.Include( 'Actions\\Act_Route.lua' )
+__Moose.Include( 'Actions\\Act_Account.lua' )
+__Moose.Include( 'Actions\\Act_Assist.lua' )
+
+__Moose.Include( 'Sound\\UserSound.lua' )
+__Moose.Include( 'Sound\\SoundOutput.lua' )
+__Moose.Include( 'Sound\\Radio.lua' )
+__Moose.Include( 'Sound\\RadioQueue.lua' )
+__Moose.Include( 'Sound\\RadioSpeech.lua' )
+__Moose.Include( 'Sound\\SRS.lua' )
+
+__Moose.Include( 'Tasking\\CommandCenter.lua' )
+__Moose.Include( 'Tasking\\Mission.lua' )
+__Moose.Include( 'Tasking\\Task.lua' )
+__Moose.Include( 'Tasking\\TaskInfo.lua' )
+__Moose.Include( 'Tasking\\Task_Manager.lua' )
+__Moose.Include( 'Tasking\\DetectionManager.lua' )
+__Moose.Include( 'Tasking\\Task_A2G_Dispatcher.lua' )
+__Moose.Include( 'Tasking\\Task_A2G.lua' )
+__Moose.Include( 'Tasking\\Task_A2A_Dispatcher.lua' )
+__Moose.Include( 'Tasking\\Task_A2A.lua' )
+__Moose.Include( 'Tasking\\Task_Cargo.lua' )
+__Moose.Include( 'Tasking\\Task_Cargo_Transport.lua' )
+__Moose.Include( 'Tasking\\Task_Cargo_CSAR.lua' )
+__Moose.Include( 'Tasking\\Task_Cargo_Dispatcher.lua' )
+__Moose.Include( 'Tasking\\Task_Capture_Zone.lua' )
+__Moose.Include( 'Tasking\\Task_Capture_Dispatcher.lua' )
+
+__Moose.Include( 'Globals.lua' )
--- a/Development/Moose/Ops/ATIS.lua
+++ b/Development/Moose/Ops/ATIS.lua
--- a/Development/Moose/Ops/AirWing.lua
+++ b/Development/Moose/Ops/AirWing.lua
--- a/Development/Moose/Ops/Airboss.lua
+++ b/Development/Moose/Ops/Airboss.lua
--- a/Development/Moose/Ops/ArmyGroup.lua
+++ b/Development/Moose/Ops/ArmyGroup.lua
--- a/Development/Moose/Ops/Auftrag.lua
+++ b/Development/Moose/Ops/Auftrag.lua
--- a/Development/Moose/Ops/Awacs.lua
+++ b/Development/Moose/Ops/Awacs.lua
--- a/Development/Moose/Ops/Brigade.lua
+++ b/Development/Moose/Ops/Brigade.lua
@@ -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
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- a/Development/Moose/Ops/CSAR.lua
+++ b/Development/Moose/Ops/CSAR.lua
@@ -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
@@ -61,6 +61,8 @@
 -- You need to load an .ogg soundfile for the pilot\'s beacons into the mission, e.g. "beacon.ogg", use a once trigger, "sound to country" for that.
 -- Create a late-activated single infantry unit as template in the mission editor and name it e.g. "Downed Pilot".
 -- 
+-- Example sound files are here: [Moose Sound](https://github.com/FlightControl-Master/MOOSE_SOUND/tree/master/CTLD%20CSAR)
+-- 
 -- ## 1. Basic Setup
 -- 
 -- A basic setup example is the following:
@@ -292,7 +294,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 +318,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 +1882,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 +2177,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
--- a/Development/Moose/Ops/CTLD.lua
+++ b/Development/Moose/Ops/CTLD.lua
@@ -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
@@ -616,6 +616,8 @@ do
 -- You need to load an .ogg soundfile for the pilot\'s beacons into the mission, e.g. "beacon.ogg", use a once trigger, "sound to country" for that.
 -- Create the late-activated troops, vehicles, that will make up your deployable forces.
 -- 
+-- Example sound files are here: [Moose Sound](https://github.com/FlightControl-Master/MOOSE_SOUND/tree/master/CTLD%20CSAR)
+-- 
 -- ## 1. Basic Setup
 -- 
 -- ## 1.1 Create and start a CTLD instance
@@ -1221,7 +1223,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 +1392,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 +1753,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 +1775,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 +2282,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 +3449,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 +3472,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 +3514,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 +3626,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 +3636,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 +4338,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 +4367,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 +4455,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
--- a/Development/Moose/Ops/Chief.lua
+++ b/Development/Moose/Ops/Chief.lua
--- a/Development/Moose/Ops/Cohort.lua
+++ b/Development/Moose/Ops/Cohort.lua
--- a/Development/Moose/Ops/Commander.lua
+++ b/Development/Moose/Ops/Commander.lua
--- a/Development/Moose/Ops/EasyGCICAP.lua
+++ b/Development/Moose/Ops/EasyGCICAP.lua
--- a/Development/Moose/Ops/Fleet.lua
+++ b/Development/Moose/Ops/Fleet.lua
@@ -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
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- a/Development/Moose/Ops/FlightControl.lua
+++ b/Development/Moose/Ops/FlightControl.lua
--- a/Development/Moose/Ops/FlightGroup.lua
+++ b/Development/Moose/Ops/FlightGroup.lua
--- a/Development/Moose/Ops/Flotilla.lua
+++ b/Development/Moose/Ops/Flotilla.lua
@@ -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
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- a/Development/Moose/Ops/Intelligence.lua
+++ b/Development/Moose/Ops/Intelligence.lua
--- a/Development/Moose/Ops/Legion.lua
+++ b/Development/Moose/Ops/Legion.lua
--- a/Development/Moose/Ops/NavyGroup.lua
+++ b/Development/Moose/Ops/NavyGroup.lua
--- a/Development/Moose/Ops/Operation.lua
+++ b/Development/Moose/Ops/Operation.lua
--- a/Development/Moose/Ops/OpsGroup.lua
+++ b/Development/Moose/Ops/OpsGroup.lua
--- a/Show More
+++ b/Show More