diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml
index 408a13a3b..e13ead09b 100644
--- a/.github/workflows/build_nsis_bundle.yml
+++ b/.github/workflows/build_nsis_bundle.yml
@@ -95,6 +95,6 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/v')
         with:
-          draft: true
+          draft: false
           files: ./FreeDATA-Installer.exe
           tag_name: ${{ github.ref_name }}
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index 2ef4ae739..c578b7425 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -127,7 +127,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/v')
         with:
-          draft: true
+          draft: false
           files: ./freedata_server/server.dist/${{ matrix.zip_name }}.zip
           tag_name: ${{ github.ref_name }}
 
diff --git a/.github/workflows/modem_tests.yml b/.github/workflows/modem_tests.yml
index 01dc78dbd..5c4934b0e 100644
--- a/.github/workflows/modem_tests.yml
+++ b/.github/workflows/modem_tests.yml
@@ -22,6 +22,7 @@ jobs:
           - python-version: "3.10"
           - python-version: "3.11"
           - python-version: "3.12"
+          - python-version: "3.13"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/pip_package.yml b/.github/workflows/pip_package.yml
index d377bdc31..71c38f190 100644
--- a/.github/workflows/pip_package.yml
+++ b/.github/workflows/pip_package.yml
@@ -19,7 +19,7 @@ jobs:
 
     - name: Install Linux dependencies
       run: |
-        sudo apt install -y portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake python3-libhamlib2 patchelf
+        sudo apt install -y portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake patchelf
 
     - name: Install Python dependencies
       run: |
@@ -38,7 +38,7 @@ jobs:
         python setup.py sdist bdist_wheel
 
     - name: Publish to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.11.0
+      uses: pypa/gh-action-pypi-publish@v1.12.4
       if: startsWith(github.ref, 'refs/tags/v')
       with:
         user: __token__
diff --git a/.gitignore b/.gitignore
index 2a1fc5dae..d96005cbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ coverage.xml
 
 #GUI_WEB
 /freedata_gui/dist
+/freedata_gui/node_modules/
 /freedata_gui/node_modules!/venv/
 
 # venv packages
diff --git a/README.md b/README.md
index 0adcca220..11be0916c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
+
 # FreeDATA
+> FreeDATA is a versatile, **open-source platform designed specifically for HF communications**, leveraging **codec2** data modes for robust global digital communication. It features a network-based server-client architecture, a REST API, multi-platform compatibility, and a messaging system.
+
+> Please keep in mind, this project is still **under development** with many issues which need to be solved.
 
-    FreeDATA is a versatile, open-source platform designed specifically for HF communications, leveraging Codec2 data modes for robust global digital communication. It features a network-based server-client architecture, a REST API, multi-platform compatibility, and a messaging system.
 
 [![CodeFactor](https://www.codefactor.io/repository/github/dj2ls/freedata/badge)](https://www.codefactor.io/repository/github/dj2ls/freedata)
+[![Modem tests](https://github.com/DJ2LS/FreeDATA/actions/workflows/modem_tests.yml/badge.svg)](https://github.com/DJ2LS/FreeDATA/actions/workflows/modem_tests.yml)
 
-Please keep in mind, this project is still under development with many issues which need to be solved.
 
 ![FreeDATA_main_screen.png](documentation%2FFreeDATA_main_screen.png)
 
diff --git a/freedata_gui/package.json b/freedata_gui/package.json
index 707e72675..17fd3f54b 100644
--- a/freedata_gui/package.json
+++ b/freedata_gui/package.json
@@ -28,7 +28,7 @@
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "bootstrap-icons": "^1.11.3",
-    "bootstrap-vue-next": "^0.25.12",
+    "bootstrap-vue-next": "^0.26.7",
     "chart.js": "^4.4.3",
     "chartjs-plugin-annotation": "^3.0.1",
     "core-js": "^3.8.3",
@@ -36,7 +36,7 @@
     "dompurify": "^3.1.6",
     "gridstack": "^11.0.1",
     "js-image-compressor": "^2.0.0",
-    "marked": "^14.1.2",
+    "marked": "^15.0.3",
     "pinia": "^2.1.7",
     "qth-locator": "^2.1.0",
     "topojson-client": "^3.1.0",
diff --git a/freedata_gui/src/components/chat_messages_image_preview.vue b/freedata_gui/src/components/chat_messages_image_preview.vue
index 6b0fbd2c0..08b25f524 100644
--- a/freedata_gui/src/components/chat_messages_image_preview.vue
+++ b/freedata_gui/src/components/chat_messages_image_preview.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="isImage">
-    <img :src="imageUrl" alt="Image Preview" class="img-fluid rounded w-100" />
+    <img :src="imageUrl" alt="Image Preview" class="img-fluid border rounded-top bg-light w-100" />
   </div>
 </template>
 
diff --git a/freedata_gui/src/components/chat_messages_received.vue b/freedata_gui/src/components/chat_messages_received.vue
index efc22a508..81730e885 100644
--- a/freedata_gui/src/components/chat_messages_received.vue
+++ b/freedata_gui/src/components/chat_messages_received.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row justify-content-start mb-2">
     <div :class="messageWidthClass">
-      <div class="card bg-light border-0 text-dark">
+      <div class="card bg-light border rounded-top text-dark">
         <div
           v-for="attachment in message.attachments"
           :key="attachment.id"
@@ -11,14 +11,14 @@
           <chat_messages_image_preview :attachment="attachment" />
 
           <div class="btn-group w-100" role="group">
-            <button class="btn btn-light text-truncate" disabled>
+            <button class="btn btn-light border rounded-bottom text-truncate" disabled>
               {{ attachment.name }}
             </button>
             <button
               @click="
                 downloadAttachment(attachment.hash_sha512, attachment.name)
               "
-              class="btn btn-light w-25"
+              class="btn btn-light border rounded-bottom w-25"
             >
               <i class="bi bi-download strong"></i>
             </button>
@@ -158,9 +158,25 @@ export default {
     },
 
     parsedMessageBody() {
-      // Use marked to parse markdown and DOMPurify to sanitize
-      return DOMPurify.sanitize(marked.parse(this.message.body));
-    },
+    // Parse markdown to HTML
+  let parsedHTML = marked.parse(this.message.body);
+
+  // Sanitize the HTML
+  let sanitizedHTML = DOMPurify.sanitize(parsedHTML);
+
+  // Create a temporary DOM element to manipulate the sanitized output
+  let tempDiv = document.createElement("div");
+  tempDiv.innerHTML = sanitizedHTML;
+
+  // Modify all links to open in a new tab
+  tempDiv.querySelectorAll("a").forEach(link => {
+    link.setAttribute("target", "_blank");
+    link.setAttribute("rel", "noopener noreferrer"); // Security best practice
+  });
+
+  // Return the updated HTML
+  return tempDiv.innerHTML;
+  },
   },
 };
 </script>
diff --git a/freedata_gui/src/components/chat_messages_sent.vue b/freedata_gui/src/components/chat_messages_sent.vue
index c0b545379..71669436f 100644
--- a/freedata_gui/src/components/chat_messages_sent.vue
+++ b/freedata_gui/src/components/chat_messages_sent.vue
@@ -29,7 +29,7 @@
     </div>
     <!-- message area -->
     <div :class="messageWidthClass" class="align-items-end">
-      <div class="card bg-secondary text-white">
+      <div class="card">
         <div
           v-for="attachment in message.attachments"
           :key="attachment.id"
@@ -56,8 +56,8 @@
           <p class="card-text text-break" v-html="parsedMessageBody"></p>
         </div>
 
-        <div class="card-footer p-0 bg-secondary border-top-0">
-          <p class="text p-0 m-0 me-1 text-end">
+        <div class="card-footer p-1 border-top-0">
+          <p class="text p-0 m-0 mb-1 me-1 text-end">
             <span class="badge badge-primary mr-2" :class="{
                 'bg-danger': message.status == 'failed',
                 'bg-primary': message.status == 'transmitting',
@@ -66,7 +66,7 @@
             >
               {{ message.status }}
             </span>
-            | <span class="badge badge-primary mr-2"> attempt: {{ message.attempt + 1 }} </span>|<span class="badge badge-primary mr-2"> {{ getDateTime }} UTC</span>
+            | <span class="badge text-bg-light mr-2"> attempt: {{ message.attempt + 1 }} </span>|<span class="badge text-bg-light mr-2"> {{ getDateTime }} UTC</span>
           </p>
         </div>
 
@@ -202,8 +202,26 @@ export default {
     },
 
     parsedMessageBody() {
-      // Use marked to parse markdown and DOMPurify to sanitize
-      return DOMPurify.sanitize(marked.parse(this.message.body));
+     // Parse markdown to HTML
+  let parsedHTML = marked.parse(this.message.body);
+
+  // Sanitize the HTML
+  let sanitizedHTML = DOMPurify.sanitize(parsedHTML);
+
+  // Create a temporary DOM element to manipulate the sanitized output
+  let tempDiv = document.createElement("div");
+  tempDiv.innerHTML = sanitizedHTML;
+
+  // Modify all links to open in a new tab
+  tempDiv.querySelectorAll("a").forEach(link => {
+    link.setAttribute("target", "_blank");
+    link.setAttribute("rel", "noopener noreferrer"); // Security best practice
+  });
+
+  // Return the updated HTML
+  return tempDiv.innerHTML;
+
+
     },
   },
 };
diff --git a/freedata_gui/src/components/chat_new_message.vue b/freedata_gui/src/components/chat_new_message.vue
index 66711e766..f68d9383d 100644
--- a/freedata_gui/src/components/chat_new_message.vue
+++ b/freedata_gui/src/components/chat_new_message.vue
@@ -74,6 +74,11 @@ function handleFiles(files) {
             ((file.size - compressedFile.size) / file.size * 100).toFixed(2) + '%'
           );
 
+          // Check if compression made the file larger
+          if (compressedFile.size >= file.size) {
+            console.warn("Compressed file is larger than original. Using original file instead.");
+            compressedFile = file; // Use original file
+          }
           // toast notification
           let message = `
               <div>
@@ -295,10 +300,15 @@ function applyMarkdown(formatType) {
 
   <!-- Emoji Picker Modal -->
   <div class="modal fade" id="emojiPickerModal" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-sm">
+    <div class="modal-dialog modal-dialog-centered modal">
       <div class="modal-content">
-        <div class="modal-body p-0">
-          <VuemojiPicker @emojiClick="handleEmojiClick" />
+        <div class="modal-header">
+        <h5 class="modal-title">Insert emoji</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" data-bs-target="#emojiPickerModal" aria-label="Close"></button>
+      </div>
+
+        <div class="modal-body">
+          <VuemojiPicker @emojiClick="handleEmojiClick"/>
         </div>
       </div>
     </div>
diff --git a/freedata_gui/src/components/dynamic_components.vue b/freedata_gui/src/components/dynamic_components.vue
index f805263e3..9ebf5f841 100644
--- a/freedata_gui/src/components/dynamic_components.vue
+++ b/freedata_gui/src/components/dynamic_components.vue
@@ -53,7 +53,11 @@ class gridWidget {
   category;
   //Unique ID for widget
   id;
-  constructor(component, size, text, quickfill, autoPlace, category, id) {
+  //if true add when quick fill (small) button is clicked
+  quickFillSM;
+  //Initial size and location if autoplace is false and using small quick fill
+   sizeSM;
+  constructor(component, size, text, quickfill, autoPlace, category, id, quickFillSM, sizeSM) {
     this.component2 = component;
     this.size = size;
     this.text = text;
@@ -61,6 +65,8 @@ class gridWidget {
     this.autoPlace = autoPlace;
     this.category = category;
     this.id = id;
+    this.quickFillSM = quickFillSM;
+    this.sizeSM = sizeSM
   }
 }
 
@@ -74,7 +80,9 @@ const gridWidgets = [
     true,
     true,
     "Activity",
-    8
+    8,
+    false,
+    { x: 0, y: 53, w: 6, h: 55 }
   ),
   new gridWidget(
     active_heard_stations,
@@ -83,25 +91,53 @@ const gridWidgets = [
     true,
     true,
     "Activity",
-    0
+    0,
+    false,
+    { x: 0, y: 53, w: 6, h: 55 }
+  ),
+  new gridWidget(
+    grid_scatter,
+    { x: 0, y: 114, w: 6, h: 30 },
+    "Scatter graph",
+    false,
+    true,
+    "Stats",
+    19,
+    false,
+    { x: 0, y: 53, w: 6, h: 55 }
+  ),
+  new gridWidget(
+    grid_stats_chart,
+    { x: 0, y: 114, w: 6, h: 30 },
+    "Speed/SNR graph",
+    false,
+    true,
+    "Stats",
+    20,
+    false,
+    { x: 0, y: 114, w: 6, h: 30 }
   ),
   new gridWidget(
     active_stats,
-    { x: 16, y: 16, w: 8, h: 72 },
+    { x: 16, y: 16, w: 8, h: 87 },
     "Stats (waterfall, etc)",
     true,
     true,
     "Stats",
-    1
+    1,
+    true,
+    { x: 12, y: 0, w: 12, h: 56 }
   ),
   new gridWidget(
     active_audio_level,
-    { x: 16, y: 0, w: 8, h: 15 },
+    { x: 16, y: 0, w: 8, h: 20 },
     "Audio main",
     false,
     true,
     "Audio",
-    2
+    2,
+    false,
+    { x: 0, y: 114, w: 6, h: 20 }
   ),
   new gridWidget(
     grid_freq,
@@ -110,16 +146,20 @@ const gridWidgets = [
     true,
     true,
     "Rig",
-    14
+    14,
+    false,
+    { x: 0, y: 114, w: 6, h: 30 }
   ),
   new gridWidget(
     active_rig_control,
-    { x: 6, y: 40, w: 9, h: 15 },
+    { x: 0, y: 108, w: 6, h: 25 },
     "Rig control main",
-    false,
+    true,
     true,
     "Rig",
-    3
+    3,
+    false,
+    { x: 0, y: 114, w: 6, h: 25 }
   ),
   new gridWidget(
     grid_beacon,
@@ -128,16 +168,20 @@ const gridWidgets = [
     false,
     true,
     "Broadcasts",
-    16
+    16,
+    true,
+    { x: 0, y: 14, w: 12, h: 14 }
   ),
   new gridWidget(
     active_broadcasts,
-    { x: 6, y: 70, w: 6, h: 15 },
+    { x: 6, y: 70, w: 6, h: 25 },
     "Broadcasts main (horizontal)",
     false,
     true,
     "Broadcasts",
-    4
+    4,
+    false,
+    { x: 6, y: 70, w: 6, h: 25 }
   ),
   new gridWidget(
     mini_heard_stations,
@@ -146,16 +190,31 @@ const gridWidgets = [
     false,
     true,
     "Activity",
-    5
+    5,
+    true,
+    { x: 0, y: 42, w: 12, h: 42 }
   ),
   new gridWidget(
     s_meter,
     { x: 16, y: 0, w: 4, h: 8 },
-    "S-Meter",
+    "S-Meter widget",
     true,
     true,
     "Rig",
-    6
+    6,
+    false,
+    { x: 16, y: 0, w: 4, h: 8 }
+  ),
+  new gridWidget(
+    grid_swr_meter,
+    { x: 16, y: 8, w: 4, h: 8 },
+    "SWR widget",
+    true,
+    true,
+    "Rig",
+    21,
+    false,
+    { x: 16, y: 8, w: 4, h: 8 }
   ),
   new gridWidget(
     dbfs_meter,
@@ -164,16 +223,20 @@ const gridWidgets = [
     true,
     true,
     "Audio",
-    7
+    7,
+    false,
+    { x: 20, y: 0, w: 4, h: 8 }
   ),
   new gridWidget(
     active_broadcasts_vert,
-    { x: 6, y: 53, w: 10, h: 35 },
+    { x: 16, y: 103, w: 8, h: 42 },
     "Broadcasts main (vertical)",
     true,
     true,
     "Broadcasts",
-    9
+    9,
+    false,
+    { x: 16, y: 103, w: 8, h: 42 }
   ),
   new gridWidget(
     grid_ptt,
@@ -182,7 +245,9 @@ const gridWidgets = [
     true,
     true,
     "Rig",
-    10
+    10,
+    true,
+    { x: 5, y: 0, w: 7, h: 14 }
   ),
   new gridWidget(
     grid_mycall,
@@ -191,16 +256,20 @@ const gridWidgets = [
     true,
     true,
     "Other",
-    11
+    11,
+    false,
+    { x: 7, y: 0, w: 9, h: 13 }
   ),
   new gridWidget(
     grid_mycall_small,
-    { x: 8, y: 40, w: 4, h: 8 },
+    { x: 8, y: 40, w: 4, h: 10 },
     "My callsign widget (small)",
     false,
     true,
     "Other",
-    17
+    17,
+    false,
+    { x: 8, y: 40, w: 4, h: 8 }
   ),
   new gridWidget(
     grid_CQ_btn,
@@ -209,7 +278,9 @@ const gridWidgets = [
     false,
     true,
     "Broadcasts",
-    12
+    12,
+    true,
+    { x: 0, y: 28, w: 12, h: 14 }
   ),
   new gridWidget(
     grid_ping,
@@ -218,7 +289,20 @@ const gridWidgets = [
     false,
     true,
     "Broadcasts",
-    13
+    13,
+    true,
+    { x: 0, y: 84, w: 12, h: 9 }
+  ),
+  new gridWidget(
+    grid_stations_map,
+    { x: 6, y: 53, w: 10, h: 92 },
+    "Station Map",
+    true,
+    true,
+    "Other",
+    22,
+    true,
+    { x: 12, y: 56, w: 12, h: 92 }
   ),
   new gridWidget(
     grid_stop,
@@ -227,52 +311,20 @@ const gridWidgets = [
     true,
     true,
     "Other",
-    15
+    15,
+    true,
+    { x: 0, y: 0, w: 5, h: 14 }
   ),
   new gridWidget(
     grid_tune,
     { x: 16, y: 8, w: 2, h: 8 },
     "Tune widget",
-    true,
-    true,
-    "Audio",
-    18
-  ),
-  new gridWidget(
-    grid_scatter,
-    { x: 0, y: 114, w: 6, h: 30 },
-    "Scatter graph",
     false,
     true,
-    "Stats",
-    19
-  ),
-  new gridWidget(
-    grid_stats_chart,
-    { x: 0, y: 114, w: 6, h: 30 },
-    "Speed/SNR graph",
+    "Audio",
+    18,
     false,
-    true,
-    "Stats",
-    20
-  ),
-  new gridWidget(
-    grid_swr_meter,
-    { x: 16, y: 0, w: 4, h: 8 },
-    "SWR",
-    true,
-    true,
-    "Rig",
-    21
-  ),
-    new gridWidget(
-    grid_stations_map,
-    { x: 16, y: 0, w: 8, h: 100 },
-    "Station Map",
-    true,
-    true,
-    "Other",
-    22
+    { x: 16, y: 8, w: 2, h: 8 }
   )
   //Next new widget ID should be 23
 ];
@@ -354,7 +406,14 @@ function addNewWidget2(componentToAdd, saveToConfig) {
     if (saveToConfig) saveGridLayout();
   });
 }
-
+function addNewWidget2SM(componentToAdd, saveToConfig) {
+  const node = { ...componentToAdd.sizeSM, id: `w_${count.value++}`, component2: shallowRef(componentToAdd.component2), autoPlace: componentToAdd.autoPlace };
+  items.value.push(node);
+  nextTick(() => {
+    grid?.makeWidget(node.id);
+    if (saveToConfig) saveGridLayout();
+  });
+}
 function remove(widget) {
   const index = items.value.findIndex((w) => w.id === widget.id);
   if (index !== -1) {
@@ -390,7 +449,16 @@ function quickfill() {
   });
   saveGridLayout();
 }
-
+function quickfillSM() {
+  gridWidgets.forEach((gw) => {
+    if (gw.quickFillSM) {
+      gw.autoPlace = false;
+      addNewWidget2SM(gw, false);
+      gw.autoPlace = true;
+    }
+  });
+  saveGridLayout();
+}
 onMounted(() => {
   grid = GridStack.init({
     float: true,
@@ -402,10 +470,11 @@ onMounted(() => {
     resizable: { handles: "se,sw" }
   });
 
+  /*//Do not delete, aids in adjusting widget fill locations
   grid?.on("dragstop", (event, element) => {
     const node = element.gridstackNode;
-    console.info(`Moved #${node.id} to ${node.x}.${node.y}. Dimensions: ${node.w}x${node.h}`);
-  });
+    console.info(`Moved #${node.id} to ${node.x},${node.y}. Dimensions: ${node.w}x${node.h}`);
+  });*/
 
   grid?.on("change", onChange);
 
@@ -449,7 +518,7 @@ onMounted(() => {
    <!-- <i class="bi bi-grip-vertical h5">      </i>-->
 
   <span class="me-4 text-white" style="writing-mode: vertical-rl; transform: rotate(180deg);">
-    screen settings
+    grid edit
   </span>
 
 
@@ -511,18 +580,23 @@ onMounted(() => {
     </div>
     <div class="offcanvas-body">
       <p>
-        Grid widgets allow you to customize the display for your own usage. Here
-        you may add additional widgets to fit your needs. You can move and
-        resize the individual widgets!
+        Grid widgets allow you to customize the display. You may add additional widgets to fit your needs. You can move and resize the individual widgets!
       </p>
       <div>
         <button
-          class="btn btn-sm btn-outline-primary"
+          class="btn btn-outline-primary mb-2"
           type="button"
           @click="quickfill"
         >
           Fill grid with common widgets
         </button>
+        <button
+          class="btn btn-outline-primary"
+          type="button"
+          @click="quickfillSM"
+        >
+          Fill grid for small screens
+        </button>
       </div>
       <hr />
       <!-- Begin widget selector -->
diff --git a/freedata_gui/src/components/grid/grid_active_audio.vue b/freedata_gui/src/components/grid/grid_active_audio.vue
index 9b4710ff8..e0e476ba2 100644
--- a/freedata_gui/src/components/grid/grid_active_audio.vue
+++ b/freedata_gui/src/components/grid/grid_active_audio.vue
@@ -9,7 +9,7 @@ const state = useStateStore(pinia);
 
 <template>
   <div class="card w-100 h-100">
-    <div class="card-header p-0 mb-1">
+    <div class="card-header mb-1">
       <i class="bi bi-volume-up" style="font-size: 1rem"></i>&nbsp;
       <strong>Audio</strong>
     </div>
diff --git a/freedata_gui/src/components/grid/grid_active_broadcasts.vue b/freedata_gui/src/components/grid/grid_active_broadcasts.vue
index 0482df313..6c3f193a8 100644
--- a/freedata_gui/src/components/grid/grid_active_broadcasts.vue
+++ b/freedata_gui/src/components/grid/grid_active_broadcasts.vue
@@ -67,12 +67,12 @@ window.addEventListener(
 
 <template>
   <div class="card h-100">
-    <div class="card-header p-0">
+    <div class="card-header">
       <i class="bi bi-broadcast" style="font-size: 1.2rem"></i>&nbsp;
       <strong>Broadcasts</strong>
     </div>
-    <div class="card-body overflow-auto p-0">
-      <div class="input-group input-group-sm mb-0">
+    <div class="card-body overflow-auto">
+      <div class="input-group">
         <input
           type="text"
           class="form-control"
@@ -85,7 +85,7 @@ window.addEventListener(
           v-model="dxcallPing"
         />
         <button
-          class="btn btn-sm btn-outline-secondary"
+          class="btn btn-outline-secondary"
           id="sendPing"
           type="button"
           data-bs-placement="bottom"
@@ -100,7 +100,7 @@ window.addEventListener(
         </button>
 
         <button
-          class="btn btn-sm btn-outline-secondary ms-1"
+          class="btn btn-outline-secondary ms-1"
           id="sendCQ"
           type="button"
           title="Send a CQ to the world"
@@ -113,7 +113,7 @@ window.addEventListener(
         <button
           type="button"
           id="startBeacon"
-          class="btn btn-sm ms-1"
+          class="btn ms-1"
           @click="startStopBeacon"
           :class="{
             'btn-success': state.beacon_state,
diff --git a/freedata_gui/src/components/grid/grid_active_stats.vue b/freedata_gui/src/components/grid/grid_active_stats.vue
index b0f6d19eb..1371b4f2d 100644
--- a/freedata_gui/src/components/grid/grid_active_stats.vue
+++ b/freedata_gui/src/components/grid/grid_active_stats.vue
@@ -119,7 +119,10 @@ const scatterChartOptions = {
       position: "bottom",
       grid: {
         display: true,
-        lineWidth: 1, // Set the line width for x-axis grid lines
+        lineWidth: (context) => {
+          // Make the zero line thick (3) and other grid lines thin (1)
+          return context.tick.value === 0 ? 3 : 1;
+        },
       },
       ticks: {
         display: false,
@@ -130,7 +133,9 @@ const scatterChartOptions = {
       position: "left",
       grid: {
         display: true,
-        lineWidth: 1, // Set the line width for y-axis grid lines
+        lineWidth: (context) => {
+          return context.tick.value === 0 ? 3 : 1;
+        },
       },
       ticks: {
         display: false,
@@ -147,6 +152,7 @@ const scatterChartOptions = {
   },
 };
 
+
 const scatterChartData = computed(() => ({
   datasets: [
     {
@@ -179,7 +185,7 @@ onMounted(() => {
           role="tablist"
         >
           <a
-            class="py-0 list-group-item list-group-item-dark list-group-item-action"
+            class="py-0 list-group-item list-group-item-light list-group-item-action"
             data-bs-toggle="list"
             role="tab"
             aria-controls="list-waterfall"
@@ -189,7 +195,7 @@ onMounted(() => {
             <strong><i class="bi bi-water"></i></strong>
           </a>
           <a
-            class="py-0 list-group-item list-group-item-dark list-group-item-action"
+            class="py-0 list-group-item list-group-item-light list-group-item-action"
             data-bs-toggle="list"
             role="tab"
             aria-controls="list-scatter"
@@ -199,7 +205,7 @@ onMounted(() => {
             <strong><i class="bi bi-border-outer"></i></strong>
           </a>
           <a
-            class="py-0 list-group-item list-group-item-dark list-group-item-action"
+            class="py-0 list-group-item list-group-item-light list-group-item-action"
             data-bs-toggle="list"
             role="tab"
             aria-controls="list-chart"
diff --git a/freedata_gui/src/components/grid/grid_activities.vue b/freedata_gui/src/components/grid/grid_activities.vue
index 461872524..abb90d29b 100644
--- a/freedata_gui/src/components/grid/grid_activities.vue
+++ b/freedata_gui/src/components/grid/grid_activities.vue
@@ -28,7 +28,7 @@ function getDateTime(timestampRaw) {
       <i class="bi bi-card-list" style="font-size: 1.2rem"></i>&nbsp;
       <strong>Activity</strong>
     </div>
-    <div class="card-body overflow-auto m-0 p-0" style="align-items: start">
+    <div class="card-body overflow-auto m-0" style="align-items: start">
       <div v-for="item in state.activities" :key="item[0]">
         <h6 style="text-align: start" class="mb-0">
         <span class="badge text-bg-primary">{{ item[1].origin }}</span>
diff --git a/freedata_gui/src/components/grid/grid_scatter.vue b/freedata_gui/src/components/grid/grid_scatter.vue
index 5a05a2d4f..20625ec68 100644
--- a/freedata_gui/src/components/grid/grid_scatter.vue
+++ b/freedata_gui/src/components/grid/grid_scatter.vue
@@ -40,10 +40,13 @@ const scatterChartOptions = {
       position: "bottom",
       grid: {
         display: true,
-        lineWidth: 1, // Set the line width for x-axis grid lines
+        lineWidth: (context) => {
+          // Make the zero line thick (3) and other grid lines thin (1)
+          return context.tick.value === 0 ? 3 : 1;
+        },
       },
       ticks: {
-        display: true,
+        display: false,
       },
     },
     y: {
@@ -51,10 +54,12 @@ const scatterChartOptions = {
       position: "left",
       grid: {
         display: true,
-        lineWidth: 1, // Set the line width for y-axis grid lines
+        lineWidth: (context) => {
+          return context.tick.value === 0 ? 3 : 1;
+        },
       },
       ticks: {
-        display: true,
+        display: false,
       },
     },
   },
@@ -68,6 +73,8 @@ const scatterChartOptions = {
   },
 };
 
+
+
 const scatterChartData = computed(() => ({
   datasets: [
     {
@@ -83,8 +90,19 @@ const scatterChartData = computed(() => ({
 </script>
 
 <template>
-  <div class="w-100 h-100">
-    <Scatter :data="scatterChartData" :options="scatterChartOptions" />
-  </div>
+
+    <div class="card h-100">
+    <!--325px-->
+    <div class="card-header">
+      <i class="bi bi-border-outer" style="font-size: 1.2rem"></i>&nbsp;
+      <strong>Scatter diagram</strong>
+    </div>
+    <div class="card-body overflow-auto p-0">
+      <Scatter :data="scatterChartData" :options="scatterChartOptions" />
+    </div>
+      </div>
+
+
+
   <!--278px-->
 </template>
diff --git a/freedata_gui/src/components/grid/grid_stations_map.vue b/freedata_gui/src/components/grid/grid_stations_map.vue
index 3e254a68f..932362c13 100644
--- a/freedata_gui/src/components/grid/grid_stations_map.vue
+++ b/freedata_gui/src/components/grid/grid_stations_map.vue
@@ -5,6 +5,7 @@
         <button @click="zoomIn" class="btn btn-sm btn-outline-secondary"><i class="bi bi-plus-square"></i></button>
         <button @click="centerMap" class="btn btn-sm btn-secondary"><i class="bi bi-house-door"></i></button>
         <button @click="zoomOut" class="btn btn-sm btn-outline-secondary"><i class="bi bi-dash-square"></i></button>
+        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
       </div>
 
       <div class="input-group input-group-sm ms-2">
@@ -25,7 +26,7 @@ import * as d3 from 'd3';
 import { feature } from 'topojson-client';
 import { locatorToLatLng, distance } from 'qth-locator';
 import { setActivePinia } from 'pinia';
-import pinia from '../../store/index'; // Import your Pinia instance
+import pinia from '../../store/index';
 import { useStateStore } from '../../store/stateStore.js';
 
 // Activate Pinia
@@ -198,14 +199,27 @@ const updatePinsAndLines = (g) => {
   const heardStations = toRaw(state.heard_stations); // Ensure it's the raw data
   const points = [];
 
+
   // Prepare points for heard stations
   heardStations.forEach(item => {
-    if (item.gridsquare && item.gridsquare.trim() !== '' && item.origin) {
-      const [lat, lng] = locatorToLatLng(item.gridsquare);
-      points.push({ lat, lon: lng, origin: item.origin, gridsquare: item.gridsquare });
+    if (
+      item.gridsquare &&
+      item.gridsquare.trim() !== '' &&
+      item.gridsquare.trim() !== '------' &&
+      item.origin
+    ) {
+      try {
+        const [lat, lng] = locatorToLatLng(item.gridsquare);
+        if (lat != null && lng != null) {
+          points.push({ lat, lon: lng, origin: item.origin, gridsquare: item.gridsquare });
+        }
+      } catch (error) {
+        console.error(`Error converting gridsquare ${item.gridsquare}:`, error);
+      }
     }
   });
 
+
   // Add your own station's pin if mygrid is defined
   let mygrid = settings.remote.STATION.mygrid;
   if (mygrid) {
diff --git a/freedata_gui/src/components/grid/grid_stats_chart.vue b/freedata_gui/src/components/grid/grid_stats_chart.vue
index 854edec02..281220462 100644
--- a/freedata_gui/src/components/grid/grid_stats_chart.vue
+++ b/freedata_gui/src/components/grid/grid_stats_chart.vue
@@ -94,8 +94,17 @@ const transmissionSpeedChartData = computed(() => ({
 </script>
 
 <template>
+   <div class="card h-100">
+    <!--325px-->
+    <div class="card-header">
+      <i class="bi bi-graph-up-arrow" style="font-size: 1.2rem"></i>&nbsp;
+      <strong>Transmission Charts</strong>
+    </div>
+    <div class="card-body overflow-auto p-0">
   <Line
     :data="transmissionSpeedChartData"
     :options="transmissionSpeedChartOptions"
   />
+        </div>
+       </div>
 </template>
diff --git a/freedata_gui/src/components/main_footer_navbar.vue b/freedata_gui/src/components/main_footer_navbar.vue
index a0e421cc8..32cbdee0a 100644
--- a/freedata_gui/src/components/main_footer_navbar.vue
+++ b/freedata_gui/src/components/main_footer_navbar.vue
@@ -173,7 +173,7 @@ const state = useStateStore(pinia);
           aria-valuemax="100"
         ></div>
         <p class="justify-content-center m-0 d-flex position-absolute w-100 mt-1 text-light">
-          Message Progress {{state.arq_transmission_percent}}% [ {{ state.arq_bytes_per_minute || '---' }}
+          {{state.arq_transmission_percent}}% [ {{ state.arq_bytes_per_minute || '---' }}
     bpm / {{ state.arq_bits_per_second || '--' }}
     bps ]
         </p>
diff --git a/freedata_gui/src/components/main_startup_check.vue b/freedata_gui/src/components/main_startup_check.vue
index 2822c1eb2..8055570ab 100644
--- a/freedata_gui/src/components/main_startup_check.vue
+++ b/freedata_gui/src/components/main_startup_check.vue
@@ -133,41 +133,26 @@
 
 
                           <div class="alert alert-warning mt-3" role="alert">
- In case of unusual problems, you can stop and reload the internal modem manually.
+ In case of unusual problems, you can reload the internal modem manually. If the problem persists, consider a server restart.
 
 </div>
                           <div class="input-group input-group-sm">
                               <label class="input-group-text w-50">Manual modem restart</label>
-                              <label class="input-group-text">
+                              <label class="input-group-text w-50">
                               <button
                                  type="button"
                                  id="startModem"
-                                 class="btn btn-sm btn-outline-success"
+                                 class="btn btn-sm btn-outline-secondary w-100"
                                  data-bs-toggle="tooltip"
                                  data-bs-trigger="hover"
                                  data-bs-html="false"
-                                 title="Start the Modem. Please set your audio and radio settings first!"
-                                 @click="startModem"
-                                 :class="{ disabled: state.is_modem_running }"
+                                 title="Restart the Modem. Please set your audio and radio settings first!"
+                                 @click="reloadModem"
                                  >
-                              <i class="bi bi-play-fill"></i>
-                              </button>
-                              </label>
-                              <label class="input-group-text">
-                              <button
-                                 type="button"
-                                 id="stopModem"
-                                 class="btn btn-sm btn-outline-danger"
-                                 data-bs-toggle="tooltip"
-                                 data-bs-trigger="hover"
-                                 data-bs-html="false"
-                                 title="Stop the Modem."
-                                 @click="stopModem"
-                                 :class="{ disabled: !state.is_modem_running }"
-                                 >
-                              <i class="bi bi-stop-fill"></i>
+                              <i class="bi bi-arrow-clockwise"></i>
                               </button>
                               </label>
+
                            </div>
 
 
@@ -316,7 +301,7 @@ setActivePinia(pinia);
 
 // Store imports
 import { settingsStore as settings, onChange } from '../store/settingsStore.js';
-import { sendModemCQ } from '../js/api.js';
+import { sendModemCQ, startModem, stopModem } from '../js/api.js';
 import { useStateStore } from '../store/stateStore.js';
 import { useAudioStore } from '../store/audioStore';
 import { useSerialStore } from '../store/serialStore.js';
@@ -411,4 +396,10 @@ function testHamlib() {
 function reloadGUI() {
   location.reload();
 }
+
+function reloadModem(){
+  stopModem();
+  setTimeout(startModem, 5000); // Executes startModem after 5000 milliseconds as server needs to shutdown first
+}
+
 </script>
diff --git a/freedata_gui/src/components/settings_chat.vue b/freedata_gui/src/components/settings_chat.vue
index d910a8e09..7513f1a07 100644
--- a/freedata_gui/src/components/settings_chat.vue
+++ b/freedata_gui/src/components/settings_chat.vue
@@ -52,6 +52,33 @@ export default {
     </label>
   </div>
 
+<!-- Enable ADIF export -->
+  <div class="input-group input-group-sm mb-1">
+    <label class="input-group-text w-50 text-wrap">
+      Enable ADIF
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enable ADIF via UDP"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
+    </label>
+    <label class="input-group-text w-50">
+      <div class="form-check form-switch form-check-inline ms-2">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          id="enableADIFSwitch"
+          @change="onChange"
+          v-model="settings.remote.QSO_LOGGING.enable_adif_udp"
+        />
+        <label class="form-check-label" for="enableADIFSwitch">Enable</label>
+      </div>
+    </label>
+  </div>
+
   <!-- ADIF Log Host -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
@@ -71,7 +98,7 @@ export default {
       placeholder="Enter ADIF server host"
       id="adifLogHost"
       @change="onChange"
-      v-model="settings.remote.MESSAGES.adif_log_host"
+      v-model="settings.remote.QSO_LOGGING.adif_udp_host"
     />
   </div>
 
@@ -96,7 +123,78 @@ export default {
       max="65534"
       min="1025"
       @change="onChange"
-      v-model.number="settings.remote.MESSAGES.adif_log_port"
+      v-model.number="settings.remote.QSO_LOGGING.adif_udp_port"
+    />
+  </div>
+
+<!-- Enable Wavelog API -->
+  <div class="input-group input-group-sm mb-1">
+    <label class="input-group-text w-50 text-wrap">
+      Enable Wavelog API
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enable Wavelog API"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
+    </label>
+    <label class="input-group-text w-50">
+      <div class="form-check form-switch form-check-inline ms-2">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          id="enableWavelogSwitch"
+          @change="onChange"
+          v-model="settings.remote.QSO_LOGGING.enable_adif_wavelog"
+        />
+        <label class="form-check-label" for="enableWavelogSwitch">Enable</label>
+      </div>
+    </label>
+  </div>
+
+  <!-- Wavelog Host -->
+  <div class="input-group input-group-sm mb-1">
+    <label class="input-group-text w-50 text-wrap">
+      Wavelog API Host
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Wavelog API server host, e.g., 127.0.0.1"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
+    </label>
+    <input
+      type="text"
+      class="form-control"
+      placeholder="Enter wavelog server host"
+      id="wavelogHost"
+      @change="onChange"
+      v-model="settings.remote.QSO_LOGGING.adif_wavelog_host"
+    />
+  </div>
+  <div class="input-group input-group-sm mb-1">
+    <label class="input-group-text w-50 text-wrap">
+      Wavelog API key
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Wavelog API key"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
+    </label>
+    <input
+      type="text"
+      class="form-control"
+      placeholder="Enter Wavelog api key"
+      id="wavelogApiKey"
+      @change="onChange"
+      v-model="settings.remote.QSO_LOGGING.adif_wavelog_api_key"
     />
   </div>
 </template>
diff --git a/freedata_gui/src/components/settings_exp.vue b/freedata_gui/src/components/settings_exp.vue
index f01cbf899..2e3a65ad2 100644
--- a/freedata_gui/src/components/settings_exp.vue
+++ b/freedata_gui/src/components/settings_exp.vue
@@ -1,11 +1,9 @@
 <script setup>
-import { setConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
 setActivePinia(pinia);
 
-import { settingsStore as settings } from "../store/settingsStore.js";
 </script>
 
 <template>
@@ -14,32 +12,11 @@ import { settingsStore as settings } from "../store/settingsStore.js";
     <strong><i class="bi bi-shield-exclamation me-1"></i>WARNING:</strong> These features may be incomplete. They are for <u>experienced</u> users ONLY!
   </div>
 
-  <!-- Enable MESH Protocol -->
-  <div class="input-group input-group-sm mb-1">
-    <label class="input-group-text w-50 text-wrap">
-      Enable MESH protocol
-      <button
-        type="button"
-        class="btn btn-link p-0 ms-2"
-        data-bs-toggle="tooltip"
-        title="Experimental feature"
-      >
-        <i class="bi bi-question-circle"></i>
-      </button>
-    </label>
-    <label class="input-group-text w-50">
-      <div class="form-check form-switch form-check-inline ms-2">
-        <input
-          class="form-check-input"
-          type="checkbox"
-          id="enableMeshSwitch"
-          @change="setConfig"
-          v-model="settings.remote.MESH.enable_protocol"
-          disabled
-        />
-        <label class="form-check-label" for="enableMeshSwitch">Enable</label>
-      </div>
-    </label>
+
+  <div class="alert alert-info" role="alert">
+    <strong><i class="bi bi-info-circle me-1"></i>Info:</strong> No features published for testing, yet.
   </div>
+
+
 </template>
 
diff --git a/freedata_gui/src/components/settings_modem.vue b/freedata_gui/src/components/settings_modem.vue
index 0d3127f91..628f8f024 100644
--- a/freedata_gui/src/components/settings_modem.vue
+++ b/freedata_gui/src/components/settings_modem.vue
@@ -8,13 +8,18 @@ import { setActivePinia } from "pinia";
 import pinia from "../store/index";
 setActivePinia(pinia);
 
-import { useStateStore } from "../store/stateStore.js";
-const state = useStateStore(pinia);
 
 import { startModem, stopModem } from "../js/api.js";
 
 import { useAudioStore } from "../store/audioStore";
 const audioStore = useAudioStore(pinia);
+
+
+function reloadModem(){
+  stopModem();
+  setTimeout(startModem, 5000); // Executes startModem after 5000 milliseconds as server needs to shutdown first
+}
+
 </script>
 
 <template>
@@ -23,6 +28,10 @@ const audioStore = useAudioStore(pinia);
     <strong><i class="bi bi-gear-wide-connected me-1"></i>Modem and Audio</strong> related settings, including starting/stopping the modem, configuring audio devices, and adjusting audio levels.
   </div>
 
+  <div class="alert alert-light" role="alert">
+   Settings in <strong class="text-danger">RED</strong> require a server restart!
+  </div>
+
   <!-- Start and Stop Modem Buttons -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
@@ -39,33 +48,20 @@ const audioStore = useAudioStore(pinia);
     <div class="w-50 d-flex justify-content-between">
       <button
         type="button"
-        id="startModem"
-        class="btn btn-outline-success btn-sm w-50 me-1"
+        class="btn btn-outline-secondary btn-sm w-100 me-1"
         data-bs-toggle="tooltip"
         title="Start the Modem"
-        @click="startModem"
-        :disabled="state.is_modem_running"
+        @click="reloadModem"
       >
-        <i class="bi bi-play-fill"></i>
-        Start
-      </button>
-      <button
-        type="button"
-        id="stopModem"
-        class="btn btn-outline-danger btn-sm w-50 ms-1"
-        data-bs-toggle="tooltip"
-        title="Stop the Modem"
-        @click="stopModem"
-        :disabled="!state.is_modem_running"
-      >
-        <i class="bi bi-stop-fill"></i>
-        Stop
+        <i class="bi bi-arrow-clockwise"></i>
+        Reload
       </button>
+
     </div>
   </div>
   <!-- Modem Port -->
   <div class="input-group input-group-sm mb-1">
-    <label class="input-group-text w-50 text-wrap">
+    <label class="input-group-text w-50 text-wrap text-danger">
       Modem port
       <button
         type="button"
@@ -91,7 +87,7 @@ const audioStore = useAudioStore(pinia);
 
   <!-- Modem Host -->
   <div class="input-group input-group-sm mb-1">
-    <label class="input-group-text w-50 text-wrap">
+    <label class="input-group-text w-50 text-wrap text-danger">
       Modem host
       <button
         type="button"
diff --git a/freedata_gui/src/components/settings_web.vue b/freedata_gui/src/components/settings_web.vue
index 3ea4ff9f4..8da976e74 100644
--- a/freedata_gui/src/components/settings_web.vue
+++ b/freedata_gui/src/components/settings_web.vue
@@ -13,15 +13,19 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
     <strong><i class="bi bi-gear-wide-connected me-1"></i>Explorer</strong> related settings, including enabling <strong>Explorer publishing</strong> and <strong>Explorer stats publishing</strong>.
   </div>
 
+    <div class="alert alert-light" role="alert">
+    Publish information like your frequency or heard stations to <strong>https://explorer.freedata.app</strong>, so other users can see your stations status. Publishing stats is currently under development and might be broken.
+  </div>
+
   <!-- Explorer Publishing -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
-      Explorer publishing
+      publish station status
       <button
         type="button"
         class="btn btn-link p-0 ms-2"
         data-bs-toggle="tooltip"
-        title="Share your station's data with the Explorer network"
+        title="Share your station's status with FreeDATA web service"
       >
         <i class="bi bi-question-circle"></i>
       </button>
@@ -43,12 +47,12 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
   <!-- Explorer Stats Publishing -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
-      Explorer stats publishing
+      publish statistics
       <button
         type="button"
         class="btn btn-link p-0 ms-2"
         data-bs-toggle="tooltip"
-        title="Share your station's statistics with the Explorer network"
+        title="Share your station's statistics with FreeDATA web service"
       >
         <i class="bi bi-question-circle"></i>
       </button>
diff --git a/freedata_gui/src/store/settingsStore.js b/freedata_gui/src/store/settingsStore.js
index a0b9ee9b2..ec30d438b 100644
--- a/freedata_gui/src/store/settingsStore.js
+++ b/freedata_gui/src/store/settingsStore.js
@@ -21,15 +21,15 @@ const defaultConfig = {
       rx_audio_level: 0,
       tx_audio_level: 0,
     },
-    MESH: {
-      enable_protocol: false,
-    },
     MODEM: {
       tx_delay: 0,
-      enable_hamc: false,
       enable_morse_identifier: false,
       maximum_bandwidth: 3000,
     },
+    NETWORK: {
+            modemaddress: "127.0.0.1",
+            modemport: 5000,
+        },
     RADIO: {
       control: "disabled",
       model_id: 0,
@@ -69,9 +69,23 @@ const defaultConfig = {
     },
     MESSAGES: {
       enable_auto_repeat: false,
-      adif_log_host: "127.0.0.1",
-      adif_log_port: "2237",
     },
+    SOCKET_INTERFACE: {
+      enable: false,
+      host: "127.0.0.1",
+      cmd_port: 8000,
+      data_port: 8001,
+    },
+
+    QSO_LOGGING: {
+      enable_adif_udp: false,
+      adif_udp_host: "127.0.0.1",
+      adif_udp_port: "2237",
+      enable_adif_wavelog: false,
+      adif_wavelog_host: "127.0.0.1",
+      adif_wavelog_api_key: "",
+    },
+
     GUI: {
       auto_run_browser: true,
     },
diff --git a/freedata_gui/src/styles.css b/freedata_gui/src/styles.css
index 35536b6bd..1c9cddecf 100644
--- a/freedata_gui/src/styles.css
+++ b/freedata_gui/src/styles.css
@@ -77,6 +77,13 @@ th {
   border-radius: 10px;
 }
 
+emoji-picker {
+  width: 100%;
+}
+
+
+
+
 /* force gpu usage
 https://stackoverflow.com/questions/13176746/css-keyframe-animation-cpu-usage-is-high-should-it-be-this-way/13293044#13293044
 */
diff --git a/freedata_server/adif_udp_logger.py b/freedata_server/adif_udp_logger.py
index e0e96b74c..1f3f78405 100644
--- a/freedata_server/adif_udp_logger.py
+++ b/freedata_server/adif_udp_logger.py
@@ -1,5 +1,6 @@
 import socket
-
+import re
+import structlog
 
 
 def send_adif_qso_data(config, adif_data):
@@ -11,16 +12,25 @@ def send_adif_qso_data(config, adif_data):
     server_port (int): Port of the server.
     adif_data (str): ADIF-formatted QSO data.
     """
-    adif_log_host = config['MESSAGES'].get('adif_log_host', '127.0.0.1')
-    adif_log_port = int(config['MESSAGES'].get('adif_log_port', '2237'))
+
+    log = structlog.get_logger()
+
+    # If False then exit the function
+    adif = config['QSO_LOGGING'].get('enable_adif_udp', 'False')
+
+    if not adif:
+        return  # exit as we don't want to log ADIF UDP
+
+    adif_log_host = config['QSO_LOGGING'].get('adif_udp_host', '127.0.0.1')
+    adif_log_port = int(config['QSO_LOGGING'].get('adif_udp_port', '2237'))
 
     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     try:
+
         # Send the ADIF data to the server
         sock.sendto(adif_data.encode('utf-8'), (adif_log_host, adif_log_port))
-        print(f"ADIF QSO data sent to {adif_log_host}:{adif_log_port}", adif_data.encode('utf-8'))
+        log.info(f"[CHAT] ADIF QSO data sent to: {adif_log_host}:{adif_log_port} {adif_data.encode('utf-8')}")
     except Exception as e:
-        print(f"Error sending ADIF data: {e}")
+        log.info(f"[CHAT] Error sending ADIF data: {e}")
     finally:
         sock.close()
-
diff --git a/freedata_server/api/__init__.py b/freedata_server/api/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/freedata_server/api/command_helpers.py b/freedata_server/api/command_helpers.py
new file mode 100644
index 000000000..238766b1b
--- /dev/null
+++ b/freedata_server/api/command_helpers.py
@@ -0,0 +1,27 @@
+# api/command_helpers.py
+import asyncio
+
+
+async def enqueue_tx_command(app, cmd_class, params={}):
+    """
+    Enqueue a transmit command using the app's managers.
+
+    Args:
+        app: The FastAPI app instance (e.g., request.app) containing config_manager, state_manager, etc.
+        cmd_class: The command class to instantiate and run.
+        params: A dict of parameters for the command.
+
+    Returns:
+        True if the command was successfully enqueued and ran, False otherwise.
+    """
+    try:
+        # Create an instance of the command using app components.
+        command = cmd_class(app.config_manager.read(), app.state_manager, app.event_manager, params)
+        print(f"Command {command.get_name()} running...")
+        # Run the command in a separate thread to avoid blocking the event loop.
+        result = await asyncio.to_thread(command.run, app.modem_events, app.service_manager.modem)
+        if result:
+            return True
+    except Exception as e:
+        print(f"Command failed: {e}")
+    return False
diff --git a/freedata_server/api/common.py b/freedata_server/api/common.py
new file mode 100644
index 000000000..1f7c9dfad
--- /dev/null
+++ b/freedata_server/api/common.py
@@ -0,0 +1,26 @@
+from fastapi import HTTPException
+from fastapi.responses import JSONResponse
+
+# Returns a standard API response
+def api_response(data, status=200):
+    return JSONResponse(content=data, status_code=status)
+
+
+def api_abort(message, code):
+    print(message)
+    raise HTTPException(status_code=code, detail={"error": message})
+
+
+def api_ok(message="ok"):
+    return api_response({'message': message})
+
+
+# Validates a parameter
+def validate(req, param, validator, is_required=True):
+    if param not in req:
+        if is_required:
+            api_abort(f"Required parameter '{param}' is missing.", 400)
+        else:
+            return True
+    if not validator(req[param]):
+        api_abort(f"Value of '{param}' is invalid.", 400)
diff --git a/freedata_server/api/config.py b/freedata_server/api/config.py
new file mode 100644
index 000000000..a31d9cac1
--- /dev/null
+++ b/freedata_server/api/config.py
@@ -0,0 +1,166 @@
+from fastapi import APIRouter, Request
+from api.common import api_response, api_abort, api_ok, validate
+import api_validations as validations
+router = APIRouter()
+
+@router.get("/", summary="Get Modem Configuration", tags=["Configuration"], responses={
+    200: {
+        "description": "Current modem configuration settings.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "AUDIO": {
+                        "input_device": "2fc0",
+                        "output_device": "3655",
+                        "rx_audio_level": 0,
+                        "tx_audio_level": 2
+                    },
+                    "MESSAGES": {
+                        "enable_auto_repeat": True
+                    },
+                    "MODEM": {
+                        "enable_morse_identifier": False,
+                        "enable_socket_interface": False,
+                        "maximum_bandwidth": 2438,
+                        "tx_delay": 200
+                    },
+                    "NETWORK": {
+                        "modemaddress": "",
+                        "modemport": 5000
+                    },
+                    "RADIO": {
+                        "control": "rigctld",
+                        "data_bits": 8,
+                        "model_id": 1001,
+                        "ptt_port": "ignore",
+                        "ptt_type": "USB",
+                        "serial_dcd": "NONE",
+                        "serial_dtr": "OFF",
+                        "serial_handshake": "ignore",
+                        "serial_port": "/dev/cu.Bluetooth-Incoming-Port",
+                        "serial_speed": 38400,
+                        "stop_bits": 1
+                    },
+                    "RIGCTLD": {
+                        "arguments": "",
+                        "command": "",
+                        "ip": "127.0.0.1",
+                        "path": "",
+                        "port": 4532
+                    },
+                    "SOCKET_INTERFACE": {
+                        "cmd_port": 0,
+                        "data_port": 0,
+                        "enable": False,
+                        "host": ""
+                    },
+                    "STATION": {
+                        "enable_explorer": True,
+                        "enable_stats": True,
+                        "mycall": "LA3QMA",
+                        "mygrid": "JP20ql",
+                        "myssid": 0,
+                        "ssid_list": [0,1,2,3,4,5,6,7,8,9],
+                        "respond_to_cq": True,
+                    },
+                    "TCI": {
+                        "tci_ip": "127.0.0.1",
+                        "tci_port": 50001
+                    }
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def get_config(request: Request):
+    """
+    Retrieve the current modem configuration.
+
+    Returns:
+        dict: The modem configuration settings.
+    """
+    return request.app.config_manager.read()
+
+
+@router.post("/", summary="Update Modem Configuration", tags=["Configuration"], responses={
+    200: {
+        "description": "Modem configuration updated successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "AUDIO": {
+                        "input_device": "2fc0",
+                        "output_device": "3655",
+                        "rx_audio_level": 0,
+                        "tx_audio_level": 2
+                    },
+                    # ...
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Invalid configuration data.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid config"
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Error writing configuration.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Error writing config"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def post_config(request: Request):
+    """
+    Update the modem configuration with new settings.
+
+    Parameters:
+        request (Request): The HTTP request containing the new configuration in JSON format.
+
+    Returns:
+        dict: The updated modem configuration.
+
+    Raises:
+        HTTPException: If the provided configuration is invalid or an error occurs while writing the config.
+    """
+    config = await request.json()
+    print(config)
+    if not validations.validate_remote_config(config):
+        api_abort("Invalid config", 400)
+    if request.app.config_manager.read() == config:
+        return config
+    set_config = request.app.config_manager.write(config)
+    if not set_config:
+        api_abort("Error writing config", 500)
+    request.app.modem_service.put("restart")
+    return set_config
diff --git a/freedata_server/api/devices.py b/freedata_server/api/devices.py
new file mode 100644
index 000000000..10c9d4643
--- /dev/null
+++ b/freedata_server/api/devices.py
@@ -0,0 +1,147 @@
+from fastapi import APIRouter, Request
+from api.common import api_response, api_abort, api_ok, validate
+router = APIRouter()
+import audio
+import serial_ports
+
+
+@router.get("/audio", summary="Get Audio Devices", tags=["Devices"], responses={
+    200: {
+        "description": "List of available audio input and output devices.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "in": [
+                        {
+                            "api": "ALSA",
+                            "id": "8eb1",
+                            "name": "pipewire",
+                            "native_index": 4
+                        },
+                        {
+                            "api": "ALSA",
+                            "id": "8e7a",
+                            "name": "default",
+                            "native_index": 5
+                        }
+                    ],
+                    "out": [
+                        {
+                            "api": "ALSA",
+                            "id": "ae79",
+                            "name": "HDA Intel HDMI: 0 (hw:0,3)",
+                            "native_index": 0
+                        },
+                        {
+                            "api": "ALSA",
+                            "id": "67fd",
+                            "name": "HDA Intel HDMI: 1 (hw:0,7)",
+                            "native_index": 1
+                        },
+                        {
+                            "api": "ALSA",
+                            "id": "b68c",
+                            "name": "HDA Intel HDMI: 2 (hw:0,8)",
+                            "native_index": 2
+                        },
+                        {
+                            "api": "ALSA",
+                            "id": "ba84",
+                            "name": "hdmi",
+                            "native_index": 3
+                        },
+                        {
+                            "api": "ALSA",
+                            "id": "8eb1",
+                            "name": "pipewire",
+                            "native_index": 4
+                        },
+                        {
+                            "api": "ALSA",
+                            "id": "8e7a",
+                            "name": "default",
+                            "native_index": 5
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_audio_devices():
+    """
+    Retrieve a list of available audio input and output devices.
+
+    Returns:
+        dict: A JSON object containing lists of input and output audio devices.
+    """
+    # Uncomment the following line if using the actual function
+    # dev_in, dev_out = audio.get_audio_devices()
+    dev_in, dev_out = audio.fetch_audio_devices([], [])
+    return {'in': dev_in, 'out': dev_out}
+
+
+@router.get("/serial", summary="Get Serial Devices", tags=["Devices"], responses={
+    200: {
+        "description": "List of available serial devices (COM ports).",
+        "content": {
+            "application/json": {
+                "example": [
+                    {
+                        "description": "n/a [26a9]",
+                        "port": "/dev/ttyS4"
+                    }
+                ]
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_serial_devices():
+    """
+    Retrieve a list of available serial devices (COM ports).
+
+    Returns:
+        list: A list of dictionaries containing serial port information.
+    """
+    devices = serial_ports.get_ports()
+    return devices
diff --git a/freedata_server/api/freedata.py b/freedata_server/api/freedata.py
new file mode 100644
index 000000000..ab6a12940
--- /dev/null
+++ b/freedata_server/api/freedata.py
@@ -0,0 +1,712 @@
+from fastapi import APIRouter, Request
+from api.common import api_response, api_abort, api_ok, validate
+from api.command_helpers import enqueue_tx_command
+from message_system_db_messages import DatabaseManagerMessages
+from message_system_db_attachments import DatabaseManagerAttachments
+from message_system_db_beacon import DatabaseManagerBeacon
+from message_system_db_station import DatabaseManagerStations
+import command_message_send
+import adif_udp_logger
+import wavelog_api_logger
+
+
+router = APIRouter()
+
+
+@router.get("/messages/{message_id}", summary="Get Message by ID", tags=["FreeDATA"], responses={
+    200: {"description": "Message found and returned."},
+    404: {"description": "Message not found."}
+})
+async def get_freedata_message(message_id: str, request: Request):
+    message = DatabaseManagerMessages(request.app.event_manager).get_message_by_id_json(message_id)
+    return api_response(message)
+
+
+@router.post("/messages", summary="Transmit Message", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Message transmitted successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "destination": "XX1XXX-6",
+                    "body": "Hello FreeDATA"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running or busy.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_freedata_message(request: Request):
+    """
+    Transmit a FreeDATA message.
+
+    Parameters:
+        request (Request): The HTTP request containing the message data in JSON format.
+
+    Returns:
+        dict: A JSON object containing the transmitted message details.
+    """
+    data = await request.json()
+    await enqueue_tx_command(request.app, command_message_send.SendMessageCommand, data)
+    return api_response(data)
+
+@router.post("/messages/{message_id}/adif", summary="Send Message ADIF Log", tags=["FreeDATA"], responses={
+    200: {
+        "description": "ADIF log sent successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "adif_output": "ADIF data..."
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid message ID."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Message not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_freedata_message_adif_log(message_id: str, request:Request):
+    adif_output = DatabaseManagerMessages(request.app.event_manager).get_message_by_id_adif(message_id)
+
+    # if message not found do not send adif as the return then is not valid
+    if not adif_output:
+        return
+
+    # Send the ADIF data via UDP
+    adif_udp_logger.send_adif_qso_data(request.app.config_manager.read(), adif_output)
+    wavelog_api_logger.send_wavelog_qso_data(request.app.config_manager.read(), adif_output)
+    return api_response(adif_output)
+
+@router.patch("/messages/{message_id}", summary="Update Message by ID", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Message updated successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "is_read": True
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid parameters."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "Message not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Message not found."
+                }
+            }
+        }
+    }
+})
+async def patch_freedata_message(message_id: str, request: Request):
+    """
+    Update a FreeDATA message by its ID.
+
+    Parameters:
+        message_id (str): The ID of the message to update.
+        request (Request): The HTTP request containing the update data in JSON format.
+
+    Returns:
+        dict: A JSON object containing the updated message details.
+    """
+    data = await request.json()
+
+    if data.get("action") == "retransmit":
+        result = DatabaseManagerMessages(request.app.event_manager).update_message(message_id, update_data={'status': 'queued'})
+        DatabaseManagerMessages(request.app.event_manager).increment_message_attempts(message_id)
+    else:
+        result = DatabaseManagerMessages(request.app.event_manager).update_message(message_id, update_data=data)
+
+    return api_response(result)
+
+
+@router.get("/messages", summary="Get All Messages", tags=["FreeDATA"], responses={
+    200: {
+        "description": "List of all messages.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "total_messages": 1,
+                    "messages": [
+                        {
+                            "id": "DXCALL-6_MYCALL-0_2024-04-12T20:39:05.302479",
+                            "timestamp": "2024-04-12T20:39:05.302479",
+                            "origin": "DXCALL-6",
+                            "via": None,
+                            "destination": "MYCALL-0",
+                            "direction": "receive",
+                            "body": "Hello !",
+                            "attachments": [],
+                            "status": "received",
+                            "priority": 10,
+                            "is_read": False,
+                            "statistics": {
+                                "total_bytes": 120,
+                                "duration": 29.76698660850525,
+                                "bytes_per_minute": 241,
+                                "time_histogram": {
+                                    "0": "2024-04-12T20:39:23.423169",
+                                    "1": "2024-04-12T20:39:30.504638",
+                                    "2": "2024-04-12T20:39:37.745075"
+                                },
+                                "snr_histogram": {
+                                    "0": -6,
+                                    "1": -6,
+                                    "2": -6
+                                },
+                                "bpm_histogram": {
+                                    "0": 198,
+                                    "1": 265,
+                                    "2": 252
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def get_freedata_messages(request: Request):
+    filters = {k: v for k, v in request.query_params.items() if v}
+    result = DatabaseManagerMessages(request.app.event_manager).get_all_messages_json(filters=filters)
+    return api_response(result)
+
+
+@router.post("/messages", summary="Transmit Message", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Message transmitted successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "destination": "XX1XXX-6",
+                    "body": "Hello FreeDATA"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def post_freedata_message(request: Request):
+    """
+    Transmit a FreeDATA message.
+
+    Parameters:
+        request (Request): The HTTP request containing the message data in JSON format.
+
+    Returns:
+        dict: A JSON object containing the transmitted message details.
+    """
+    data = await request.json()
+    await enqueue_tx_command(request.app, command_message_send.SendMessageCommand, data)
+    return api_response(data)
+
+
+
+@router.delete("/messages/{message_id}", summary="Delete Message by ID", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Message deleted successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": "DXCALL-0_MYCALL-5_2024-04-04T17:22:14.002502 deleted",
+                    "status": "success"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "Message not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": "Message not found",
+                    "status": "failure"
+                }
+            }
+        }
+    }
+})
+async def delete_freedata_message(message_id: str, request:Request):
+    result = DatabaseManagerMessages(request.app.event_manager).delete_message(message_id)
+    if result:
+        return api_response({"message": f"{message_id} deleted", "status": "success"})
+    else:
+        return api_response({"message": "Message not found", "status": "failure"}, status_code=404)
+
+
+@router.get("/messages/{message_id}/attachments", summary="Get Attachments by Message ID", tags=["FreeDATA"], responses={
+    200: {
+        "description": "List of attachments for the specified message.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "attachments": [
+                        {
+                            "id": "attachment1",
+                            "filename": "file1.txt",
+                            "file_size": 1024,
+                            "file_type": "text/plain",
+                            "data_sha512": "abcdef1234567890..."
+                        },
+                        {
+                            "id": "attachment2",
+                            "filename": "image.png",
+                            "file_size": 2048,
+                            "file_type": "image/png",
+                            "data_sha512": "123456abcdef7890..."
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_message_attachments(message_id: str, request:Request):
+    attachments = DatabaseManagerAttachments(request.app.event_manager).get_attachments_by_message_id_json(message_id)
+    return api_response(attachments)
+
+
+@router.get("/messages/attachment/{data_sha512}", summary="Get Attachment by SHA512", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Retrieve a specific attachment by its SHA512 hash.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "id": "attachment1",
+                    "filename": "file1.txt",
+                    "file_size": 1024,
+                    "file_type": "text/plain",
+                    "data_sha512": "abcdef1234567890..."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested attachment was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Attachment not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_message_attachment(data_sha512: str, request:Request):
+    attachment = DatabaseManagerAttachments(request.app.event_manager).get_attachment_by_sha512(data_sha512)
+    return api_response(attachment)
+
+
+@router.get("/beacons", summary="Get Received Beacons", tags=["FreeDATA"], responses={
+    200: {
+        "description": "List of received beacons.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "total_beacons": 2,
+                    "beacons": [
+                        {
+                            "id": "DXCALL-0_MYCALL-5_2024-04-04T17:22:14.002502",
+                            "timestamp": "2024-04-04T17:22:14.002502",
+                            "origin": "DXCALL-0",
+                            "via": None,
+                            "destination": "MYCALL-5",
+                            "direction": "receive",
+                            "body": "Hello FreeDATA",
+                            "attachments": [],
+                            "status": "received",
+                            "priority": 10,
+                            "is_read": False,
+                            "statistics": {
+                                "total_bytes": 120,
+                                "duration": 29.77,
+                                "bytes_per_minute": 241,
+                                "time_histogram": {
+                                    "0": "2024-04-04T17:22:23.423169",
+                                    "1": "2024-04-04T17:22:30.504638",
+                                    "2": "2024-04-04T17:22:37.745075"
+                                },
+                                "snr_histogram": {
+                                    "0": -6,
+                                    "1": -6,
+                                    "2": -6
+                                },
+                                "bpm_histogram": {
+                                    "0": 198,
+                                    "1": 265,
+                                    "2": 252
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid request."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_all_beacons(request:Request):
+    beacons = DatabaseManagerBeacon(request.app.event_manager).get_all_beacons()
+    return api_response(beacons)
+
+
+@router.get("/beacons/{callsign}", summary="Get Beacon by Callsign", tags=["FreeDATA"], responses={
+    200: {
+        "description": "List of beacons from the specified callsign.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "beacons": [
+                        {
+                            "id": "DXCALL-0_MYCALL-5_2024-04-04T17:22:14.002502",
+                            "timestamp": "2024-04-04T17:22:14.002502",
+                            "origin": "DXCALL-0",
+                            "via": None,
+                            "destination": "MYCALL-5",
+                            "direction": "receive",
+                            "body": "Hello FreeDATA",
+                            "attachments": [],
+                            "status": "received",
+                            "priority": 10,
+                            "is_read": False,
+                            "statistics": {
+                                "total_bytes": 120,
+                                "duration": 29.77,
+                                "bytes_per_minute": 241,
+                                "time_histogram": {
+                                    "0": "2024-04-04T17:22:23.423169",
+                                    "1": "2024-04-04T17:22:30.504638",
+                                    "2": "2024-04-04T17:22:37.745075"
+                                },
+                                "snr_histogram": {
+                                    "0": -6,
+                                    "1": -6,
+                                    "2": -6
+                                },
+                                "bpm_histogram": {
+                                    "0": 198,
+                                    "1": 265,
+                                    "2": 252
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid request."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_beacons_by_callsign(callsign: str, request:Request):
+    beacons = DatabaseManagerBeacon(request.app.event_manager).get_beacons_by_callsign(callsign)
+    return api_response(beacons)
+
+
+@router.get("/station/{callsign}", summary="Get Station Info", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Retrieve station information by callsign.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "callsign": "MYCALL-0",
+                    "location": "Springfield",
+                    "frequency": "14093000",
+                    "mode": "PKTUSB",
+                    "status": "active",
+                    "additional_info": "Station details here."
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid callsign parameter."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested station was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Station not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_station_info(callsign: str, request: Request):
+    station = DatabaseManagerStations(request.app.event_manager).get_station(callsign)
+    return api_response(station)
+
+
+@router.post("/station/{callsign}", summary="Set Station Info", tags=["FreeDATA"], responses={
+    200: {
+        "description": "Station information updated successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "callsign": "MYCALL-0",
+                    "location": "Springfield",
+                    "frequency": "14093000",
+                    "mode": "PKTUSB",
+                    "status": "active",
+                    "additional_info": "Updated station details."
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid input data."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested station was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Station not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def set_station_info(callsign: str, request: Request):
+    data = await request.json()
+    result = DatabaseManagerStations(request.app.event_manager).update_station_info(callsign, new_info=data["info"])
+    return api_response(result)
\ No newline at end of file
diff --git a/freedata_server/api/general.py b/freedata_server/api/general.py
new file mode 100644
index 000000000..944fd8660
--- /dev/null
+++ b/freedata_server/api/general.py
@@ -0,0 +1,123 @@
+import platform
+
+from fastapi import APIRouter, Request
+import platform
+
+
+
+
+router = APIRouter()
+
+@router.get("/", summary="API Root", tags=["General"], responses={
+    200: {
+        "description": "API information.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "name": "FreeDATA API",
+                    "description": "A sample API that provides free data services",
+                    "api_version": 3,
+                    "modem_version": "0.16.8-alpha",
+                    "license": "GPL3.0",
+                    "documentation": "https://wiki.freedata.app"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Service unavailable.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Service unavailable."
+                }
+            }
+        }
+    }
+})
+async def index(request: Request):
+    """
+    Retrieve API metadata.
+
+    Returns:
+        dict: A JSON object containing API metadata.
+    """
+    return {
+        'name': 'FreeDATA API',
+        'description': 'A sample API that provides free data services',
+        'api_version': request.app.API_VERSION,
+        'modem_version': request.app.MODEM_VERSION,
+        'license': "GPL3.0",
+        'documentation': "https://wiki.freedata.app",
+    }
+
+@router.get("/version", summary="Get Modem Version", tags=["General"], responses={
+    200: {
+        "description": "Successful Response",
+        "content": {
+            "application/json": {
+                "example": {
+                    "api_version": 3,
+                    "modem_version": "0.16.8-alpha",
+                    "os_info": {
+                        "system": "Linux",
+                        "node": "my-node",
+                        "release": "5.4.0-74-generic",
+                        "version": "#83-Ubuntu SMP Mon May 10 16:30:51 UTC 2021",
+                        "machine": "x86_64",
+                        "processor": "x86_64"
+                    },
+                    "python_info": {
+                        "build": ["default", "May  3 2021 19:12:05"],
+                        "compiler": "GCC 9.3.0",
+                        "branch": "",
+                        "implementation": "CPython",
+                        "revision": "",
+                        "version": "3.8.5"
+                    }
+                }
+            }
+        }
+    }
+})
+async def get_modem_version(request: Request):
+    """
+    Retrieve the modem version, API version, OS information, and Python information.
+
+    Returns:
+        dict: A JSON object containing version information.
+    """
+    os_info = {
+        'system': platform.system(),
+        'node': platform.node(),
+        'release': platform.release(),
+        'version': platform.version(),
+        'machine': platform.machine(),
+        'processor': platform.processor(),
+    }
+
+    python_info = {
+        'build': platform.python_build(),
+        'compiler': platform.python_compiler(),
+        'branch': platform.python_branch(),
+        'implementation': platform.python_implementation(),
+        'revision': platform.python_revision(),
+        'version': platform.python_version()
+    }
+
+    return {
+        'api_version': request.app.API_VERSION,
+        'modem_version': request.app.MODEM_VERSION,
+        'os_info': os_info,
+        'python_info': python_info
+    }
diff --git a/freedata_server/api/modem.py b/freedata_server/api/modem.py
new file mode 100644
index 000000000..02b140cc3
--- /dev/null
+++ b/freedata_server/api/modem.py
@@ -0,0 +1,803 @@
+from fastapi import APIRouter, Request
+from api.common import api_response, api_abort, api_ok, validate
+from api.command_helpers import enqueue_tx_command
+import command_cq
+import command_beacon
+import command_ping
+import command_fec
+import command_test
+import command_arq_raw
+import api_validations as validations
+
+router = APIRouter()
+
+
+@router.get("/state", summary="Get Modem State", tags=["Modem"], responses={
+    200: {
+        "description": "Current modem state information.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "activities": {
+                        "161dd75ef3b5847a": {
+                            "activity_type": "ARQ_BURST_ACK",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "session_id": 105,
+                            "snr": 4,
+                            "timestamp": 1713034266
+                        },
+                        "168e90799d13b7b4": {
+                            "activity_type": "ARQ_SESSION_INFO_ACK",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "session_id": 105,
+                            "snr": -3,
+                            "timestamp": 1713034248
+                        },
+                        "2218b849e937d36d": {
+                            "activity_type": "QRV",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "gridsquare": "JP15OW",
+                            "origin": "SOMECALL-1",
+                            "snr": 2,
+                            "timestamp": 1713034200
+                        },
+                        "3fb424827f4632ab": {
+                            "activity_type": "BEACON",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "gridsquare": "JP22AI",
+                            "origin": "CALLSIGN-1",
+                            "snr": -8,
+                            "timestamp": 1713034455
+                        },
+                        "743222d1dd64ce9d": {
+                            "activity_type": "ARQ_SESSION_OPEN_ACK",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "origin": "CALL-1",
+                            "session_id": 105,
+                            "snr": -2,
+                            "timestamp": 1713034243
+                        },
+                        "7589edf6bf23ceed": {
+                            "activity_type": "ARQ_BURST_ACK",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "session_id": 105,
+                            "snr": 2,
+                            "timestamp": 1713034275
+                        },
+                        "9d2c5a98fe0f9894": {
+                            "activity_type": "QRV",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "gridsquare": "JP12AW",
+                            "origin": "CALLME-1",
+                            "snr": 5,
+                            "timestamp": 1713034178
+                        },
+                        "f85609dced4ea40a": {
+                            "activity_type": "ARQ_BURST_ACK",
+                            "direction": "received",
+                            "frequency": "14093000",
+                            "frequency_offset": 0,
+                            "session_id": 105,
+                            "snr": 0,
+                            "timestamp": 1713034257
+                        }
+                    },
+                    "audio_dbfs": -7.915304862713354,
+                    "channel_busy_slot": [False, False, True, False, False],
+                    "is_away_from_key": False,
+                    "is_beacon_running": True,
+                    "is_modem_busy": False,
+                    "is_modem_running": True,
+                    "radio_frequency": "14093000",
+                    "radio_mode": "PKTUSB",
+                    "radio_status": True,
+                    "s_meter_strength": "20",
+                    "type": "state"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def get_modem_state(request:Request):
+    """
+    Retrieve the current state of the modem.
+
+    Returns:
+        dict: A JSON object containing modem state information.
+    """
+    return request.app.state_manager.sendState()
+
+
+@router.post("/cqcqcq", summary="Send CQ Command", tags=["Modem"], responses={
+    200: {
+        "description": "CQ command sent successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": "ok"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_cqcqcq(request:Request):
+    """
+    Trigger the modem to send a CQ.
+
+    Returns:
+        dict: A JSON object indicating success.
+
+    Raises:
+        HTTPException: If the modem is not running.
+    """
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+    await enqueue_tx_command(request.app, command_cq.CQCommand)
+    return api_ok()
+
+
+@router.post("/beacon", summary="Enable/Disable Modem Beacon", tags=["Modem"], responses={
+    200: {
+        "description": "Beacon status updated successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "enabled": True,
+                    "away_from_key": False
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Invalid input parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Incorrect value for 'enabled' or 'away_from_key'. Should be bool."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_beacon(request: Request):
+    """
+    Enable or disable the modem beacon.
+
+    Parameters:
+        request (Request): The HTTP request containing the following JSON keys:
+            - 'enabled' (bool): True to enable the beacon, False to disable.
+            - 'away_from_key' (bool): True if away from key, False otherwise.
+
+    Returns:
+        dict: A JSON object indicating the beacon status.
+
+    Raises:
+        HTTPException: If parameters are invalid or modem is not running.
+    """
+    data = await request.json()
+    if not isinstance(data.get('enabled'), bool) or not isinstance(data.get('away_from_key'), bool):
+        api_abort("Incorrect value for 'enabled' or 'away_from_key'. Should be bool.", 400)
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+    request.app.state_manager.set('is_beacon_running', data['enabled'])
+    request.app.state_manager.set('is_away_from_key', data['away_from_key'])
+    if not request.app.state_manager.getARQ() and data['enabled']:
+        await enqueue_tx_command(request.app, command_beacon.BeaconCommand, data)
+    return api_response({"enabled": data['enabled'], "away_from_key": data['away_from_key']})
+
+
+@router.post("/ping_ping", summary="Trigger Modem to PING a Station", tags=["Modem"], responses={
+    200: {
+        "description": "Ping command sent successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": True
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Invalid input parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid 'dxcall' parameter."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_ping(request: Request):
+    """
+    Trigger the modem to send a PING to a station.
+
+    Parameters:
+        request (Request): The HTTP request containing the following JSON key:
+            - 'dxcall' (str): Callsign of the station to ping.
+
+    Returns:
+        dict: A JSON object indicating success.
+
+    Raises:
+        HTTPException: If parameters are invalid or modem is not running.
+    """
+    data = await request.json()
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+    dxcall = data.get('dxcall')
+    if not dxcall or not validations.validate_freedata_callsign(dxcall):
+        api_abort("Invalid 'dxcall' parameter.", 400)
+    await enqueue_tx_command(request.app, command_ping.PingCommand, data)
+    return api_response({"message": True})
+
+
+@router.post("/send_test_frame", summary="Send Test Frame", tags=["Modem"], responses={
+    200: {
+        "description": "Test frame sent successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": "ok"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_send_test_frame(request:Request):
+    """
+    Trigger the modem to send a test frame.
+
+    Returns:
+        dict: A JSON object indicating success.
+
+    Raises:
+        HTTPException: If the modem is not running.
+    """
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+    await enqueue_tx_command(request.app, command_test.TestCommand)
+    return api_ok()
+
+@router.post("/fec_transmit", summary="FEC Transmit", tags=["Modem"], responses={
+    200: {
+        "description": "FEC frame transmitted successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": "FEC transmission started."
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid parameters."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_send_fec_frame(request: Request):
+    """
+    Trigger the modem to transmit a Forward Error Correction (FEC) frame.
+
+    Parameters:
+        request (Request): The HTTP request containing transmission parameters in JSON format.
+
+    Returns:
+        dict: A JSON object indicating success.
+
+    Raises:
+        HTTPException: If the modem is not running, the request is malformed, or an internal error occurs.
+    """
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+
+    try:
+        data = await request.json()
+    except Exception:
+        api_abort("Invalid parameters.", 400)
+
+    # Validate required parameters (adjust based on actual requirements)
+    if 'message' not in data:
+        api_abort("Invalid parameters: 'message' field is required.", 400)
+
+    # Enqueue the FEC transmission command
+    try:
+        await enqueue_tx_command(request.app, command_fec.FecCommand, data)
+        return api_response({"message": "FEC transmission started."})
+    except Exception as e:
+        # Log the exception if necessary
+        api_abort("Internal server error.", 500)
+
+
+from fastapi import HTTPException
+
+@router.get("/fec_is_writing", summary="Indicate User is Typing (FEC)", tags=["Modem"], responses={
+    501: {
+        "description": "Feature not implemented.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Feature not implemented yet."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def get_fec_is_writing(request:Request):
+    """
+    Trigger the modem to inform over RF that the user is typing a message.
+
+    Returns:
+        dict: A JSON object indicating that the feature is not implemented.
+
+    Raises:
+        HTTPException: If the modem is not running or the feature is not implemented.
+    """
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+
+    # Since the feature is not implemented yet, return a 501 Not Implemented error
+    raise HTTPException(status_code=501, detail="Feature not implemented yet.")
+
+
+@router.post("/start", summary="Start Modem", tags=["Modem"], responses={
+    200: {
+        "description": "Modem started successfully.",
+        "content": {
+            "application/json": {
+                "examples": {
+                    "modem_started": {
+                        "summary": "Modem Started",
+                        "value": {
+                            "modem": "started"
+                        }
+                    },
+                    "message_ok": {
+                        "summary": "Message OK",
+                        "value": {
+                            "message": "ok"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid parameters."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    }
+})
+async def post_modem_start(request: Request):
+    """
+    Trigger the modem to start.
+
+    Parameters:
+        request (Request): The HTTP request
+    Returns:
+        dict: A JSON object indicating the modem has started.
+
+    Raises:
+        HTTPException: If parameters are invalid or an error occurs.
+    """
+
+    try:
+        if not request.app.state_manager.is_modem_running:
+            request.app.modem_service.put("start")
+            return api_response({"modem": "started"})
+        else:
+            api_abort("Modem already running", 503)
+    except Exception as e:
+        api_abort(f"Internal server error. {e}", 500)
+
+
+@router.post("/stop", summary="Stop Modem", tags=["Modem"], responses={
+    200: {
+        "description": "Modem stopped successfully.",
+        "content": {
+            "application/json": {
+                "examples": {
+                    "modem_stopped": {
+                        "summary": "Modem Stopped",
+                        "value": {
+                            "modem": "stopped"
+                        }
+                    },
+                    "message_ok": {
+                        "summary": "Message OK",
+                        "value": {
+                            "message": "ok"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_modem_stop(request:Request):
+    """
+    Trigger the modem to stop.
+
+    Returns:
+        dict: A JSON object indicating the modem has stopped.
+
+    Raises:
+        HTTPException: If the modem is not running or an error occurs.
+    """
+    #if not request.app.state_manager.is_modem_running:
+    #    api_abort("Modem not running", 503)
+
+    try:
+        request.app.modem_service.put("stop")
+        return api_response({"modem": "stopped"})
+    except Exception as e:
+        api_abort(f"Internal server error. {e}", 500)
+
+
+
+@router.post("/send_arq_raw", summary="Send ARQ Raw Data", tags=["Modem"], responses={
+    200: {
+        "description": "ARQ raw data sent successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "data": "RnJlZURBVEEgaXMgdGhlIGJlc3Qh",
+                    "dxcall": "XX1XXX-6",
+                    "type": "raw"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running or busy.",
+        "content": {
+            "application/json": {
+                "examples": {
+                    "modem_not_running": {
+                        "summary": "Modem Not Running",
+                        "value": {
+                            "error": "Modem not running."
+                        }
+                    },
+                    "modem_busy": {
+                        "summary": "Modem Busy",
+                        "value": {
+                            "error": "Modem Busy."
+                        }
+                    }
+                }
+            }
+        }
+    }
+})
+async def post_send_arq_raw(request: Request):
+    """
+    Send ARQ raw data to a specified station.
+
+    Parameters:
+        request (Request): The HTTP request containing the following JSON keys:
+            - 'dxcall' (str): Callsign of the station to send data to.
+            - 'type' (str): Data type ('raw', 'raw_lzma', 'raw_gzip').
+            - 'data' (str): Base64 encoded data to send.
+
+    Returns:
+        dict: A JSON object echoing the sent data.
+
+    Raises:
+        HTTPException: If parameters are invalid or modem is not running/busy.
+    """
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running.", 503)
+    if request.app.state_manager.is_modem_busy:
+        api_abort("Modem Busy.", 503)
+    data = await request.json()
+    dxcall = data.get('dxcall')
+    data_type = data.get('type')
+    raw_data = data.get('data')
+    if not dxcall or not validations.validate_freedata_callsign(dxcall):
+        api_abort("Invalid 'dxcall' parameter.", 400)
+    if data_type not in ['raw', 'raw_lzma', 'raw_gzip']:
+        api_abort("Invalid 'type' parameter.", 400)
+    if not raw_data:
+        api_abort("Missing 'data' parameter.", 400)
+    await enqueue_tx_command(request.app, command_arq_raw.SendARQRawCommand, data)
+    return api_response({
+        "data": raw_data,
+        "dxcall": dxcall,
+        "type": data_type
+    })
+
+
+@router.post("/stop_transmission", summary="Stop Transmission", tags=["Modem"], responses={
+    200: {
+        "description": "Transmission stopped successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "message": "ok"
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid request."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    500: {
+        "description": "Internal Server Error: An unexpected error occurred on the server.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Internal server error."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Modem not running."
+                }
+            }
+        }
+    }
+})
+async def post_modem_stop_transmission(request:Request):
+    """
+    Stop the current transmission.
+
+    Returns:
+        dict: A JSON object indicating success.
+
+    Raises:
+        HTTPException: If the modem is not running or an error occurs.
+    """
+    if not request.app.state_manager.is_modem_running:
+        api_abort("Modem not running", 503)
+    if request.app.state_manager.getARQ():
+        try:
+            for session in request.app.state_manager.arq_irs_sessions.values():
+                # session.abort_transmission()
+                session.transmission_aborted()
+            for session in request.app.state_manager.arq_iss_sessions.values():
+                session.abort_transmission(send_stop=False)
+                session.transmission_aborted()
+        except Exception as e:
+            print(f"Error during transmission stopping: {e}")
+    return api_ok()
+
+
+
diff --git a/freedata_server/api/radio.py b/freedata_server/api/radio.py
new file mode 100644
index 000000000..276b2d04f
--- /dev/null
+++ b/freedata_server/api/radio.py
@@ -0,0 +1,187 @@
+from fastapi import APIRouter, Request
+from api.common import api_response, api_abort, api_ok, validate
+from api.command_helpers import enqueue_tx_command
+import command_transmit_sine
+
+router = APIRouter()
+
+
+
+@router.get("/", summary="Get Radio Parameters", tags=["Radio"], responses={
+    200: {
+        "description": "Current radio parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "radio_frequency": "14093000",
+                    "radio_mode": "PKTUSB",
+                    "radio_rf_level": 100,
+                    "radio_status": True,
+                    "radio_swr": 0,
+                    "radio_tuner": False,
+                    "s_meter_strength": "20"
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def get_radio(request: Request):
+    """
+    Retrieve current radio parameters.
+
+    Returns:
+        dict: A JSON object containing radio parameters.
+    """
+    return request.app.state_manager.get_radio_status()
+
+
+@router.post("/", summary="Set Radio Parameters", tags=["Radio"], responses={
+    200: {
+        "description": "Radio parameters updated successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "radio_frequency": "14093000",
+                    "radio_mode": "PKTUSB",
+                    "radio_rf_level": 100,
+                    "radio_status": True,
+                    "radio_swr": 0,
+                    "radio_tuner": True,
+                    "s_meter_strength": "20"
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid parameters."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    }
+})
+async def post_radio(request: Request):
+    """
+    Set radio parameters.
+
+    Parameters:
+        request (Request): The HTTP request containing the radio parameters in JSON format.
+
+    Returns:
+        dict: A JSON object containing the updated radio parameters.
+    """
+    data = await request.json()
+    radio_manager = request.app.radio_manager
+    if "radio_frequency" in data:
+        radio_manager.set_frequency(data['radio_frequency'])
+    if "radio_mode" in data:
+        radio_manager.set_mode(data['radio_mode'])
+    if "radio_rf_level" in data:
+        radio_manager.set_rf_level(int(data['radio_rf_level']))
+    if "radio_tuner" in data:
+        radio_manager.set_tuner(data['radio_tuner'])
+    return api_response(data)
+
+
+@router.post("/tune", summary="Enable/Disable Radio Tuning", tags=["Radio"], responses={
+    200: {
+        "description": "Radio tuning status updated successfully.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "enable_tuning": True
+                }
+            }
+        }
+    },
+    400: {
+        "description": "Bad Request: The request was malformed or missing required parameters.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Invalid parameters."
+                }
+            }
+        }
+    },
+    404: {
+        "description": "The requested resource was not found.",
+        "content": {
+            "application/json": {
+                "example": {
+                    "error": "Resource not found."
+                }
+            }
+        }
+    },
+    503: {
+        "description": "Modem not running or busy.",
+        "content": {
+            "application/json": {
+                "examples": {
+                    "modem_not_running": {
+                        "summary": "Modem Not Running",
+                        "value": {
+                            "error": "Modem not running."
+                        }
+                    },
+                    "modem_busy": {
+                        "summary": "Modem Busy",
+                        "value": {
+                            "error": "Modem Busy."
+                        }
+                    }
+                }
+            }
+        }
+    }
+})
+async def post_radio_tune(request: Request):
+    """
+    Trigger the modem to inform over RF that the user is typing a message.
+
+    Parameters:
+        request (Request): The HTTP request containing the following JSON key:
+            - 'enable_tuning' (bool): True to enable tuning, False to disable.
+
+    Returns:
+        dict: A JSON object echoing the tuning status.
+
+    Raises:
+        HTTPException: If the modem is not running/busy or if parameters are invalid.
+    """
+    data = await request.json()
+    if "enable_tuning" in data:
+        if data['enable_tuning']:
+            if not request.app.state_manager.is_modem_running:
+                api_abort("Modem not running", 503)
+            await enqueue_tx_command(request.app, command_transmit_sine.TransmitSine)
+        else:
+            request.app.service_manager.modem.stop_sine()
+    else:
+        request.app.service_manager.modem.stop_sine()
+
+    return api_response(data)
diff --git a/freedata_server/api/websocket.py b/freedata_server/api/websocket.py
new file mode 100644
index 000000000..08ab2549c
--- /dev/null
+++ b/freedata_server/api/websocket.py
@@ -0,0 +1,18 @@
+from fastapi import APIRouter, Request, WebSocket
+router = APIRouter()
+
+# WebSocket Event Handlers
+@router.websocket("/events")
+async def websocket_events(websocket: WebSocket):
+    await websocket.accept()
+    await websocket.app.wsm.handle_connection(websocket, websocket.app.wsm.events_client_list, websocket.app.modem_events)
+
+@router.websocket("/fft")
+async def websocket_fft(websocket: WebSocket):
+    await websocket.accept()
+    await websocket.app.wsm.handle_connection(websocket, websocket.app.wsm.fft_client_list, websocket.app.modem_fft)
+
+@router.websocket("/states")
+async def websocket_states(websocket: WebSocket):
+    await websocket.accept()
+    await websocket.app.wsm.handle_connection(websocket, websocket.app.wsm.states_client_list, websocket.app.state_queue)
diff --git a/freedata_server/audio.py b/freedata_server/audio.py
index e42da1a68..53f37f3e6 100644
--- a/freedata_server/audio.py
+++ b/freedata_server/audio.py
@@ -205,6 +205,52 @@ def set_audio_volume(datalist: np.ndarray, dB: float) -> np.ndarray:
     return np.clip(scaled_data, -32768, 32767).astype(np.int16)
 
 
+def normalize_audio(datalist: np.ndarray) -> np.ndarray:
+    """
+    Normalize the audio samples so the loudest value reaches 95% of the maximum possible value for np.int16
+    :param datalist: Audio samples to normalize
+    :type datalist: np.ndarray
+    :return: Normalized audio samples, clipped to the range of int16
+    :rtype: np.ndarray
+    """
+    if not isinstance(datalist, np.ndarray):
+        print("[MDM] Invalid datalist type. Expected np.ndarray.")
+        return datalist
+
+    # Ensure datalist is not empty
+    if datalist.size == 0:
+        print("[MDM] Datalist is empty. Returning unmodified.")
+        return datalist
+
+    # Find the maximum absolute value in the data
+    max_value = np.max(np.abs(datalist))
+
+    # If max_value is 0, return the datalist (avoid division by zero)
+    if max_value == 0:
+        print("[MDM] Max value is zero. Cannot normalize. Returning unmodified.")
+        return datalist
+
+    # Define the target max value as 95% of the maximum for np.int16
+    target_max_value = int(32767 * 0.95)
+
+    # Compute the normalization factor
+    normalization_factor = target_max_value / max_value
+
+    # Normalize the audio data
+    normalized_data = datalist * normalization_factor
+
+    # Clip to the int16 range and cast
+    normalized_data = np.clip(normalized_data, -32768, 32767).astype(np.int16)
+
+    # Debug information: normalization factor, loudest value before, and after normalization
+    loudest_before = max_value
+    loudest_after = np.max(np.abs(normalized_data))
+    print(f"[AUDIO] Normalization factor: {normalization_factor:.6f}, Loudest before: {loudest_before}, Loudest after: {loudest_after}")
+
+    return normalized_data
+
+
+
 RMS_COUNTER = 0
 CHANNEL_BUSY_DELAY = 0
 SLOT_DELAY = [0, 0, 0, 0, 0]
diff --git a/freedata_server/codec2.py b/freedata_server/codec2.py
index 01126240c..95047726a 100644
--- a/freedata_server/codec2.py
+++ b/freedata_server/codec2.py
@@ -34,7 +34,10 @@ class FREEDV_MODE(Enum):
     datac4 = 18
     datac13 = 19
     datac14 = 20
+    data_ofdm_200 = 21200
+    data_ofdm_250 = 21250
     data_ofdm_500 = 21500
+    data_ofdm_1700 = 211700
     data_ofdm_2438 = 2124381
     #data_qam_2438 = 2124382
     #qam16c2 = 22
@@ -51,7 +54,10 @@ class FREEDV_MODE_USED_SLOTS(Enum):
     datac4 = [False, False, True, False, False]
     datac13 = [False, False, True, False, False]
     datac14 = [False, False, True, False, False]
+    data_ofdm_200 = [False, False, True, False, False]
+    data_ofdm_250 = [False, False, True, False, False]
     data_ofdm_500 = [False, False, True, False, False]
+    data_ofdm_1700 = [False, True, True, True, False]
     data_ofdm_2438 = [True, True, True, True, True]
     data_qam_2438 = [True, True, True, True, True]
     qam16c2 = [True, True, True, True, True]
@@ -375,10 +381,9 @@ def resample8_to_48(self, in8):
 
         return out48
 
-
 def open_instance(mode: int) -> ctypes.c_void_p:
     data_custom = 21
-    if mode in [FREEDV_MODE.data_ofdm_500.value, FREEDV_MODE.data_ofdm_2438.value]:
+    if mode in [FREEDV_MODE.data_ofdm_200.value, FREEDV_MODE.data_ofdm_250.value, FREEDV_MODE.data_ofdm_500.value, FREEDV_MODE.data_ofdm_1700.value, FREEDV_MODE.data_ofdm_2438.value]:
     #if mode in [FREEDV_MODE.data_ofdm_500.value, FREEDV_MODE.data_ofdm_2438.value, FREEDV_MODE.data_qam_2438]:
         custom_params = ofdm_configurations[mode]
         return ctypes.cast(
@@ -535,6 +540,49 @@ def create_tx_uw(nuwbits, uw_sequence):
 
 # ---------------- OFDM 500 Hz Bandwidth ---------------#
 
+# DATAC13 # OFDM 200
+data_ofdm_200_config = create_default_ofdm_config()
+data_ofdm_200_config.config.contents.ns = 5
+data_ofdm_200_config.config.contents.np = 18
+data_ofdm_200_config.config.contents.tcp = 0.006
+data_ofdm_200_config.config.contents.ts = 0.016
+data_ofdm_200_config.config.contents.rs = 1.0 / data_ofdm_200_config.config.contents.ts
+data_ofdm_200_config.config.contents.nc = 3
+data_ofdm_200_config.config.contents.timing_mx_thresh = 0.45
+data_ofdm_200_config.config.contents.bad_uw_errors = 18
+data_ofdm_200_config.config.contents.codename = "H_256_512_4".encode('utf-8')
+data_ofdm_200_config.config.contents.amp_scale = 2.5*300E3
+data_ofdm_200_config.config.contents.nuwbits = 48
+data_ofdm_200_config.config.contents.tx_uw = create_tx_uw(data_ofdm_200_config.config.contents.nuwbits, [1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0])
+data_ofdm_200_config.config.contents.clip_gain1 = 1.2
+data_ofdm_200_config.config.contents.clip_gain2 = 1.0
+data_ofdm_200_config.config.contents.tx_bpf_en = False
+data_ofdm_200_config.config.contents.tx_bpf_proto = codec2_filter_coeff.generate_filter_coefficients(8000, 400, 101)
+data_ofdm_200_config.config.contents.tx_bpf_proto_n = 101 # TODO sizeof(filtP200S400) / sizeof(float);
+
+
+# DATAC4 # OFDM 250
+data_ofdm_250_config = create_default_ofdm_config()
+data_ofdm_250_config.config.contents.ns = 5
+data_ofdm_250_config.config.contents.np = 47
+data_ofdm_250_config.config.contents.tcp = 0.006
+data_ofdm_250_config.config.contents.ts = 0.016
+data_ofdm_250_config.config.contents.rs = 1.0 / data_ofdm_250_config.config.contents.ts
+data_ofdm_250_config.config.contents.nc = 4
+data_ofdm_250_config.config.contents.timing_mx_thresh = 0.5
+data_ofdm_250_config.config.contents.bad_uw_errors = 12
+data_ofdm_250_config.config.contents.codename = "H_1024_2048_4f".encode('utf-8')
+data_ofdm_250_config.config.contents.amp_scale = 2*300E3
+data_ofdm_250_config.config.contents.nuwbits = 32
+data_ofdm_250_config.config.contents.tx_uw = create_tx_uw(data_ofdm_250_config.config.contents.nuwbits, [1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0])
+data_ofdm_250_config.config.contents.clip_gain1 = 1.2
+data_ofdm_250_config.config.contents.clip_gain2 = 1.0
+data_ofdm_250_config.config.contents.tx_bpf_en = True
+data_ofdm_250_config.config.contents.tx_bpf_proto = codec2_filter_coeff.generate_filter_coefficients(8000, 400, 101)
+data_ofdm_250_config.config.contents.tx_bpf_proto_n = 101 # TODO sizeof(filtP200S400) / sizeof(float);
+
+
+# OFDM 500
 data_ofdm_500_config = create_default_ofdm_config()
 data_ofdm_500_config.config.contents.ns = 5
 data_ofdm_500_config.config.contents.np = 32
@@ -545,36 +593,35 @@ def create_tx_uw(nuwbits, uw_sequence):
 data_ofdm_500_config.config.contents.timing_mx_thresh = 0.1
 data_ofdm_500_config.config.contents.bad_uw_errors = 18
 data_ofdm_500_config.config.contents.codename = "H_1024_2048_4f".encode('utf-8')
-data_ofdm_500_config.config.contents.amp_scale = 290E3
+data_ofdm_500_config.config.contents.amp_scale = 300E3 # 290E3
 data_ofdm_500_config.config.contents.nuwbits = 56
 data_ofdm_500_config.config.contents.tx_uw = create_tx_uw(data_ofdm_500_config.config.contents.nuwbits, [0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1])
-data_ofdm_500_config.config.contents.clip_gain1 = 2.8
-data_ofdm_500_config.config.contents.clip_gain2 = 0.9
-data_ofdm_500_config.config.contents.tx_bpf_en = False
+data_ofdm_500_config.config.contents.clip_gain1 = 2.5 # 2.8
+data_ofdm_500_config.config.contents.clip_gain2 = 1.0 #0.9
+data_ofdm_500_config.config.contents.tx_bpf_en = True
 data_ofdm_500_config.config.contents.tx_bpf_proto = codec2_filter_coeff.generate_filter_coefficients(8000, 600, 100)
 data_ofdm_500_config.config.contents.tx_bpf_proto_n = 100
 
 
-"""
-# DATAC1
-data_ofdm_500_config = create_default_ofdm_config()
-data_ofdm_500_config.config.contents.ns = 5
-data_ofdm_500_config.config.contents.np = 38
-data_ofdm_500_config.config.contents.tcp = 0.006
-data_ofdm_500_config.config.contents.ts = 0.016
-data_ofdm_500_config.config.contents.nc = 27
-data_ofdm_500_config.config.contents.nuwbits = 16
-data_ofdm_500_config.config.contents.timing_mx_thresh = 0.10
-data_ofdm_500_config.config.contents.bad_uw_errors = 6
-data_ofdm_500_config.config.contents.codename = b"H_4096_8192_3d"
-data_ofdm_500_config.config.contents.clip_gain1 = 2.7
-data_ofdm_500_config.config.contents.clip_gain2 = 0.8
-data_ofdm_500_config.config.contents.amp_scale = 145E3
-data_ofdm_500_config.config.contents.tx_bpf_en = False
-#data_ofdm_500_config.config.contents.tx_bpf_proto = codec2_filter_coeff.generate_filter_coefficients(8000, 2000, 101)
-data_ofdm_500_config.config.contents.tx_bpf_proto_n = 101
-data_ofdm_500_config.config.contents.tx_uw = create_tx_uw(data_ofdm_500_config.config.contents.nuwbits, [1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0])
-"""
+# DATAC1 # OFDM1700
+data_ofdm_1700_config = create_default_ofdm_config()
+data_ofdm_1700_config.config.contents.ns = 5
+data_ofdm_1700_config.config.contents.np = 38
+data_ofdm_1700_config.config.contents.tcp = 0.006
+data_ofdm_1700_config.config.contents.ts = 0.016
+data_ofdm_1700_config.config.contents.nc = 27
+data_ofdm_1700_config.config.contents.nuwbits = 16
+data_ofdm_1700_config.config.contents.timing_mx_thresh = 0.10
+data_ofdm_1700_config.config.contents.bad_uw_errors = 6
+data_ofdm_1700_config.config.contents.codename = b"H_4096_8192_3d"
+data_ofdm_1700_config.config.contents.clip_gain1 = 2.7
+data_ofdm_1700_config.config.contents.clip_gain2 = 0.8
+data_ofdm_1700_config.config.contents.amp_scale = 145E3
+data_ofdm_1700_config.config.contents.tx_bpf_en = False
+data_ofdm_1700_config.config.contents.tx_bpf_proto = codec2_filter_coeff.generate_filter_coefficients(8000, 2000, 100)
+data_ofdm_1700_config.config.contents.tx_bpf_proto_n = 100
+data_ofdm_1700_config.config.contents.tx_uw = create_tx_uw(data_ofdm_1700_config.config.contents.nuwbits, [1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0])
+
 
 """
 # DATAC3
@@ -639,7 +686,10 @@ def create_tx_uw(nuwbits, uw_sequence):
 """
 
 ofdm_configurations = {
+    FREEDV_MODE.data_ofdm_200.value: data_ofdm_200_config,
+    FREEDV_MODE.data_ofdm_250.value: data_ofdm_250_config,
     FREEDV_MODE.data_ofdm_500.value: data_ofdm_500_config,
+    FREEDV_MODE.data_ofdm_1700.value: data_ofdm_1700_config,
     FREEDV_MODE.data_ofdm_2438.value: data_ofdm_2438_config,
     #FREEDV_MODE.data_qam_2438.value: data_qam_2438_config
 
diff --git a/freedata_server/command_feq.py b/freedata_server/command_fec.py
similarity index 100%
rename from freedata_server/command_feq.py
rename to freedata_server/command_fec.py
diff --git a/freedata_server/command_test.py b/freedata_server/command_test.py
index 4fbbb2084..4cf5c8a01 100644
--- a/freedata_server/command_test.py
+++ b/freedata_server/command_test.py
@@ -4,7 +4,7 @@
 class TestCommand(TxCommand):
 
     def build_frame(self):
-        return self.frame_factory.build_test()
+        return self.frame_factory.build_test(self.get_tx_mode().name)
 
     def get_tx_mode(self):
-        return codec2.FREEDV_MODE.datac3
\ No newline at end of file
+        return codec2.FREEDV_MODE.data_ofdm_500
\ No newline at end of file
diff --git a/freedata_server/command_transmit_sine.py b/freedata_server/command_transmit_sine.py
index 118784b3d..14d68a0ff 100644
--- a/freedata_server/command_transmit_sine.py
+++ b/freedata_server/command_transmit_sine.py
@@ -2,4 +2,6 @@
 
 class TransmitSine(TxCommand):
     def transmit(self, modem):
-        modem.transmit_sine()
\ No newline at end of file
+        modem.transmit_sine()
+        # Code for debugging morse stuff...
+        #modem.transmit_morse(0,0,[b''])
\ No newline at end of file
diff --git a/freedata_server/config.ini.example b/freedata_server/config.ini.example
index ce4a17aaf..8d768a4b5 100644
--- a/freedata_server/config.ini.example
+++ b/freedata_server/config.ini.example
@@ -45,26 +45,27 @@ serial_rts = OFF
 tci_ip = 127.0.0.1
 tci_port = 50001
 
-[MESH]
-enable_protocol = False
-
 [MODEM]
-enable_hmac = False
 enable_morse_identifier = False
 tx_delay = 50
 maximum_bandwidth = 2438
-enable_socket_interface = False
 
 [SOCKET_INTERFACE]
 enable = False
 host = 127.0.0.1
-cmd_port = 8000
-data_port = 8001
+cmd_port = 9000
+data_port = 9001
 
 [MESSAGES]
 enable_auto_repeat = False
-adif_log_host = 127.0.0.1
-adif_log_port = 2237
+
+[QSO_LOGGING]
+enable_adif_udp = False
+adif_udp_host = 127.0.0.1
+adif_udp_port = 2237
+enable_adif_wavelog = False
+adif_wavelog_host = http://raspberrypi
+adif_wavelog_api_key = API-KEY
 
 [GUI]
 auto_run_browser = True
diff --git a/freedata_server/config.py b/freedata_server/config.py
index 189cb6ddf..08782f717 100644
--- a/freedata_server/config.py
+++ b/freedata_server/config.py
@@ -2,6 +2,7 @@
 import structlog
 import json
 
+
 class CONFIG:
     """
     CONFIG class for handling with config files
@@ -57,29 +58,30 @@ class CONFIG:
             'tci_ip': str,
             'tci_port': int,
         },
-        'MESH': {
-            'enable_protocol': bool,
-        },
         'MODEM': {
-            'enable_hmac': bool,
             'enable_morse_identifier': bool,
             'maximum_bandwidth': int,
             'tx_delay': int,
-            'enable_socket_interface': bool,
         },
         'SOCKET_INTERFACE': {
-            'enable' : bool,
-            'host' : str,
-            'cmd_port' : int,
-            'data_port' : int,
-
+            'enable': bool,
+            'host': str,
+            'cmd_port': int,
+            'data_port': int,
         },
         'MESSAGES': {
             'enable_auto_repeat': bool,
-            'adif_log_host': str,
-            'adif_log_port': int,
         },
-        'GUI':{
+        'QSO_LOGGING': {
+            'enable_adif_udp': bool,
+            'adif_udp_host': str,
+            'adif_udp_port': int,
+            'enable_adif_wavelog': bool,
+            'adif_wavelog_host': str,
+            'adif_wavelog_api_key': str,
+        },
+
+        'GUI': {
             'auto_run_browser': bool,
         }
     }
@@ -104,7 +106,7 @@ def __init__(self, configfile: str):
         except Exception:
             self.config_name = "config.ini"
 
-        #self.log.info("[CFG] config init", file=self.config_name)
+        # self.log.info("[CFG] config init", file=self.config_name)
 
         # check if config file exists
         self.config_exists()
@@ -167,7 +169,7 @@ def validate_config(self):
     # Handle special setting data type conversion
     # is_writing means data from a dict being writen to the config file
     # if False, it means the opposite direction
-    def handle_setting(self, section, setting, value, is_writing = False):
+    def handle_setting(self, section, setting, value, is_writing=False):
         try:
             if self.config_types[section][setting] == list:
                 if is_writing:
@@ -181,8 +183,6 @@ def handle_setting(self, section, setting, value, is_writing = False):
                         return json.loads(value)
                     return value  # Return as-is if already a list
 
-
-
             elif self.config_types[section][setting] == bool and not is_writing:
                 return self.parser.getboolean(section, setting)
 
@@ -227,12 +227,12 @@ def read(self):
         """
         read config file
         """
-        #self.log.info("[CFG] reading...")
+        # self.log.info("[CFG] reading...")
         if not self.config_exists():
             return False
         
         # at first just copy the config as read from file
-        result = {s:dict(self.parser.items(s)) for s in self.parser.sections()}
+        result = {s: dict(self.parser.items(s)) for s in self.parser.sections()}
 
         # handle the special settings
         for section in result:
diff --git a/freedata_server/data_frame_factory.py b/freedata_server/data_frame_factory.py
index 4a1a2ddb5..5099e9165 100644
--- a/freedata_server/data_frame_factory.py
+++ b/freedata_server/data_frame_factory.py
@@ -393,8 +393,10 @@ def build_fec(self, mode, payload):
         fec_frame[1:payload_per_frame] = bytes(payload[:fec_payload_length])
         return fec_frame
 
-    def build_test(self):
-        test_frame = bytearray(126)
+    def build_test(self, mode):
+        mode_int = codec2.freedv_get_mode_value_by_name(mode)
+        payload_per_frame = codec2.get_bytes_per_frame(mode_int) - 2
+        test_frame = bytearray(payload_per_frame)
         test_frame[:1] = bytes([FR_TYPE.TEST_FRAME.value])
         return test_frame
 
diff --git a/freedata_server/mesh.py b/freedata_server/mesh.py
deleted file mode 100644
index b1c2e94db..000000000
--- a/freedata_server/mesh.py
+++ /dev/null
@@ -1,573 +0,0 @@
-# -*- coding: UTF-8 -*-
-"""
-
-@author: DJ2LS
-
-HF mesh networking prototype and testing module
-
-        import time
-        self.states.mesh_routing_table = [['AA1AA', 'direct', 0, 1.0, 25, time.time(), ], ['AA1AA', 'AA2BB', 1, 3.1, 10, time.time(), ],
-                  ['AA3CC', 'AA2BB', 5, -4.5, -3, time.time(), ]]
-
-        print(self.states.mesh_routing_table)
-        print("---------------------------------")
-
-
-
-
-TODO SIGNALLING FOR ACK/NACK:
-- mesh-signalling burst is datac13
-- mesh-signalling frame contains [message id, status, hops, score, payload]
-- frame type is 1 byte
-- message id is 32bit crc --> 4bytes
-- status can be ACK, NACK, PING, PINGACK --> 1byte
-- payload = 14bytes - 8 bytes  = 6bytes
-- create a list for signalling frames, contains [message id, message-status, attempts, state, timestamp]
-- on "IRS", send ACK/NACK 10 times on receiving beacon?
-- on "ROUTER", receive ACK/NACK, and store it in table, also send it 10 times
-- if sent 10 times, set ACK/NACK state to "done"
-- if done already in list, don't reset retry counter
-- delete ACK/NACK if "done" and timestamp older than 1day
-
-TODO SCORE CALCULATION:
-SNR: negative --> * 2
-
-"""
-# pylint: disable=invalid-name, line-too-long, c-extension-no-member
-# pylint: disable=import-outside-toplevel, attribute-defined-outside-init
-
-from modem_frametypes import FRAME_TYPE
-
-#from global_instances import ARQ,ModemParam, MeshParam, Station, Modem
-
-from codec2 import FREEDV_MODE
-import numpy as np
-import time
-import threading
-import modem
-import helpers
-import structlog
-
-from queues import MESH_RECEIVED_QUEUE, MESH_QUEUE_TRANSMIT, MESH_SIGNALLING_TABLE
-
-class MeshRouter():
-    def __init__(self, config, event_queue, states):
-
-        self.log = structlog.get_logger("RF")
-
-        self.mycallsign = config['STATION']['mycall']
-        self.mycallsign_crc = helpers.get_crc_24(self.mycallsign)
-
-        self.transmission_time_list = [
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360,
-            60, 90, 120, 180, 180, 180, 180, 180, 180, 360, 360, 360, 360, 360, 360
-        ]
-        # for testing only: self.transmission_time_list = [30, 30]
-        self.signalling_max_attempts = len(self.transmission_time_list)
-
-
-
-        self.mesh_broadcasting_thread = threading.Thread(
-            target=self.broadcast_routing_table, name="worker thread receive", daemon=True
-        )
-        self.mesh_broadcasting_thread.start()
-
-        self.mesh_rx_dispatcher_thread = threading.Thread(
-            target=self.mesh_rx_dispatcher, name="worker thread receive", daemon=True
-        )
-        self.mesh_rx_dispatcher_thread.start()
-
-        self.mesh_tx_dispatcher_thread = threading.Thread(
-            target=self.mesh_tx_dispatcher, name="worker thread receive", daemon=True
-        )
-        self.mesh_tx_dispatcher_thread.start()
-
-        self.mesh_signalling_dispatcher_thread = threading.Thread(
-            target=self.mesh_signalling_dispatcher, name="worker thread receive", daemon=True
-        )
-        self.mesh_signalling_dispatcher_thread.start()
-
-    def get_from_heard_stations(self):
-        """
-        get data from heard stations
-        heard stations format:
-        [dxcallsign,dxgrid,int(time.time()),datatype,snr,offset,frequency]
-
-        self.states.heard_stations.append(
-                    [
-                        dxcallsign,
-                        dxgrid,
-                        int(time.time()),
-                        datatype,
-                        snr,
-                        offset,
-                        frequency,
-                    ]
-                )
-        """
-        dxcallsign_position = 0
-        dxgrid_position = 1
-        timestamp_position = 2
-        type_position = 3
-        snr_position = 4
-        offset_position = 5
-        frequency_position = 6
-
-        try:
-            for item in self.states.heard_stations:
-                #print("-----------")
-                #print(item)
-                #print(item[snr_position])
-                try:
-                    #print(item[snr_position])
-                    snr = bytes(item[snr_position], "utf-8").split(b"/")
-                    snr = int(float(snr[0]))
-                except Exception as err:
-                    self.log.debug("[MESH] error handling SNR calculation", e=err)
-                    snr = int(float(item[snr_position]))
-
-                snr = np.clip(snr, -12, 12)  # limit to max value of -12/12
-                new_router = [helpers.get_crc_24(item[dxcallsign_position]), helpers.get_crc_24(b'direct'), 0, snr, self.calculate_score_by_snr(snr), item[timestamp_position]]
-                self.add_router_to_routing_table(new_router)
-
-        except Exception as e:
-            self.log.warning("[MESH] error fetching data from heard station list", e=e)
-
-    def add_router_to_routing_table(self, new_router):
-        try:
-            # destination callsign # router callsign # hops # rx snr # route quality # timestamp
-            for _, item in enumerate(self.states.mesh_routing_table):
-                # update routing entry if exists
-                if new_router[0] in item[0] and new_router[1] in item[1]:
-                    #print(f"UPDATE {self.states.mesh_routing_table[_]} >>> {new_router}")
-                    self.log.info(f"[MESH] [ROUTING TABLE] [UPDATE]: {self.states.mesh_routing_table[_]} >>> ",
-                                  update=new_router)
-
-                    self.states.mesh_routing_table[_] = new_router
-
-            # add new routing entry if not exists
-            if new_router not in self.states.mesh_routing_table:
-                #print(f"INSERT {new_router} >>> ROUTING TABLE")
-                self.log.info("[MESH] [ROUTING TABLE] [INSERT]:", insert=new_router)
-
-                self.states.mesh_routing_table.append(new_router)
-        except Exception as e:
-            self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router)
-
-    def broadcast_routing_table(self, interval=600):
-
-        while True:
-            # always enable receiving for datac4 if broadcasting
-            modem.RECEIVE_DATAC4 = True
-
-            threading.Event().wait(1)
-            if not self.states.arq_state and not self.states.channel_busy:
-                try:
-
-                    # wait some time until sending routing table
-                    threading.Event().wait(interval)
-
-                    # before we are transmitting, let us update our routing table
-                    self.get_from_heard_stations()
-
-                    #[b'DJ2LS-0', 'direct', 0, 9.6, 9.6, 1684912305]
-                    mesh_broadcast_frame_header = bytearray(4)
-                    mesh_broadcast_frame_header[:1] = bytes([FRAME_TYPE.MESH_BROADCAST.value])
-                    mesh_broadcast_frame_header[1:4] = helpers.get_crc_24(self.mycallsign)
-
-                    # callsign(6), router(6), hops(1), path_score(1) == 14 ==> 14 28 42 ==> 3 mesh routing entries
-                    # callsign_crc(3), router_crc(3), hops(1), path_score(1) == 8 --> 6
-                    # callsign_crc(3), hops(1), path_score(1) == 5 --> 10
-
-                    # Create a new bytearray with a fixed length of 50
-                    result = bytearray(50)
-
-                    # Iterate over the route subarrays and add the selected entries to the result bytearray
-                    index = 0
-                    for route_id, route in enumerate(self.states.mesh_routing_table):
-                        # the value 5 is the length of crc24 + hops + score
-
-                        dxcall = self.states.mesh_routing_table[route_id][0]
-                        # router = self.states.mesh_routing_table[i][1]
-                        hops = self.states.mesh_routing_table[route_id][2]
-                        # snr = self.states.mesh_routing_table[i][3]
-                        route_score = np.clip(self.states.mesh_routing_table[route_id][4], 0, 254)
-                        # timestamp = self.states.mesh_routing_table[i][5]
-                        result[index:index + 5] = dxcall + bytes([hops]) + bytes([route_score])
-                        index += 5
-
-                    # Split the result bytearray into a list of fixed-length bytearrays
-                    split_result = [result[i:i + 50] for i in range(0, len(result), 50)]
-                    frame_list = []
-                    for _ in split_result:
-                        # make sure payload is always 50
-                        _[len(_):] = bytes(50 - len(_))
-                        #print(len(_))
-                        frame_list.append(mesh_broadcast_frame_header + _)
-
-                    c2_mode = FREEDV_MODE.datac4.value
-                    self.log.info("[MESH] broadcasting routing table", frame_list=frame_list, frames=len(split_result))
-                    modem.MODEM_TRANSMIT_QUEUE.put([c2_mode, 1, 0, frame_list])
-
-                except Exception as e:
-                    self.log.warning("[MESH] broadcasting routing table", e=e)
-
-
-    def mesh_rx_dispatcher(self):
-        while True:
-            data = MESH_RECEIVED_QUEUE.get()
-            data_in = data[0]
-            snr = data[1]
-
-            if int.from_bytes(data_in[:1], "big") in [FRAME_TYPE.MESH_BROADCAST.value]:
-                self.received_routing_table(data_in[:-2], snr)
-            elif int.from_bytes(data_in[:1], "big") in [FRAME_TYPE.MESH_SIGNALLING_PING.value]:
-                self.received_mesh_ping(data_in[:-2])
-            elif int.from_bytes(data_in[:1], "big") in [FRAME_TYPE.MESH_SIGNALLING_PING_ACK.value]:
-                self.received_mesh_ping_ack(data_in[:-2])
-
-            else:
-                print("wrong mesh data received")
-                #print(data_in)
-
-    def mesh_tx_dispatcher(self):
-        while True:
-            data = MESH_QUEUE_TRANSMIT.get()
-            #print(data)
-            if data[0] == "PING":
-                destination = helpers.get_crc_24(data[2]).hex()
-                origin = helpers.get_crc_24(data[1]).hex()
-                self.add_mesh_ping_to_signalling_table(destination, origin, frametype="PING", status="awaiting_ack")
-            else:
-                print("wrong mesh command")
-
-
-
-    def mesh_signalling_dispatcher(self):
-        #           [timestamp, destination, origin, frametype, payload, attempt, status]
-        # --------------0------------1---------2---------3--------4---------5--------6 #
-
-
-        while True:
-            threading.Event().wait(1.0)
-            for entry in MESH_SIGNALLING_TABLE:
-                # if in arq state, interrupt dispatcher
-                if self.states.arq_state or self.states.arq_session:
-                    break
-
-                #print(entry)
-                attempt = entry[5]
-                status = entry[6]
-                # check for PING cases
-                if entry[3] in ["PING"] and attempt < len(self.transmission_time_list) and status not in ["acknowledged"]:
-                    # Calculate the transmission time with exponential increase
-                    #transmission_time = timestamp + (2 ** attempt) * 10
-                    # Calculate transmission times for attempts 0 to 30 with stronger S-curves in minutes
-                    #correction_factor = 750
-                    timestamp = entry[0]
-                    #transmission_time = timestamp + (4.5 / (1 + np.exp(-1. * (attempt - 5)))) * correction_factor * attempt
-                    transmission_time = timestamp + sum(self.transmission_time_list[:attempt])
-                    # check if it is time to transmit
-                    if time.time() >= transmission_time:
-                        entry[5] += 1
-                        self.log.info("[MESH] [TX] Ping", destination=entry[1], origin=entry[2])
-                        channel_busy_timeout = time.time() + 5
-                        while self.states.channel_busy and time.time() < channel_busy_timeout:
-                            threading.Event().wait(0.01)
-                        self.transmit_mesh_signalling_ping(bytes.fromhex(entry[1]), bytes.fromhex(entry[2]))
-                    #print("...")
-                elif entry[3] in ["PING-ACK"] and attempt < len(self.transmission_time_list) and status not in ["acknowledged"]:
-                    timestamp = entry[0]
-                    #transmission_time = timestamp + (4.5 / (1 + np.exp(-1. * (attempt - 5)))) * correction_factor * attempt
-                    transmission_time = timestamp + sum(self.transmission_time_list[:attempt])
-                    # check if it is time to transmit
-                    if time.time() >= transmission_time:
-                        entry[5] += 1
-                        self.log.info("[MESH] [TX] Ping ACK", destination=entry[1], origin=entry[2])
-                        channel_busy_timeout = time.time() + 5
-                        while self.states.channel_busy and time.time() < channel_busy_timeout:
-                            threading.Event().wait(0.01)
-                        self.transmit_mesh_signalling_ping_ack(bytes.fromhex(entry[1]), bytes.fromhex(entry[2]))
-                else:
-                    pass
-
-
-    def received_routing_table(self, data_in, snr):
-        try:
-            print("data received........")
-            print(data_in)
-
-            router = data_in[1:4]  # Extract the first 4 bytes (header)
-            payload = data_in[4:]  # Extract the payload (excluding the header)
-
-            print("Router:", router)  # Output the header bytes
-
-            for i in range(0, len(payload)-1, 5):
-                callsign_checksum = payload[i:i + 3]  # First 3 bytes of the information (callsign_checksum)
-                hops = int.from_bytes(payload[i+3:i + 4], "big")  # Fourth byte of the information (hops)
-                score = int.from_bytes(payload[i+4:i + 5], "big")  # Fifth byte of the information (score)
-                snr = int(snr)
-                score = self.calculate_new_avg_score(score, self.calculate_score_by_snr(snr))
-                timestamp = int(time.time())
-
-                # use case 1: add new router to table only if callsign not empty
-                _use_case1 = callsign_checksum.startswith(b'\x00')
-
-                # use case 2: add new router to table only if not own callsign
-                _use_case2 = callsign_checksum not in [helpers.get_crc_24(self.mycallsign)]
-
-                # use case 3: increment hop if router not direct
-                if router not in [helpers.get_crc_24(b'direct')] and hops == 0:
-                    hops += 1
-
-                # use case 4: if callsign is directly available skip route for only keeping shortest way in db
-                _use_case4 = False
-                for _, call in enumerate(self.states.mesh_routing_table):
-                    # check if callsign already in routing table and is direct connection
-                    if callsign_checksum in [self.states.mesh_routing_table[_][0]] and self.states.mesh_routing_table[_][1] in [helpers.get_crc_24(b'direct')]:
-                        _use_case4 = True
-
-                # use case N: calculate score
-                # TODO...
-
-                if not _use_case1 \
-                        and _use_case2\
-                        and not _use_case4:
-
-                    print("Callsign Checksum:", callsign_checksum)
-                    print("Hops:", hops)
-                    print("Score:", score)
-
-                    new_router = [callsign_checksum, router, hops, snr, score, timestamp]
-                    print(new_router)
-                    self.add_router_to_routing_table(new_router)
-
-            print("-------------------------")
-            for _, item in enumerate(self.states.mesh_routing_table):
-                print(self.states.mesh_routing_table[_])
-            print("-------------------------")
-        except Exception as e:
-            self.log.warning("[MESH] error processing received routing broadcast", e=e)
-
-    def calculate_score_by_snr(self, snr):
-        if snr < -12 or snr > 12:
-            raise ValueError("Value must be in the range of -12 to 12")
-
-        score = (snr + 12) * 100 / 24  # Scale the value to the range [0, 100]
-        if score < 0:
-            score = 0  # Ensure the score is not less than 0
-        elif score > 100:
-            score = 100  # Ensure the score is not greater than 100
-
-        return int(score)
-
-    def calculate_new_avg_score(self, value_old, value):
-        return int((value_old + value) / 2)
-
-    def received_mesh_ping(self, data_in):
-        destination = data_in[1:4].hex()
-        origin = data_in[4:7].hex()
-        if destination == self.mycallsign_crc.hex():
-            self.log.info("[MESH] [RX] [PING] [REQ]", destination=destination, origin=origin, mycall=self.mycallsign_crc.hex())
-            # use case 1: set status to acknowleding if we are the receiver of a PING
-            self.add_mesh_ping_to_signalling_table(destination, origin, frametype="PING-ACK", status="acknowledging")
-
-            channel_busy_timeout = time.time() + 5
-            while self.states.channel_busy and time.time() < channel_busy_timeout:
-                threading.Event().wait(0.01)
-
-            # dxcallsign_crc = self.mycallsign_crc
-            self.transmit_mesh_signalling_ping_ack(bytes.fromhex(destination), bytes.fromhex(origin))
-        elif origin == self.mycallsign_crc.hex():
-            pass
-        else:
-            self.log.info("[MESH] [RX] [PING] [REQ]", destination=destination, origin=origin, mycall=self.mycallsign_crc.hex())
-            # lookup if entry is already in database - if so, udpate and exit
-            for item in MESH_SIGNALLING_TABLE:
-                if item[1] == destination and item[5] >= self.signalling_max_attempts:
-                    # use case 2: set status to forwarded if we are not the receiver of a PING and out of retries
-                    self.add_mesh_ping_to_signalling_table(destination, origin, frametype="PING", status="forwarded")
-                    return
-
-            print("......................")
-            # use case 1: set status to forwarding if we are not the receiver of a PING and we don't have an entry in our database
-            self.add_mesh_ping_to_signalling_table(destination, origin, frametype="PING", status="forwarding")
-
-    def received_mesh_ping_ack(self, data_in):
-        # TODO
-        # Check if we have a ping callsign already in signalling table
-        # if PING, then override and make it a PING-ACK
-        # if not, then add to table
-
-        destination = data_in[1:4].hex()
-        origin = data_in[4:7].hex()
-        timestamp = time.time()
-        #router = ""
-        frametype = "PING-ACK"
-        payload = ""
-        attempt = 0
-
-
-        if destination == self.mycallsign_crc.hex():
-            #self.log.info("[MESH] [RX] [PING] [ACK]", destination=destination, origin=origin, mycall=self.mycallsign_crc.hex())
-            #self.add_mesh_ping_ack_to_signalling_table(destination, origin, status="sending_ack")
-            pass
-        elif origin == self.mycallsign_crc.hex():
-            self.log.info("[MESH] [RX] [PING] [ACK]", destination=destination, origin=origin, mycall=self.mycallsign_crc.hex())
-            self.add_mesh_ping_ack_to_signalling_table(destination, origin, status="acknowledged")
-        else:
-            #status = "forwarding"
-            #self.add_mesh_ping_ack_to_signalling_table(destination, status)
-            self.log.info("[MESH] [RX] [PING] [ACK]", destination=destination, mycall=self.mycallsign_crc.hex())
-            for item in MESH_SIGNALLING_TABLE:
-                if item[1] == destination and item[2] == origin and item[5] >= self.signalling_max_attempts:
-                    # use case 2: set status to forwarded if we are not the receiver of a PING and out of retries
-                    self.add_mesh_ping_ack_to_signalling_table(destination, status="forwarded")
-                    return
-
-            self.add_mesh_ping_ack_to_signalling_table(destination, origin, status="forwarding")
-                #dxcallsign_crc = bytes.fromhex(destination)
-                #self.transmit_mesh_signalling_ping_ack(dxcallsign_crc)
-
-        print(MESH_SIGNALLING_TABLE)
-
-
-    def add_mesh_ping_to_signalling_table(self, destination, origin, frametype, status):
-        try:
-            timestamp = time.time()
-            #router = ""
-            #frametype = "PING"
-            payload = ""
-            attempt = 0
-
-            #           [timestamp, destination, origin, frametype, payload, attempt, status]
-            # --------------0------------1---------2---------3--------4---------5--------6-----#
-            new_entry = [timestamp, destination, origin, frametype, payload, attempt, status]
-            for _, item in enumerate(MESH_SIGNALLING_TABLE):
-                # update entry if exists
-                if destination in item[1] and origin in item[2] and frametype in item[3]:
-                    # reset attempts if entry exists and it failed or is acknowledged
-                    attempt = 0 if item[6] in ["failed", "acknowledged"] else item[5]
-                    update_entry = [item[0], destination, origin, frametype, "",attempt, status]
-                    #print(f"UPDATE {MESH_SIGNALLING_TABLE[_]} >>> {update_entry}")
-
-                    self.log.info(f"[MESH] [SIGNALLING TABLE] [UPDATE]: {MESH_SIGNALLING_TABLE[_]} >>> ", update=update_entry)
-
-                    MESH_SIGNALLING_TABLE[_] = update_entry
-                    return
-
-            # add new routing entry if not exists
-            if new_entry not in MESH_SIGNALLING_TABLE:
-                #print(f"INSERT {new_entry} >>> SIGNALLING TABLE")
-                self.log.info("[MESH] [SIGNALLING TABLE] [INSERT]:", insert=new_entry)
-
-                MESH_SIGNALLING_TABLE.append(new_entry)
-
-        except Exception as e:
-            self.log.warning(f"[MESH] [SIGNALLING TABLE] [INSERT] [PING] [ERROR] ", e=e)
-    def add_mesh_ping_ack_to_signalling_table(self, destination, origin, status):
-        try:
-            timestamp = time.time()
-            #router = ""
-            frametype = "PING-ACK"
-            payload = ""
-            attempt = 0
-            new_entry = [timestamp, destination, origin, frametype, payload, attempt, status]
-
-            for _, item in enumerate(MESH_SIGNALLING_TABLE):
-                # update entry if exists
-                if destination in item[1] and origin in item[2] and item[3] in ["PING", "PING-ACK"]:
-                    # reset attempts if entry exists and it failed or is acknowledged
-                    attempt = 0 if item[6] in ["failed", "acknowledged"] else item[5]
-                    update_entry = [item[0], destination, origin, "PING-ACK", "", attempt, status]
-                    #print(f"UPDATE {MESH_SIGNALLING_TABLE[_]} >>> {update_entry}")
-                    self.log.info(f"[MESH] [SIGNALLING TABLE] [UPDATE]: {MESH_SIGNALLING_TABLE[_]} >>> ", update=update_entry)
-
-                    MESH_SIGNALLING_TABLE[_] = update_entry
-                    return
-
-            # add new routing entry if not exists
-            if new_entry not in MESH_SIGNALLING_TABLE:
-                #print(f"INSERT {new_entry} >>> SIGNALLING TABLE")
-                self.log.info(f"[MESH] [SIGNALLING TABLE] [INSERT] >>> ", update=new_entry)
-
-                MESH_SIGNALLING_TABLE.append(new_entry)
-        except Exception as e:
-            self.log.warning(f"[MESH] [SIGNALLING TABLE] [INSERT] [PING ACK] [ERROR] ", e=e)
-
-
-    def enqueue_frame_for_tx(
-            self,
-            frame_to_tx,  # : list[bytearray], # this causes a crash on python 3.7
-            c2_mode=FREEDV_MODE.sig0.value,
-            copies=1,
-            repeat_delay=0,
-    ) -> None:
-        """
-        Send (transmit) supplied frame to Modem
-
-        :param frame_to_tx: Frame data to send
-        :type frame_to_tx: list of bytearrays
-        :param c2_mode: Codec2 mode to use, defaults to datac13
-        :type c2_mode: int, optional
-        :param copies: Number of frame copies to send, defaults to 1
-        :type copies: int, optional
-        :param repeat_delay: Delay time before sending repeat frame, defaults to 0
-        :type repeat_delay: int, optional
-        """
-        #print(frame_to_tx[0])
-        #print(frame_to_tx)
-        frame_type = FRAME_TYPE(int.from_bytes(frame_to_tx[0][:1], byteorder="big")).name
-        self.log.debug("[Modem] enqueue_frame_for_tx", c2_mode=FREEDV_MODE(c2_mode).name, data=frame_to_tx,
-                       type=frame_type)
-
-        modem.MODEM_TRANSMIT_QUEUE.put([c2_mode, copies, repeat_delay, frame_to_tx])
-
-
-    def transmit_mesh_signalling_ping(self, destination, origin):
-
-        frame_type = bytes([FRAME_TYPE.MESH_SIGNALLING_PING.value])
-
-        ping_frame = bytearray(14)
-        ping_frame[:1] = frame_type
-        ping_frame[1:4] = destination
-        ping_frame[4:7] = origin
-        ping_frame[7:13] = helpers.callsign_to_bytes(self.mycallsign)
-
-        self.enqueue_frame_for_tx([ping_frame], c2_mode=FREEDV_MODE.sig0.value)
-
-    def transmit_mesh_signalling_ping_ack(self, destination, origin):
-        #dxcallsign_crc = bytes.fromhex(data[1])
-
-        frame_type = bytes([FRAME_TYPE.MESH_SIGNALLING_PING_ACK.value])
-
-        ping_frame = bytearray(14)
-        ping_frame[:1] = frame_type
-        ping_frame[1:4] = destination
-        ping_frame[4:7] = origin
-        #ping_frame[7:13] = helpers.callsign_to_bytes(self.mycallsign)
-
-        self.enqueue_frame_for_tx([ping_frame], c2_mode=FREEDV_MODE.sig0.value)
\ No newline at end of file
diff --git a/freedata_server/message_system_db_messages.py b/freedata_server/message_system_db_messages.py
index 958ed6d38..e922c8069 100644
--- a/freedata_server/message_system_db_messages.py
+++ b/freedata_server/message_system_db_messages.py
@@ -181,9 +181,9 @@ def get_message_by_id_adif(self, message_id):
                 print(origin_info)
                 if origin_info and "location" in origin_info and origin_info["location"] is not None:
                     print(origin_info["location"])
-                    grid = origin_info["location"].get("gridsquare", "----")
+                    grid = origin_info["location"].get("gridsquare", "")
                 else:
-                    grid = "----"
+                    grid = ""
 
 
                 # Extract and adjust the frequency (Hz to MHz)
diff --git a/freedata_server/modem.py b/freedata_server/modem.py
index a8faff91a..b5c3ece3e 100644
--- a/freedata_server/modem.py
+++ b/freedata_server/modem.py
@@ -206,11 +206,10 @@ def transmit_sine(self):
         s = 0.5 * np.sin(2 * np.pi * f0 * t)
         signal = np.int16(s * 32767)  # Convert to 16-bit integer PCM format
 
-        # Increase audio level by 2 ( + 3dB )
-        increased_audio_level = self.tx_audio_level + 3
+        signal = audio.normalize_audio(signal)
 
         # Set audio volume and prepare buffer for transmission
-        txbuffer_out = audio.set_audio_volume(signal, increased_audio_level)
+        txbuffer_out = audio.set_audio_volume(signal, self.tx_audio_level)
 
         # Transmit audio
         self.enqueue_audio_out(txbuffer_out)
@@ -236,9 +235,8 @@ def transmit_morse(self, repeats, repeat_delay, frames):
             "[MDM] TRANSMIT", mode="MORSE"
         )
         start_of_transmission = time.time()
-
-        txbuffer_out = cw.MorseCodePlayer().text_to_signal(self.config['STATION'].mycall)
-
+        txbuffer_out = cw.MorseCodePlayer().text_to_signal(self.config['STATION'].get('mycall'))
+        txbuffer_out = audio.normalize_audio(txbuffer_out)
         # transmit audio
         self.enqueue_audio_out(txbuffer_out)
 
@@ -262,6 +260,7 @@ def transmit(
 
         # Re-sample back up to 48k (resampler works on np.int16)
         x = np.frombuffer(txbuffer, dtype=np.int16)
+        x = audio.normalize_audio(x)
         x = audio.set_audio_volume(x, self.tx_audio_level)
 
         if self.radiocontrol not in ["tci"]:
diff --git a/freedata_server/modulator.py b/freedata_server/modulator.py
index 687a96a5f..3d47fce3a 100644
--- a/freedata_server/modulator.py
+++ b/freedata_server/modulator.py
@@ -24,7 +24,10 @@ def init_codec2(self):
         self.freedv_datac4_tx = codec2.open_instance(codec2.FREEDV_MODE.datac4.value)
         self.freedv_datac13_tx = codec2.open_instance(codec2.FREEDV_MODE.datac13.value)
         self.freedv_datac14_tx = codec2.open_instance(codec2.FREEDV_MODE.datac14.value)
+        self.data_ofdm_200_tx = codec2.open_instance(codec2.FREEDV_MODE.data_ofdm_200.value)
+        self.data_ofdm_250_tx = codec2.open_instance(codec2.FREEDV_MODE.data_ofdm_250.value)
         self.data_ofdm_500_tx = codec2.open_instance(codec2.FREEDV_MODE.data_ofdm_500.value)
+        self.data_ofdm_1700_tx = codec2.open_instance(codec2.FREEDV_MODE.data_ofdm_1700.value)
         self.data_ofdm_2438_tx = codec2.open_instance(codec2.FREEDV_MODE.data_ofdm_2438.value)
         #self.freedv_qam16c2_tx = codec2.open_instance(codec2.FREEDV_MODE.qam16c2.value)
         #self.data_qam_2438_tx = codec2.open_instance(codec2.FREEDV_MODE.data_qam_2438.value)
@@ -119,7 +122,10 @@ def create_burst(
             codec2.FREEDV_MODE.datac4: self.freedv_datac4_tx,
             codec2.FREEDV_MODE.datac13: self.freedv_datac13_tx,
             codec2.FREEDV_MODE.datac14: self.freedv_datac14_tx,
+            codec2.FREEDV_MODE.data_ofdm_200: self.data_ofdm_200_tx,
+            codec2.FREEDV_MODE.data_ofdm_250: self.data_ofdm_250_tx,
             codec2.FREEDV_MODE.data_ofdm_500: self.data_ofdm_500_tx,
+            codec2.FREEDV_MODE.data_ofdm_1700: self.data_ofdm_1700_tx,
             codec2.FREEDV_MODE.data_ofdm_2438: self.data_ofdm_2438_tx,
             #codec2.FREEDV_MODE.qam16c2: self.freedv_qam16c2_tx,
             #codec2.FREEDV_MODE.data_qam_2438: self.freedv_data_qam_2438_tx,
diff --git a/freedata_server/server.py b/freedata_server/server.py
index 406188cc5..85820c937 100644
--- a/freedata_server/server.py
+++ b/freedata_server/server.py
@@ -8,47 +8,37 @@
 import queue
 import asyncio
 import webbrowser
-import platform
-from fastapi import FastAPI, Request, HTTPException, WebSocket, WebSocketDisconnect
-from fastapi.responses import JSONResponse
+from fastapi import FastAPI, Request, WebSocket
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from contextlib import asynccontextmanager
 import uvicorn
 import threading
-import serial_ports
 from config import CONFIG
 import audio
 import service_manager
 import state_manager
 import websocket_manager
-import api_validations as validations
-import command_cq
-import command_beacon
-import command_ping
-import command_feq
-import command_test
-import command_transmit_sine
-import command_arq_raw
-import command_message_send
+
 import event_manager
 import structlog
-from log_handler import setup_logging
-import adif_udp_logger
+
 
 from message_system_db_manager import DatabaseManager
-from message_system_db_messages import DatabaseManagerMessages
-from message_system_db_attachments import DatabaseManagerAttachments
-from message_system_db_beacon import DatabaseManagerBeacon
-from message_system_db_station import DatabaseManagerStations
 from schedule_manager import ScheduleManager
 
+from api.general import router as general_router
+from api.config import router as config_router
+from api.devices import router as devices_router
+from api.radio import router as radio_router
+from api.modem import router as modem_router
+from api.freedata import router as freedata_router
+from api.websocket import router as websocket_router
+
 # Constants
 CONFIG_ENV_VAR = 'FREEDATA_CONFIG'
 DEFAULT_CONFIG_FILE = 'config.ini'
-
-MODEM_VERSION = "0.16.10-alpha"
-
+MODEM_VERSION = "0.16.11-alpha"
 API_VERSION = 3
 LICENSE = 'GPL3.0'
 DOCUMENTATION_URL = 'https://wiki.freedata.app'
@@ -64,7 +54,13 @@ async def lifespan(app: FastAPI):
     stop_server()
 
 app = FastAPI(lifespan=lifespan)
-
+app.include_router(general_router, prefix="")
+app.include_router(config_router, prefix="/config")
+app.include_router(devices_router, prefix="/devices")
+app.include_router(radio_router, prefix="/radio")
+app.include_router(modem_router, prefix="/modem")
+app.include_router(freedata_router, prefix="/freedata")
+app.include_router(websocket_router, prefix="")
 # custom logger for fastapi
 #setup_logging()
 logger = structlog.get_logger()
@@ -92,8 +88,19 @@ async def lifespan(app: FastAPI):
 
 
 @app.middleware("http")
-async def log_requests(request: Request, call_next):
+async def http_middleware(request: Request, call_next):
     response = await call_next(request)
+
+    # Disable caching
+    response.headers["Cache-Control"] = "no-store, no-cache, must-revalidate, private"
+    response.headers["Pragma"] = "no-cache"  # For HTTP/1.0 backward compatibility
+
+    # Enable caching for 1 day
+    # response.headers["Cache-Control"] = "public, max-age=86400"  # Cache for 86400 seconds (1 day)
+    # response.headers["Pragma"] = "cache"  # backward compatibility with HTTP/1.0
+    # response.headers["Expires"] = "0"  # Forces modern clients to use max-age
+
+    # Log requests
     logger.info(f"[API] {request.method}", url=str(request.url), response_code=response.status_code)
     return response
 
@@ -109,28 +116,6 @@ async def log_requests(request: Request, call_next):
 )
 
 
-# Returns a standard API response
-def api_response(data, status=200):
-    return JSONResponse(content=data, status_code=status)
-
-
-def api_abort(message, code):
-    raise HTTPException(status_code=code, detail={"error": message})
-
-
-def api_ok(message="ok"):
-    return api_response({'message': message})
-
-
-# Validates a parameter
-def validate(req, param, validator, is_required=True):
-    if param not in req:
-        if is_required:
-            api_abort(f"Required parameter '{param}' is missing.", 400)
-        else:
-            return True
-    if not validator(req[param]):
-        api_abort(f"Value of '{param}' is invalid.", 400)
 
 
 # Set config file to use
@@ -144,2130 +129,10 @@ def set_config():
     return config_file
 
 
-# Enqueue a transmit command
-async def enqueue_tx_command(cmd_class, params={}):
-    try:
-        command = cmd_class(app.config_manager.read(), app.state_manager, app.event_manager, params)
-        print(f"Command {command.get_name()} running...")
-
-        # Run the command in a separate thread to avoid blocking
-        result = await asyncio.to_thread(command.run, app.modem_events, app.service_manager.modem)  # TODO: remove the app.modem_event custom queue
-
-        if result:
-            return True
-    except Exception as e:
-        print(f"Command failed: {e}")
-    return False
-
-# API Endpoints
-@app.get("/", summary="API Root", tags=["General"], responses={
-    200: {
-        "description": "API information.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "name": "FreeDATA API",
-                    "description": "A sample API that provides free data services",
-                    "api_version": 3,
-                    "modem_version": "0.16.8-alpha",
-                    "license": "GPL3.0",
-                    "documentation": "https://wiki.freedata.app"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Service unavailable.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Service unavailable."
-                }
-            }
-        }
-    }
-})
-async def index():
-    """
-    Retrieve API metadata.
-
-    Returns:
-        dict: A JSON object containing API metadata.
-    """
-    return {
-        'name': 'FreeDATA API',
-        'description': 'A sample API that provides free data services',
-        'api_version': 3,
-        'modem_version': "0.16.8-alpha",
-        'license': "GPL3.0",
-        'documentation': "https://wiki.freedata.app",
-    }
-
-
-@app.get("/config", summary="Get Modem Configuration", tags=["Configuration"], responses={
-    200: {
-        "description": "Current modem configuration settings.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "AUDIO": {
-                        "input_device": "2fc0",
-                        "output_device": "3655",
-                        "rx_audio_level": 0,
-                        "tx_audio_level": 2
-                    },
-                    "MESH": {
-                        "enable_protocol": False
-                    },
-                    "MESSAGES": {
-                        "enable_auto_repeat": True
-                    },
-                    "MODEM": {
-                        "enable_hmac": False,
-                        "enable_morse_identifier": False,
-                        "enable_socket_interface": False,
-                        "maximum_bandwidth": 2438,
-                        "respond_to_cq": True,
-                        "tx_delay": 200
-                    },
-                    "NETWORK": {
-                        "modemaddress": "",
-                        "modemport": 5000
-                    },
-                    "RADIO": {
-                        "control": "rigctld",
-                        "data_bits": 8,
-                        "model_id": 1001,
-                        "ptt_port": "ignore",
-                        "ptt_type": "USB",
-                        "serial_dcd": "NONE",
-                        "serial_dtr": "OFF",
-                        "serial_handshake": "ignore",
-                        "serial_port": "/dev/cu.Bluetooth-Incoming-Port",
-                        "serial_speed": 38400,
-                        "stop_bits": 1
-                    },
-                    "RIGCTLD": {
-                        "arguments": "",
-                        "command": "",
-                        "ip": "127.0.0.1",
-                        "path": "",
-                        "port": 4532
-                    },
-                    "SOCKET_INTERFACE": {
-                        "cmd_port": 0,
-                        "data_port": 0,
-                        "enable": False,
-                        "host": ""
-                    },
-                    "STATION": {
-                        "enable_explorer": True,
-                        "enable_stats": True,
-                        "mycall": "LA3QMA",
-                        "mygrid": "JP20ql",
-                        "myssid": 0,
-                        "ssid_list": [0,1,2,3,4,5,6,7,8,9]
-                    },
-                    "TCI": {
-                        "tci_ip": "127.0.0.1",
-                        "tci_port": 50001
-                    }
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def get_config():
-    """
-    Retrieve the current modem configuration.
-
-    Returns:
-        dict: The modem configuration settings.
-    """
-    return app.config_manager.read()
-
-
-@app.post("/config", summary="Update Modem Configuration", tags=["Configuration"], responses={
-    200: {
-        "description": "Modem configuration updated successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "AUDIO": {
-                        "input_device": "2fc0",
-                        "output_device": "3655",
-                        "rx_audio_level": 0,
-                        "tx_audio_level": 2
-                    },
-                    # ... (rest of the configuration as in the GET example)
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Invalid configuration data.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid config"
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Error writing configuration.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Error writing config"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def post_config(request: Request):
-    """
-    Update the modem configuration with new settings.
-
-    Parameters:
-        request (Request): The HTTP request containing the new configuration in JSON format.
-
-    Returns:
-        dict: The updated modem configuration.
-
-    Raises:
-        HTTPException: If the provided configuration is invalid or an error occurs while writing the config.
-    """
-    config = await request.json()
-    print(config)
-    if not validations.validate_remote_config(config):
-        api_abort("Invalid config", 400)
-    if app.config_manager.read() == config:
-        return config
-    set_config = app.config_manager.write(config)
-    if not set_config:
-        api_abort("Error writing config", 500)
-    app.modem_service.put("restart")
-    return set_config
-
-
-@app.get("/devices/audio", summary="Get Audio Devices", tags=["Devices"], responses={
-    200: {
-        "description": "List of available audio input and output devices.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "in": [
-                        {
-                            "api": "ALSA",
-                            "id": "8eb1",
-                            "name": "pipewire",
-                            "native_index": 4
-                        },
-                        {
-                            "api": "ALSA",
-                            "id": "8e7a",
-                            "name": "default",
-                            "native_index": 5
-                        }
-                    ],
-                    "out": [
-                        {
-                            "api": "ALSA",
-                            "id": "ae79",
-                            "name": "HDA Intel HDMI: 0 (hw:0,3)",
-                            "native_index": 0
-                        },
-                        {
-                            "api": "ALSA",
-                            "id": "67fd",
-                            "name": "HDA Intel HDMI: 1 (hw:0,7)",
-                            "native_index": 1
-                        },
-                        {
-                            "api": "ALSA",
-                            "id": "b68c",
-                            "name": "HDA Intel HDMI: 2 (hw:0,8)",
-                            "native_index": 2
-                        },
-                        {
-                            "api": "ALSA",
-                            "id": "ba84",
-                            "name": "hdmi",
-                            "native_index": 3
-                        },
-                        {
-                            "api": "ALSA",
-                            "id": "8eb1",
-                            "name": "pipewire",
-                            "native_index": 4
-                        },
-                        {
-                            "api": "ALSA",
-                            "id": "8e7a",
-                            "name": "default",
-                            "native_index": 5
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_audio_devices():
-    """
-    Retrieve a list of available audio input and output devices.
-
-    Returns:
-        dict: A JSON object containing lists of input and output audio devices.
-    """
-    # Uncomment the following line if using the actual function
-    # dev_in, dev_out = audio.get_audio_devices()
-    dev_in, dev_out = audio.fetch_audio_devices([], [])
-    return {'in': dev_in, 'out': dev_out}
-
-
-@app.get("/devices/serial", summary="Get Serial Devices", tags=["Devices"], responses={
-    200: {
-        "description": "List of available serial devices (COM ports).",
-        "content": {
-            "application/json": {
-                "example": [
-                    {
-                        "description": "n/a [26a9]",
-                        "port": "/dev/ttyS4"
-                    }
-                ]
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_serial_devices():
-    """
-    Retrieve a list of available serial devices (COM ports).
-
-    Returns:
-        list: A list of dictionaries containing serial port information.
-    """
-    devices = serial_ports.get_ports()
-    return devices
-
-
-@app.get("/modem/state", summary="Get Modem State", tags=["Modem"], responses={
-    200: {
-        "description": "Current modem state information.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "activities": {
-                        "161dd75ef3b5847a": {
-                            "activity_type": "ARQ_BURST_ACK",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "session_id": 105,
-                            "snr": 4,
-                            "timestamp": 1713034266
-                        },
-                        "168e90799d13b7b4": {
-                            "activity_type": "ARQ_SESSION_INFO_ACK",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "session_id": 105,
-                            "snr": -3,
-                            "timestamp": 1713034248
-                        },
-                        "2218b849e937d36d": {
-                            "activity_type": "QRV",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "gridsquare": "JP15OW",
-                            "origin": "SOMECALL-1",
-                            "snr": 2,
-                            "timestamp": 1713034200
-                        },
-                        "3fb424827f4632ab": {
-                            "activity_type": "BEACON",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "gridsquare": "JP22AI",
-                            "origin": "CALLSIGN-1",
-                            "snr": -8,
-                            "timestamp": 1713034455
-                        },
-                        "743222d1dd64ce9d": {
-                            "activity_type": "ARQ_SESSION_OPEN_ACK",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "origin": "CALL-1",
-                            "session_id": 105,
-                            "snr": -2,
-                            "timestamp": 1713034243
-                        },
-                        "7589edf6bf23ceed": {
-                            "activity_type": "ARQ_BURST_ACK",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "session_id": 105,
-                            "snr": 2,
-                            "timestamp": 1713034275
-                        },
-                        "9d2c5a98fe0f9894": {
-                            "activity_type": "QRV",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "gridsquare": "JP12AW",
-                            "origin": "CALLME-1",
-                            "snr": 5,
-                            "timestamp": 1713034178
-                        },
-                        "f85609dced4ea40a": {
-                            "activity_type": "ARQ_BURST_ACK",
-                            "direction": "received",
-                            "frequency": "14093000",
-                            "frequency_offset": 0,
-                            "session_id": 105,
-                            "snr": 0,
-                            "timestamp": 1713034257
-                        }
-                    },
-                    "audio_dbfs": -7.915304862713354,
-                    "channel_busy_slot": [False, False, True, False, False],
-                    "is_away_from_key": False,
-                    "is_beacon_running": True,
-                    "is_modem_busy": False,
-                    "is_modem_running": True,
-                    "radio_frequency": "14093000",
-                    "radio_mode": "PKTUSB",
-                    "radio_status": True,
-                    "s_meter_strength": "20",
-                    "type": "state"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def get_modem_state():
-    """
-    Retrieve the current state of the modem.
-
-    Returns:
-        dict: A JSON object containing modem state information.
-    """
-    return app.state_manager.sendState()
-
-
-@app.post("/modem/cqcqcq", summary="Send CQ Command", tags=["Modem"], responses={
-    200: {
-        "description": "CQ command sent successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": "ok"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_cqcqcq():
-    """
-    Trigger the modem to send a CQ.
-
-    Returns:
-        dict: A JSON object indicating success.
-
-    Raises:
-        HTTPException: If the modem is not running.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-    await enqueue_tx_command(command_cq.CQCommand)
-    return api_ok()
-
-
-@app.post("/modem/beacon", summary="Enable/Disable Modem Beacon", tags=["Modem"], responses={
-    200: {
-        "description": "Beacon status updated successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "enabled": True,
-                    "away_from_key": False
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Invalid input parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Incorrect value for 'enabled' or 'away_from_key'. Should be bool."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_beacon(request: Request):
-    """
-    Enable or disable the modem beacon.
-
-    Parameters:
-        request (Request): The HTTP request containing the following JSON keys:
-            - 'enabled' (bool): True to enable the beacon, False to disable.
-            - 'away_from_key' (bool): True if away from key, False otherwise.
-
-    Returns:
-        dict: A JSON object indicating the beacon status.
-
-    Raises:
-        HTTPException: If parameters are invalid or modem is not running.
-    """
-    data = await request.json()
-    if not isinstance(data.get('enabled'), bool) or not isinstance(data.get('away_from_key'), bool):
-        api_abort("Incorrect value for 'enabled' or 'away_from_key'. Should be bool.", 400)
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-    app.state_manager.set('is_beacon_running', data['enabled'])
-    app.state_manager.set('is_away_from_key', data['away_from_key'])
-    if not app.state_manager.getARQ() and data['enabled']:
-        await enqueue_tx_command(command_beacon.BeaconCommand, data)
-    return api_response({"enabled": data['enabled'], "away_from_key": data['away_from_key']})
-
-
-@app.post("/modem/ping_ping", summary="Trigger Modem to PING a Station", tags=["Modem"], responses={
-    200: {
-        "description": "Ping command sent successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": True
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Invalid input parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid 'dxcall' parameter."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_ping(request: Request):
-    """
-    Trigger the modem to send a PING to a station.
-
-    Parameters:
-        request (Request): The HTTP request containing the following JSON key:
-            - 'dxcall' (str): Callsign of the station to ping.
-
-    Returns:
-        dict: A JSON object indicating success.
-
-    Raises:
-        HTTPException: If parameters are invalid or modem is not running.
-    """
-    data = await request.json()
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-    dxcall = data.get('dxcall')
-    if not dxcall or not validations.validate_freedata_callsign(dxcall):
-        api_abort("Invalid 'dxcall' parameter.", 400)
-    await enqueue_tx_command(command_ping.PingCommand, data)
-    return api_response({"message": True})
-
-
-@app.post("/modem/send_test_frame", summary="Send Test Frame", tags=["Modem"], responses={
-    200: {
-        "description": "Test frame sent successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": "ok"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_send_test_frame():
-    """
-    Trigger the modem to send a test frame.
-
-    Returns:
-        dict: A JSON object indicating success.
-
-    Raises:
-        HTTPException: If the modem is not running.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-    await enqueue_tx_command(command_test.TestCommand)
-    return api_ok()
-
-@app.post("/modem/fec_transmit", summary="FEC Transmit", tags=["Modem"], responses={
-    200: {
-        "description": "FEC frame transmitted successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": "FEC transmission started."
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid parameters."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_send_fec_frame(request: Request):
-    """
-    Trigger the modem to transmit a Forward Error Correction (FEC) frame.
-
-    Parameters:
-        request (Request): The HTTP request containing transmission parameters in JSON format.
-
-    Returns:
-        dict: A JSON object indicating success.
-
-    Raises:
-        HTTPException: If the modem is not running, the request is malformed, or an internal error occurs.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-
-    try:
-        data = await request.json()
-    except Exception:
-        api_abort("Invalid parameters.", 400)
-
-    # Validate required parameters (adjust based on actual requirements)
-    if 'message' not in data:
-        api_abort("Invalid parameters: 'message' field is required.", 400)
-
-    # Enqueue the FEC transmission command
-    try:
-        await enqueue_tx_command(command_fec.FecCommand, data)
-        return api_response({"message": "FEC transmission started."})
-    except Exception as e:
-        # Log the exception if necessary
-        api_abort("Internal server error.", 500)
-
-
-from fastapi import HTTPException
-
-@app.get("/modem/fec_is_writing", summary="Indicate User is Typing (FEC)", tags=["Modem"], responses={
-    501: {
-        "description": "Feature not implemented.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Feature not implemented yet."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_fec_is_writing():
-    """
-    Trigger the modem to inform over RF that the user is typing a message.
-
-    Returns:
-        dict: A JSON object indicating that the feature is not implemented.
-
-    Raises:
-        HTTPException: If the modem is not running or the feature is not implemented.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-
-    # Since the feature is not implemented yet, return a 501 Not Implemented error
-    raise HTTPException(status_code=501, detail="Feature not implemented yet.")
-
-
-@app.post("/modem/start", summary="Start Modem", tags=["Modem"], responses={
-    200: {
-        "description": "Modem started successfully.",
-        "content": {
-            "application/json": {
-                "examples": {
-                    "modem_started": {
-                        "summary": "Modem Started",
-                        "value": {
-                            "modem": "started"
-                        }
-                    },
-                    "message_ok": {
-                        "summary": "Message OK",
-                        "value": {
-                            "message": "ok"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid parameters."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    }
-})
-async def post_modem_start(request: Request):
-    """
-    Trigger the modem to start.
-
-    Parameters:
-        request (Request): The HTTP request containing the following JSON key:
-            - 'start' (bool): True to start the modem.
-
-    Returns:
-        dict: A JSON object indicating the modem has started.
-
-    Raises:
-        HTTPException: If parameters are invalid or an error occurs.
-    """
-    try:
-        data = await request.json()
-        if 'start' not in data or not isinstance(data['start'], bool):
-            api_abort("Invalid parameters.", 400)
-        if not data['start']:
-            api_abort("Invalid 'start' parameter. Must be True.", 400)
-    except Exception:
-        api_abort("Invalid parameters.", 400)
-
-    try:
-        app.modem_service.put("start")
-        return api_response({"modem": "started"})
-    except Exception as e:
-        api_abort("Internal server error.", 500)
-
-
-@app.post("/modem/stop", summary="Stop Modem", tags=["Modem"], responses={
-    200: {
-        "description": "Modem stopped successfully.",
-        "content": {
-            "application/json": {
-                "examples": {
-                    "modem_stopped": {
-                        "summary": "Modem Stopped",
-                        "value": {
-                            "modem": "stopped"
-                        }
-                    },
-                    "message_ok": {
-                        "summary": "Message OK",
-                        "value": {
-                            "message": "ok"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_modem_stop():
-    """
-    Trigger the modem to stop.
-
-    Returns:
-        dict: A JSON object indicating the modem has stopped.
-
-    Raises:
-        HTTPException: If the modem is not running or an error occurs.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-
-    try:
-        app.modem_service.put("stop")
-        return api_response({"modem": "stopped"})
-    except Exception:
-        api_abort("Internal server error.", 500)
-
-
-@app.get("/version", summary="Get Modem Version", tags=["General"], responses={
-    200: {
-        "description": "Successful Response",
-        "content": {
-            "application/json": {
-                "example": {
-                    "api_version": 3,
-                    "modem_version": "0.16.8-alpha",
-                    "os_info": {
-                        "system": "Linux",
-                        "node": "my-node",
-                        "release": "5.4.0-74-generic",
-                        "version": "#83-Ubuntu SMP Mon May 10 16:30:51 UTC 2021",
-                        "machine": "x86_64",
-                        "processor": "x86_64"
-                    },
-                    "python_info": {
-                        "build": ["default", "May  3 2021 19:12:05"],
-                        "compiler": "GCC 9.3.0",
-                        "branch": "",
-                        "implementation": "CPython",
-                        "revision": "",
-                        "version": "3.8.5"
-                    }
-                }
-            }
-        }
-    }
-})
-async def get_modem_version():
-    """
-    Retrieve the modem version, API version, OS information, and Python information.
-
-    Returns:
-        dict: A JSON object containing version information.
-    """
-    os_info = {
-        'system': platform.system(),
-        'node': platform.node(),
-        'release': platform.release(),
-        'version': platform.version(),
-        'machine': platform.machine(),
-        'processor': platform.processor(),
-    }
-
-    python_info = {
-        'build': platform.python_build(),
-        'compiler': platform.python_compiler(),
-        'branch': platform.python_branch(),
-        'implementation': platform.python_implementation(),
-        'revision': platform.python_revision(),
-        'version': platform.python_version()
-    }
-
-    return {
-        'api_version': API_VERSION,
-        'modem_version': MODEM_VERSION,
-        'os_info': os_info,
-        'python_info': python_info
-    }
-
-@app.post("/modem/send_arq_raw", summary="Send ARQ Raw Data", tags=["Modem"], responses={
-    200: {
-        "description": "ARQ raw data sent successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "data": "RnJlZURBVEEgaXMgdGhlIGJlc3Qh",
-                    "dxcall": "XX1XXX-6",
-                    "type": "raw"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running or busy.",
-        "content": {
-            "application/json": {
-                "examples": {
-                    "modem_not_running": {
-                        "summary": "Modem Not Running",
-                        "value": {
-                            "error": "Modem not running."
-                        }
-                    },
-                    "modem_busy": {
-                        "summary": "Modem Busy",
-                        "value": {
-                            "error": "Modem Busy."
-                        }
-                    }
-                }
-            }
-        }
-    }
-})
-async def post_send_arq_raw(request: Request):
-    """
-    Send ARQ raw data to a specified station.
-
-    Parameters:
-        request (Request): The HTTP request containing the following JSON keys:
-            - 'dxcall' (str): Callsign of the station to send data to.
-            - 'type' (str): Data type ('raw', 'raw_lzma', 'raw_gzip').
-            - 'data' (str): Base64 encoded data to send.
-
-    Returns:
-        dict: A JSON object echoing the sent data.
-
-    Raises:
-        HTTPException: If parameters are invalid or modem is not running/busy.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running.", 503)
-    if app.state_manager.is_modem_busy:
-        api_abort("Modem Busy.", 503)
-    data = await request.json()
-    dxcall = data.get('dxcall')
-    data_type = data.get('type')
-    raw_data = data.get('data')
-    if not dxcall or not validations.validate_freedata_callsign(dxcall):
-        api_abort("Invalid 'dxcall' parameter.", 400)
-    if data_type not in ['raw', 'raw_lzma', 'raw_gzip']:
-        api_abort("Invalid 'type' parameter.", 400)
-    if not raw_data:
-        api_abort("Missing 'data' parameter.", 400)
-    await enqueue_tx_command(command_arq_raw.SendARQRawCommand, data)
-    return api_response({
-        "data": raw_data,
-        "dxcall": dxcall,
-        "type": data_type
-    })
-
-
-@app.post("/modem/stop_transmission", summary="Stop Transmission", tags=["Modem"], responses={
-    200: {
-        "description": "Transmission stopped successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": "ok"
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid request."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_modem_stop_transmission():
-    """
-    Stop the current transmission.
-
-    Returns:
-        dict: A JSON object indicating success.
-
-    Raises:
-        HTTPException: If the modem is not running or an error occurs.
-    """
-    if not app.state_manager.is_modem_running:
-        api_abort("Modem not running", 503)
-    if app.state_manager.getARQ():
-        try:
-            for session in app.state_manager.arq_irs_sessions.values():
-                # session.abort_transmission()
-                session.transmission_aborted()
-            for session in app.state_manager.arq_iss_sessions.values():
-                session.abort_transmission(send_stop=False)
-                session.transmission_aborted()
-        except Exception as e:
-            print(f"Error during transmission stopping: {e}")
-    return api_ok()
-
-
-@app.get("/radio", summary="Get Radio Parameters", tags=["Radio"], responses={
-    200: {
-        "description": "Current radio parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "radio_frequency": "14093000",
-                    "radio_mode": "PKTUSB",
-                    "radio_rf_level": 100,
-                    "radio_status": True,
-                    "radio_swr": 0,
-                    "radio_tuner": False,
-                    "s_meter_strength": "20"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def get_radio():
-    """
-    Retrieve current radio parameters.
-
-    Returns:
-        dict: A JSON object containing radio parameters.
-    """
-    return app.state_manager.get_radio_status()
-
-
-@app.post("/radio", summary="Set Radio Parameters", tags=["Radio"], responses={
-    200: {
-        "description": "Radio parameters updated successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "radio_frequency": "14093000",
-                    "radio_mode": "PKTUSB",
-                    "radio_rf_level": 100,
-                    "radio_status": True,
-                    "radio_swr": 0,
-                    "radio_tuner": True,
-                    "s_meter_strength": "20"
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid parameters."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def post_radio(request: Request):
-    """
-    Set radio parameters.
-
-    Parameters:
-        request (Request): The HTTP request containing the radio parameters in JSON format.
-
-    Returns:
-        dict: A JSON object containing the updated radio parameters.
-    """
-    data = await request.json()
-    radio_manager = app.radio_manager
-    if "radio_frequency" in data:
-        radio_manager.set_frequency(data['radio_frequency'])
-    if "radio_mode" in data:
-        radio_manager.set_mode(data['radio_mode'])
-    if "radio_rf_level" in data:
-        radio_manager.set_rf_level(int(data['radio_rf_level']))
-    if "radio_tuner" in data:
-        radio_manager.set_tuner(data['radio_tuner'])
-    return api_response(data)
-
-
-@app.post("/radio/tune", summary="Enable/Disable Radio Tuning", tags=["Radio"], responses={
-    200: {
-        "description": "Radio tuning status updated successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "enable_tuning": True
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid parameters."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running or busy.",
-        "content": {
-            "application/json": {
-                "examples": {
-                    "modem_not_running": {
-                        "summary": "Modem Not Running",
-                        "value": {
-                            "error": "Modem not running."
-                        }
-                    },
-                    "modem_busy": {
-                        "summary": "Modem Busy",
-                        "value": {
-                            "error": "Modem Busy."
-                        }
-                    }
-                }
-            }
-        }
-    }
-})
-async def post_radio_tune(request: Request):
-    """
-    Trigger the modem to inform over RF that the user is typing a message.
-
-    Parameters:
-        request (Request): The HTTP request containing the following JSON key:
-            - 'enable_tuning' (bool): True to enable tuning, False to disable.
-
-    Returns:
-        dict: A JSON object echoing the tuning status.
-
-    Raises:
-        HTTPException: If the modem is not running/busy or if parameters are invalid.
-    """
-    data = await request.json()
-    print(data)
-    if "enable_tuning" in data:
-        if data['enable_tuning']:
-            if not app.state_manager.is_modem_running:
-                api_abort("Modem not running", 503)
-            await enqueue_tx_command(command_transmit_sine.TransmitSine)
-        else:
-            app.service_manager.modem.stop_sine()
-    else:
-        app.service_manager.modem.stop_sine()
-
-    return api_response(data)
-
-
-
-@app.get("/freedata/messages/{message_id}", summary="Get Message by ID", tags=["FreeDATA"], responses={
-    200: {"description": "Message found and returned."},
-    404: {"description": "Message not found."}
-})
-async def get_freedata_message(message_id: str):
-    message = DatabaseManagerMessages(app.event_manager).get_message_by_id_json(message_id)
-    return api_response(message)
-
-
-@app.post("/freedata/messages", summary="Transmit Message", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Message transmitted successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "destination": "XX1XXX-6",
-                    "body": "Hello FreeDATA"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running or busy.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_freedata_message(request: Request):
-    """
-    Transmit a FreeDATA message.
-
-    Parameters:
-        request (Request): The HTTP request containing the message data in JSON format.
-
-    Returns:
-        dict: A JSON object containing the transmitted message details.
-    """
-    data = await request.json()
-    await enqueue_tx_command(command_message_send.SendMessageCommand, data)
-    return api_response(data)
-
-@app.post("/freedata/messages/{message_id}/adif", summary="Send Message ADIF Log", tags=["FreeDATA"], responses={
-    200: {
-        "description": "ADIF log sent successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "adif_output": "ADIF data..."
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid message ID."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Message not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def post_freedata_message_adif_log(message_id: str):
-    adif_output = DatabaseManagerMessages(app.event_manager).get_message_by_id_adif(message_id)
-    # Send the ADIF data via UDP
-    adif_udp_logger.send_adif_qso_data(app.config_manager.read(), adif_output)
-    return api_response(adif_output)
-
-@app.patch("/freedata/messages/{message_id}", summary="Update Message by ID", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Message updated successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "is_read": True
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid parameters."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "Message not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Message not found."
-                }
-            }
-        }
-    }
-})
-async def patch_freedata_message(message_id: str, request: Request):
-    """
-    Update a FreeDATA message by its ID.
-
-    Parameters:
-        message_id (str): The ID of the message to update.
-        request (Request): The HTTP request containing the update data in JSON format.
-
-    Returns:
-        dict: A JSON object containing the updated message details.
-    """
-    data = await request.json()
-
-    if data.get("action") == "retransmit":
-        result = DatabaseManagerMessages(app.event_manager).update_message(message_id, update_data={'status': 'queued'})
-        DatabaseManagerMessages(app.event_manager).increment_message_attempts(message_id)
-    else:
-        result = DatabaseManagerMessages(app.event_manager).update_message(message_id, update_data=data)
-
-    return api_response(result)
-
-
-@app.get("/freedata/messages", summary="Get All Messages", tags=["FreeDATA"], responses={
-    200: {
-        "description": "List of all messages.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "total_messages": 1,
-                    "messages": [
-                        {
-                            "id": "DXCALL-6_MYCALL-0_2024-04-12T20:39:05.302479",
-                            "timestamp": "2024-04-12T20:39:05.302479",
-                            "origin": "DXCALL-6",
-                            "via": None,
-                            "destination": "MYCALL-0",
-                            "direction": "receive",
-                            "body": "Hello !",
-                            "attachments": [],
-                            "status": "received",
-                            "priority": 10,
-                            "is_read": False,
-                            "statistics": {
-                                "total_bytes": 120,
-                                "duration": 29.76698660850525,
-                                "bytes_per_minute": 241,
-                                "time_histogram": {
-                                    "0": "2024-04-12T20:39:23.423169",
-                                    "1": "2024-04-12T20:39:30.504638",
-                                    "2": "2024-04-12T20:39:37.745075"
-                                },
-                                "snr_histogram": {
-                                    "0": -6,
-                                    "1": -6,
-                                    "2": -6
-                                },
-                                "bpm_histogram": {
-                                    "0": 198,
-                                    "1": 265,
-                                    "2": 252
-                                }
-                            }
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def get_freedata_messages(request: Request):
-    filters = {k: v for k, v in request.query_params.items() if v}
-    result = DatabaseManagerMessages(app.event_manager).get_all_messages_json(filters=filters)
-    return api_response(result)
-
-
-@app.post("/freedata/messages", summary="Transmit Message", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Message transmitted successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "destination": "XX1XXX-6",
-                    "body": "Hello FreeDATA"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    }
-})
-async def post_freedata_message(request: Request):
-    """
-    Transmit a FreeDATA message.
 
-    Parameters:
-        request (Request): The HTTP request containing the message data in JSON format.
 
-    Returns:
-        dict: A JSON object containing the transmitted message details.
-    """
-    data = await request.json()
-    await enqueue_tx_command(command_message_send.SendMessageCommand, data)
-    return api_response(data)
 
 
-
-@app.delete("/freedata/messages/{message_id}", summary="Delete Message by ID", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Message deleted successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": "DXCALL-0_MYCALL-5_2024-04-04T17:22:14.002502 deleted",
-                    "status": "success"
-                }
-            }
-        }
-    },
-    404: {
-        "description": "Message not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "message": "Message not found",
-                    "status": "failure"
-                }
-            }
-        }
-    }
-})
-async def delete_freedata_message(message_id: str):
-    result = DatabaseManagerMessages(app.event_manager).delete_message(message_id)
-    if result:
-        return api_response({"message": f"{message_id} deleted", "status": "success"})
-    else:
-        return api_response({"message": "Message not found", "status": "failure"}, status_code=404)
-
-
-@app.get("/freedata/messages/{message_id}/attachments", summary="Get Attachments by Message ID", tags=["FreeDATA"], responses={
-    200: {
-        "description": "List of attachments for the specified message.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "attachments": [
-                        {
-                            "id": "attachment1",
-                            "filename": "file1.txt",
-                            "file_size": 1024,
-                            "file_type": "text/plain",
-                            "data_sha512": "abcdef1234567890..."
-                        },
-                        {
-                            "id": "attachment2",
-                            "filename": "image.png",
-                            "file_size": 2048,
-                            "file_type": "image/png",
-                            "data_sha512": "123456abcdef7890..."
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_message_attachments(message_id: str):
-    attachments = DatabaseManagerAttachments(app.event_manager).get_attachments_by_message_id_json(message_id)
-    return api_response(attachments)
-
-
-@app.get("/freedata/messages/attachment/{data_sha512}", summary="Get Attachment by SHA512", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Retrieve a specific attachment by its SHA512 hash.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "id": "attachment1",
-                    "filename": "file1.txt",
-                    "file_size": 1024,
-                    "file_type": "text/plain",
-                    "data_sha512": "abcdef1234567890..."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested attachment was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Attachment not found."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_message_attachment(data_sha512: str):
-    attachment = DatabaseManagerAttachments(app.event_manager).get_attachment_by_sha512(data_sha512)
-    return api_response(attachment)
-
-
-@app.get("/freedata/beacons", summary="Get Received Beacons", tags=["FreeDATA"], responses={
-    200: {
-        "description": "List of received beacons.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "total_beacons": 2,
-                    "beacons": [
-                        {
-                            "id": "DXCALL-0_MYCALL-5_2024-04-04T17:22:14.002502",
-                            "timestamp": "2024-04-04T17:22:14.002502",
-                            "origin": "DXCALL-0",
-                            "via": None,
-                            "destination": "MYCALL-5",
-                            "direction": "receive",
-                            "body": "Hello FreeDATA",
-                            "attachments": [],
-                            "status": "received",
-                            "priority": 10,
-                            "is_read": False,
-                            "statistics": {
-                                "total_bytes": 120,
-                                "duration": 29.77,
-                                "bytes_per_minute": 241,
-                                "time_histogram": {
-                                    "0": "2024-04-04T17:22:23.423169",
-                                    "1": "2024-04-04T17:22:30.504638",
-                                    "2": "2024-04-04T17:22:37.745075"
-                                },
-                                "snr_histogram": {
-                                    "0": -6,
-                                    "1": -6,
-                                    "2": -6
-                                },
-                                "bpm_histogram": {
-                                    "0": 198,
-                                    "1": 265,
-                                    "2": 252
-                                }
-                            }
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid request."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_all_beacons():
-    beacons = DatabaseManagerBeacon(app.event_manager).get_all_beacons()
-    return api_response(beacons)
-
-
-@app.get("/freedata/beacons/{callsign}", summary="Get Beacon by Callsign", tags=["FreeDATA"], responses={
-    200: {
-        "description": "List of beacons from the specified callsign.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "beacons": [
-                        {
-                            "id": "DXCALL-0_MYCALL-5_2024-04-04T17:22:14.002502",
-                            "timestamp": "2024-04-04T17:22:14.002502",
-                            "origin": "DXCALL-0",
-                            "via": None,
-                            "destination": "MYCALL-5",
-                            "direction": "receive",
-                            "body": "Hello FreeDATA",
-                            "attachments": [],
-                            "status": "received",
-                            "priority": 10,
-                            "is_read": False,
-                            "statistics": {
-                                "total_bytes": 120,
-                                "duration": 29.77,
-                                "bytes_per_minute": 241,
-                                "time_histogram": {
-                                    "0": "2024-04-04T17:22:23.423169",
-                                    "1": "2024-04-04T17:22:30.504638",
-                                    "2": "2024-04-04T17:22:37.745075"
-                                },
-                                "snr_histogram": {
-                                    "0": -6,
-                                    "1": -6,
-                                    "2": -6
-                                },
-                                "bpm_histogram": {
-                                    "0": 198,
-                                    "1": 265,
-                                    "2": 252
-                                }
-                            }
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid request."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested resource was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Resource not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_beacons_by_callsign(callsign: str):
-    beacons = DatabaseManagerBeacon(app.event_manager).get_beacons_by_callsign(callsign)
-    return api_response(beacons)
-
-
-@app.get("/freedata/station/{callsign}", summary="Get Station Info", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Retrieve station information by callsign.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "callsign": "MYCALL-0",
-                    "location": "Springfield",
-                    "frequency": "14093000",
-                    "mode": "PKTUSB",
-                    "status": "active",
-                    "additional_info": "Station details here."
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid callsign parameter."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested station was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Station not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def get_station_info(callsign: str):
-    station = DatabaseManagerStations(app.event_manager).get_station(callsign)
-    return api_response(station)
-
-
-@app.post("/freedata/station/{callsign}", summary="Set Station Info", tags=["FreeDATA"], responses={
-    200: {
-        "description": "Station information updated successfully.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "callsign": "MYCALL-0",
-                    "location": "Springfield",
-                    "frequency": "14093000",
-                    "mode": "PKTUSB",
-                    "status": "active",
-                    "additional_info": "Updated station details."
-                }
-            }
-        }
-    },
-    400: {
-        "description": "Bad Request: The request was malformed or missing required parameters.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Invalid input data."
-                }
-            }
-        }
-    },
-    404: {
-        "description": "The requested station was not found.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Station not found."
-                }
-            }
-        }
-    },
-    500: {
-        "description": "Internal Server Error: An unexpected error occurred on the server.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Internal server error."
-                }
-            }
-        }
-    },
-    503: {
-        "description": "Modem not running.",
-        "content": {
-            "application/json": {
-                "example": {
-                    "error": "Modem not running."
-                }
-            }
-        }
-    }
-})
-async def set_station_info(callsign: str, request: Request):
-    data = await request.json()
-    result = DatabaseManagerStations(app.event_manager).update_station_info(callsign, new_info=data["info"])
-    return api_response(result)
-
-# WebSocket Event Handlers
-@app.websocket("/events")
-async def websocket_events(websocket: WebSocket):
-    await websocket.accept()
-    await app.wsm.handle_connection(websocket, app.wsm.events_client_list, app.modem_events)
-
-@app.websocket("/fft")
-async def websocket_fft(websocket: WebSocket):
-    await websocket.accept()
-    await app.wsm.handle_connection(websocket, app.wsm.fft_client_list, app.modem_fft)
-
-@app.websocket("/states")
-async def websocket_states(websocket: WebSocket):
-    await websocket.accept()
-    await app.wsm.handle_connection(websocket, app.wsm.states_client_list, app.state_queue)
-
 # Signal Handler
 def signal_handler(sig, frame):
     print("\n------------------------------------------")
@@ -2325,6 +190,8 @@ def main():
     signal.signal(signal.SIGINT, signal_handler)
 
     app.MODEM_VERSION = MODEM_VERSION
+    app.API_VERSION = API_VERSION
+
     config_file = set_config()
     app.config_manager = CONFIG(config_file)
     app.p2p_data_queue = queue.Queue()
@@ -2363,7 +230,6 @@ def main():
         if conf['GUI'].get('auto_run_browser', True):
             threading.Thread(target=open_browser_after_delay, args=(url, 2)).start()
 
-
     uvicorn.run(app, host=modemaddress, port=modemport, log_config=None, log_level="info")
 
 
diff --git a/freedata_server/wavelog_api_logger.py b/freedata_server/wavelog_api_logger.py
new file mode 100644
index 000000000..9d83a2245
--- /dev/null
+++ b/freedata_server/wavelog_api_logger.py
@@ -0,0 +1,49 @@
+import requests
+import re
+import structlog
+
+def send_wavelog_qso_data(config, wavelog_data):
+    """
+    Sends wavelog QSO data to the specified server via API call.
+
+    Parameters:
+    server_host:port (str)
+    server_api_key (str)
+    wavelog_data (str): wavelog-formatted ADIF QSO data.
+    """
+
+    log = structlog.get_logger()
+
+    # If False then exit the function
+    wavelog = config['QSO_LOGGING'].get('enable_adif_wavelog', 'False')
+
+    if not wavelog:
+        return  # exit as we don't want to log Wavelog
+
+    wavelog_host = config['QSO_LOGGING'].get('adif_wavelog_host', 'http://localhost/')
+    wavelog_api_key = config['QSO_LOGGING'].get('adif_wavelog_api_key', '')
+
+    # check if the last part in the HOST URL from the config is correct
+    if wavelog_host.endswith("/"):
+        url = wavelog_host + "index.php/api/qso"
+    else:
+        url = wavelog_host + "/" + "index.php/api/qso"
+
+    headers = {
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+    }
+
+    data = {
+        "key": wavelog_api_key,
+        "station_profile_id": "1",
+        "type": "adif",
+        "string": wavelog_data
+    }
+
+    try:
+        response = requests.post(url, headers=headers, json=data)
+        response.raise_for_status()  # Raise an error for bad status codes
+        log.info(f"[CHAT] Wavelog API: {wavelog_data}")
+    except requests.exceptions.RequestException as e:
+        log.warning(f"[WAVELOG ADIF API EXCEPTION]: {e}")
diff --git a/requirements.txt b/requirements.txt
index 87c3934c3..32fe5376c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ asyncio
 chardet
 colorama
 ordered-set
-nuitka<=2.4.11
+nuitka<=2.6.2
 pyinstaller
 websocket-client
 fastapi[standard]
diff --git a/tests/test_message_protocol.py b/tests/test_message_protocol.py
index 2cef6d8b0..db400f68c 100644
--- a/tests/test_message_protocol.py
+++ b/tests/test_message_protocol.py
@@ -21,7 +21,7 @@
 from data_frame_factory import DataFrameFactory
 import codec2
 import arq_session_irs
-from server import enqueue_tx_command
+from api.command_helpers import enqueue_tx_command
 import command_message_send
 
 
diff --git a/tools/Linux/README.txt b/tools/Linux/README.txt
index f40e287c0..39f6e65c9 100644
--- a/tools/Linux/README.txt
+++ b/tools/Linux/README.txt
@@ -1,5 +1,9 @@
 Suggested instructions for using the install and run scripts.
 
+Before running the install script, ensure that your account is in the
+"dialout" group, and that your account has "sudo" privileges.  Refer to 
+your particular OS variant for instructions on how to do this.
+
 To install the FreeDATA software:
 
 Open a terminal shell and run the following commands:
diff --git a/tools/Linux/install-freedata-linux.sh b/tools/Linux/install-freedata-linux.sh
index 57a4a6f15..6f9c068dd 100755
--- a/tools/Linux/install-freedata-linux.sh
+++ b/tools/Linux/install-freedata-linux.sh
@@ -3,7 +3,8 @@
 # Simple script to install FreeDATA in Linux
 # Dj Merrill - N1JOV
 #
-# Currently supports Debian [11, 12], Ubuntu [22.04, 24.04], Fedora [40,41]
+# Currently tested in Debian [11, 12], Ubuntu [22.04, 24.04], Fedora [40,41]
+# Untested additions for Linux Mint [21.3]
 # 
 # Run this script by typing in the terminal (without the quotes):
 # "bash install-freedata-linux.sh" to install from the main branch 
@@ -19,6 +20,13 @@
 #
 #
 # Changelog:
+# 2.3:	01 Feb 2025 (deej)
+# 	Add untested additions for Linux Mint 21.3
+#
+# 2.2:	01 Feb 2025 (deej)
+# 	Check if account is in the dialout group
+#	Add a warning about account needing to be in sudoers
+#
 # 2.1:	01 Feb 2025 (deej)
 # 	Add support for Fedora 41
 #
@@ -62,6 +70,15 @@
 # 1.0:	Initial release 25 Apr 2024 supporting Debian 12
 #
 
+# Account needs to be in the dialout group for some radios to work
+checkdial=`grep -i $USER /etc/group | grep -i dialout`
+
+if [ -z "$checkdial" ];
+then
+	echo "Please add your account" $USER "to the dialout group in /etc/group and then re-run this script."
+	exit 1;
+fi
+
 case $1 in
    "" | "main")
 	args="main"
@@ -86,6 +103,11 @@ echo "Running on" $osname "version" $osversion
 echo "*************************************************************************"
 echo "Installing software prerequisites"
 echo "If prompted, enter your password to run the sudo command"
+echo ""
+echo "If the sudo command gives an error saying Sorry, or not in sudoers file,"
+echo "or something to that effect, check to make sure your account has sudo"
+echo "privileges.  This generally means a listing in /etc/sudoers or in a file"
+echo "in the directory /etc/sudoers.d"
 echo "*************************************************************************"
 
 case $osname in
@@ -107,9 +129,9 @@ case $osname in
 
    ;;
 
-   "Ubuntu")
+   "Ubuntu" | "Linux Mint")
 	case $osversion in
-	   "22.04" | "24.04")
+	   "21.3" | "22.04" | "24.04")
 		sudo apt install --upgrade -y fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv wget
 	   ;;
 
diff --git a/tools/custom_mode_tests/over_the_air_mode_test.py b/tools/custom_mode_tests/over_the_air_mode_test.py
index 06c93a95d..833e022d5 100644
--- a/tools/custom_mode_tests/over_the_air_mode_test.py
+++ b/tools/custom_mode_tests/over_the_air_mode_test.py
@@ -52,18 +52,25 @@ def write_to_file(self, txbuffer, filename):
 
 # Usage example
 if __name__ == "__main__":
-    MODE = FREEDV_MODE.data_ofdm_2438
-    FRAMES = 1
 
-    freedv_instance = FreeDV(MODE, 'config.ini')
+    # geht
+    MODE = FREEDV_MODE.data_ofdm_250
+    RX_MODE = FREEDV_MODE.datac4
 
+    # fail
+    #MODE = FREEDV_MODE.datac4
+    #RX_MODE = FREEDV_MODE.data_ofdm_250
 
+    FRAMES = 1
+
+    freedv_instance = FreeDV(MODE, 'config.ini')
+    freedv_rx_instance = FreeDV(RX_MODE, 'config.ini')
 
-    message = b'A'
-    txbuffer = freedv_instance.modulator.create_burst(MODE, 1, 100, message)
+    message = b'ABC'
+    txbuffer = freedv_instance.modulator.create_burst(MODE, FRAMES, 100, message)
     freedv_instance.write_to_file(txbuffer, 'ota_audio.raw')
     txbuffer = np.frombuffer(txbuffer, dtype=np.int16)
-    freedv_instance.demodulate(txbuffer)
+    freedv_rx_instance.demodulate(txbuffer)
 
 
 # ./src/freedv_data_raw_rx --framesperburst 2 --testframes DATAC0 - /dev/null --vv
diff --git a/tools/custom_mode_tests/run_mode_tests.py b/tools/custom_mode_tests/run_mode_tests.py
new file mode 100644
index 000000000..bd5dc8a99
--- /dev/null
+++ b/tools/custom_mode_tests/run_mode_tests.py
@@ -0,0 +1,176 @@
+"""
+AI-Generated FreeDATA Mode Testing Script by DJ2LS using ChatGPT
+
+This script tests different FreeDV modes for their ability to modulate and demodulate data.
+It evaluates the following metrics:
+- Average audio volume in dB
+- Max possible audio volume in dB
+- Peak-to-Average Power Ratio (PAPR)
+- Frequency spectrum analysis using FFT
+
+The script runs predefined mode pairs in both transmission and reception directions,
+and visualizes the results in separate plots.
+"""
+
+
+import sys
+
+sys.path.append('freedata_server')
+
+import ctypes
+import threading
+import numpy as np
+import matplotlib.pyplot as plt
+import pandas as pd
+from collections import defaultdict
+from scipy.fftpack import fft
+from codec2 import open_instance, api, audio_buffer, FREEDV_MODE, resampler
+import modulator
+import config
+import helpers
+
+
+class FreeDV:
+    def __init__(self, mode, config_file):
+        self.mode = mode
+        self.config = config.CONFIG(config_file)
+        self.modulator = modulator.Modulator(self.config.read())
+        self.freedv = open_instance(self.mode.value)
+
+    def demodulate(self, txbuffer):
+        c2instance = open_instance(self.mode.value)
+        bytes_per_frame = int(api.freedv_get_bits_per_modem_frame(c2instance) / 8)
+        bytes_out = ctypes.create_string_buffer(bytes_per_frame)
+        api.freedv_set_frames_per_burst(c2instance, 1)
+        audiobuffer = audio_buffer(len(txbuffer))
+        nin = api.freedv_nin(c2instance)
+        audiobuffer.push(txbuffer)
+        threading.Event().wait(0.01)
+
+        while audiobuffer.nbuffer >= nin:
+            nbytes = api.freedv_rawdatarx(self.freedv, bytes_out, audiobuffer.buffer.ctypes)
+            rx_status = api.freedv_get_rx_status(self.freedv)
+            nin = api.freedv_nin(self.freedv)
+            audiobuffer.pop(nin)
+            if nbytes == bytes_per_frame:
+                api.freedv_set_sync(self.freedv, 0)
+                return True  # Passed
+
+        return False  # Failed
+
+    def compute_audio_metrics(self, txbuffer):
+        """Compute Average Volume in dB, Max Possible Volume, PAPR, and FFT for a given signal."""
+        # Ensure correct dtype and normalize to float range [-1, 1]
+        txbuffer = txbuffer.astype(np.float32) / 32768.0
+
+        avg_volume = np.mean(np.abs(txbuffer))
+        avg_volume_db = 20 * np.log10(avg_volume) if avg_volume > 0 else -np.inf
+        max_possible_volume_db = 20 * np.log10(1.0)  # Max possible volume when signal is fully utilized
+        max_val = np.max(np.abs(txbuffer))
+
+        # Prevent division by zero and ensure reasonable values
+        if avg_volume == 0 or max_val == 0:
+            papr = 0
+        else:
+            papr = 10 * np.log10((max_val ** 2) / (avg_volume ** 2))
+
+        # Compute FFT
+        fft_values = np.abs(fft(txbuffer))[:len(txbuffer) // 2]
+        freqs = np.fft.fftfreq(len(txbuffer), d=1 / 8000)[:len(txbuffer) // 2]  # Assuming 8 kHz sample rate
+
+        return avg_volume_db, max_possible_volume_db, papr, freqs, fft_values
+
+    def write_to_file(self, txbuffer, filename):
+        with open(filename, 'wb') as f:
+            f.write(txbuffer)
+
+
+def plot_audio_metrics(avg_volume_per_mode, avg_max_volume_per_mode, avg_papr_per_mode):
+    """Plot audio metrics in a separate window."""
+    plt.figure(figsize=(10, 5))
+    modes = list(avg_volume_per_mode.keys())
+    volume_values = list(avg_volume_per_mode.values())
+    max_volume_values = list(avg_max_volume_per_mode.values())
+    papr_values = list(avg_papr_per_mode.values())
+
+    plt.plot(modes, volume_values, marker='o', linestyle='-', label='Average Volume (dB)')
+    plt.plot(modes, max_volume_values, marker='x', linestyle='--', label='Max Possible Volume (dB)', color='blue')
+    plt.plot(modes, papr_values, marker='s', linestyle='-', label='Average PAPR (dB)', color='red')
+    plt.ylabel('Volume (dB) / PAPR (dB)')
+    plt.xlabel('Modes')
+    plt.title('Audio Metrics per Mode')
+    plt.legend()
+    plt.xticks(rotation=45, ha='right')
+    plt.pause(0.1)
+
+
+def plot_fft_per_mode(fft_data):
+    """Plot FFTs in a separate window."""
+    for mode, (freqs, fft_values) in fft_data.items():
+        plt.figure(figsize=(8, 4))
+        plt.plot(freqs, fft_values, label=f'FFT {mode}')
+        plt.xlabel('Frequency (Hz)')
+        plt.ylabel('Magnitude')
+        plt.title(f'FFT of {mode}')
+        plt.legend()
+    plt.pause(0.1)
+
+
+def plot_results_summary(results):
+    """Plot pass/fail results for each mode pair."""
+    mode_pairs = [f"{tx} -> {rx}" for tx, rx, _, _, _, _ in results]
+    pass_fail = [1 if result[2] else -1 for result in results]  # Convert True/False to 1/0
+    colors = ['green' if r == 1 else 'red' for r in pass_fail]
+
+    plt.figure(figsize=(10, 5))
+    plt.bar(mode_pairs, pass_fail, color=colors)
+    plt.ylabel('Pass (1) / Fail (0)')
+    plt.xlabel('Mode Pairs')
+    plt.title('Mode Constellation Pass/Fail Summary')
+    plt.xticks(rotation=45, ha='right')
+    plt.ylim(-1, 1)  # Ensure bars are properly visible
+    plt.show()
+
+def test_freedv_mode_pairs(mode_pairs, config_file='config.ini'):
+    results = []
+    fft_data = {}
+    volume_per_mode = {}
+    max_volume_per_mode = {}
+    papr_per_mode = {}
+
+    for tx_mode, rx_mode in mode_pairs:
+        for test_tx, test_rx in [(tx_mode, rx_mode), (rx_mode, tx_mode)]:
+            freedv_tx = FreeDV(test_tx, config_file)
+            freedv_rx = FreeDV(test_rx, config_file)
+
+            message = b'ABC'
+            txbuffer = freedv_tx.modulator.create_burst(test_tx, 1, 100, message)
+            txbuffer = np.frombuffer(txbuffer, dtype=np.int16)
+
+            result = freedv_rx.demodulate(txbuffer)
+            avg_volume_db, max_possible_volume_db, papr, freqs, fft_values = freedv_tx.compute_audio_metrics(txbuffer)
+            results.append((test_tx.name, test_rx.name, result, avg_volume_db, max_possible_volume_db, papr))
+            volume_per_mode[test_tx.name] = avg_volume_db
+            max_volume_per_mode[test_tx.name] = max_possible_volume_db
+            papr_per_mode[test_tx.name] = papr
+            fft_data[test_tx.name] = (freqs, fft_values)
+
+    return results, volume_per_mode, max_volume_per_mode, papr_per_mode, fft_data
+
+
+if __name__ == "__main__":
+    test_mode_pairs = [
+        (FREEDV_MODE.datac13, FREEDV_MODE.data_ofdm_200),
+        (FREEDV_MODE.datac14, FREEDV_MODE.datac14),
+        (FREEDV_MODE.datac4, FREEDV_MODE.data_ofdm_250),
+        (FREEDV_MODE.data_ofdm_500, FREEDV_MODE.data_ofdm_500),
+        (FREEDV_MODE.datac0, FREEDV_MODE.datac0),
+        (FREEDV_MODE.datac3, FREEDV_MODE.datac3),
+        (FREEDV_MODE.datac1, FREEDV_MODE.data_ofdm_1700),
+        (FREEDV_MODE.data_ofdm_2438, FREEDV_MODE.data_ofdm_2438),
+    ]
+    results, avg_volume_per_mode, avg_max_volume_per_mode, avg_papr_per_mode, fft_data = test_freedv_mode_pairs(
+        test_mode_pairs)
+    plot_audio_metrics(avg_volume_per_mode, avg_max_volume_per_mode, avg_papr_per_mode)
+    plot_fft_per_mode(fft_data)
+    plot_results_summary(results)
diff --git a/tools/macOS/README.md b/tools/macOS/README.md
new file mode 100644
index 000000000..bf0b8e7a9
--- /dev/null
+++ b/tools/macOS/README.md
@@ -0,0 +1,54 @@
+## FreeDATA Scripts for Apple macOS
+
+### Preface
+The installation requires an already working MacPorts or Homebrew installation on your Mac, please follow the corresponding instrutions on https://www.macports.org/install.php or https://brew.sh  
+The scripts run on Apple Silicon. It's not tested on Intel Macs.\
+I include two short instruction how to install MacPorts or Homebrew. Please install only one of them!
+
+
+#### Short MacPorts installation instructions
+Install the Apple Command Line Tools\
+Open the Terminal, you find it in the Utilities Folder inside the Applications Folder, and execute the following command:
+```
+% xcode-select --install
+```
+Download the required MacPorts version from the link above and install it as usual. (Double click the pkg and follow the instructions) 
+If you have the Terminal open, please close it completely [command+q] to make shure that the MacPorts environment is loaded.
+
+
+#### Short Homebrew installation instructions
+Install the Apple Command Line Tools\
+Open the Terminal, you find it in the Utilities Folder inside the Applications Folder, and execute the following command:
+```
+% xcode-select --install
+```
+This will take some time, depending on the speed of your mac and internet connections. After successfull installation install brew:
+```
+% /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+brew tells you at the end of the installation, to execute some commands. please don't forget them. Close the Terminal completely [command+q]\
+
+
+
+### Install FreeDATA
+Open the Terminal and execute the following commands:
+```
+% mkdir ~/freedata
+% cd ~/freedata
+% curl -o install-freedata-macos.sh https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/install-freedata-macos.sh
+% curl -o run-freedata-macos.sh https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/run-freedata-macos.sh
+
+% bash install-freedata-macos.sh
+```
+
+
+### Run FreeDATA
+As usual, open the Terminal and execute the following commands:
+```
+$ cd ~/freedata
+$ bash run-freedata-macos.sh
+```
+Your browser should open the FreeDATA webinterface. Please follow the instructions on https://wiki.freedata.app to configure FreeDATA.
+
+
+
diff --git a/tools/macOS/install-freedata-macos.sh b/tools/macOS/install-freedata-macos.sh
new file mode 100644
index 000000000..75132246f
--- /dev/null
+++ b/tools/macOS/install-freedata-macos.sh
@@ -0,0 +1,511 @@
+#!/bin/bash
+#
+# Simple script to install FreeDATA in Linux
+# Dj Merrill - N1JOV
+#
+# modified Version for macOS
+# All credits to the original creators
+# Oliver - HB9HBO
+# 
+# Run this script by typing in the terminal (without the quotes):
+# "bash install-freedata-macos.sh" to install from the main branch 
+# "bash install-freedata-macos.sh develop" to install from the develop branch
+#
+# This script creates three subdirectories in the directory it is run
+# FreeDATA: Contains the FreeDATA software
+# FreeDATA-venv: Contains the Python virtual environment
+# FreeDATA-hamlib: Contains the hamlib libraries
+#
+# FreeDATA config file is stored in $HOME/Library/Application Support/FreeDATA/config.ini
+# See the run-freedata-macos.sh for more details
+#
+#
+#
+# Changelog:
+# 2.4:	29 Jan 2025 (hb9hbo)
+#	OS version handling and further macports refinement
+#
+# 2.3:  26 Jan 2025 (vk1kcm)
+#	clean up macport install
+#
+# 2.2:	24 Jan 2025 (hb9hbo)
+#	install with brew and macports
+#
+# 2.1:	23 Jan 2025 (hb9hbo)
+#	Initial macOS version
+#
+# 2.0:	04 Oct 2024 (deej)
+# 	Add support for Fedora 40
+#
+# 1.9:	14 Sep 2024 (deej)
+# 	Tweak OS version checking section to handle minor OS revisions better
+#
+# 1.8:	23 July 2024 ( DJ2LS )
+# 	Add support for browser based gui
+#
+# 1.7:	31 May 2024 ( DJ2LS )
+# 	Add support for version specific setup
+#
+# 1.6:	22 May 2024
+#	Reflect directory name changes in prep for merging develop to main
+#
+# 1.5:	12 May 2024
+#	"dr-freedata-001" branch of codec2 merged to main so we don't
+#	need to checkout that branch specifically
+#
+# 1.4:	05 May 2024
+#	Change to "dr-freedata-001" branch of codec2 for develop mode
+#	Added comments in scripts and README.txt for config file location
+#	If hamlib 4.5.5 is already in FreeDATA-hamlib, don't reinstall
+#
+# 1.3:	02 May 2024
+#	Remove dependency on distro supplied hamlib library which can be old
+#	Download and install hamlib 4.5.5 into ./FreeDATA-hamlib
+#	Add support for Debian 11 and Ubuntu 22.04
+#
+# 1.2:	30 Apr 2024
+#	Remove dependency on distro supplied nodejs which can be too old
+#	Install nodejs version 20 into ~/.nvm
+#
+# 1.1:	26 Apr 2024
+#	Add support for installing from FreeDATA develop branch
+#	Add support for Ubuntu 24.04
+#	
+# 1.0:	Initial release 25 Apr 2024 supporting Debian 12
+#
+
+case $1 in
+   "" | "main")
+	args="main"
+   ;;
+   "develop")
+	args="develop"
+   ;;
+  v*)
+  args=$1
+  ;;
+  *)
+	echo "Argument" $1 "not valid.  Exiting."
+	exit 1
+   ;;
+esac
+
+
+
+
+#///////////////////////////////////////////////////////////////////////////////
+# find macos and version	
+# 
+osname=`sw_vers -productName`
+osversion=`sw_vers -productVersion | cut -d"." -f1`
+
+
+#////////////////////////////////////////////////////////////////////////////////
+# find installed additional Package Manager
+#	
+port=`which port`
+brew=`which brew`
+
+if [[ -x $port && -x $brew ]];
+then
+	echo "MacPorts and homebrew installed!"
+	echo "selecting MacPorts for installation"
+	pkgmgr='macports'
+	brew=''
+fi
+
+if [[ -x $port  ]];
+then
+	pkgmgr='macports'
+	pkgmgrversion=`port version | cut -d" " -f2 | awk -F. '{print $1 "." $2}'`
+elif [[ -x $brew ]];
+then
+	pkgmgr='homebrew'
+else
+	echo "Neither MacPorts nor homebrew installed"
+	echo "please install one!"
+	exit 1
+fi
+
+
+echo "Running on $osname version $osversion with $pkgmgr"
+
+
+echo "*************************************************************************"
+echo "Installing software prerequisites"
+echo "If prompted, enter your password to run the sudo command"
+echo "*************************************************************************"
+
+
+
+#////////////////////////////////////////////////////////////////////////////////
+# Variables for MacPorts install
+# we don't want break an already installed and working python3
+#
+mp_pkgs="wget cmake portaudio nvm nodejs22 npm10"
+mp_path="/opt/local/bin"
+mp_py_version="313"
+mp_pkg_python="python$mp_py_version"
+mp_pkg_pip="py$mp_py_version-pip"
+mp_pkg_virtualenv="py$mp_py_version-virtualenv"
+mp_path_python="$mp_path/python3"
+mp_path_pip="$mp_path/pip3"
+mp_path_virtualenv="$mp_path/virtualenv"
+mp_select_python=0
+mp_select_pip=0
+mp_select_virtualenv=0
+
+case $osname in
+	"macOS")
+	case $osversion in
+		"14" | "15")
+			case $pkgmgr in
+				"macports")
+
+					#////////////////////////////////////////////////////////////////////////////////
+					# update the MacPorts package cache
+					#
+					echo "Installing FreeDATA on top of MacPorts"
+					sudo port selfupdate
+
+
+					#////////////////////////////////////////////////////////////////////////////////
+					# Check for working python3 in macports
+					#
+					if [ ! -f "$mp_path_python" ] && [ ! -x "$mp_path_python" ];
+					then
+						echo "Python3 not installed, add $mp_pkg_python"
+						mp_pkgs="$mp_pkg_python $mp_pkgs"
+						mp_select_python=1
+					fi
+	
+	
+					#////////////////////////////////////////////////////////////////////////////////
+					# Check for working pip in macports
+					#
+					if [ ! -f "$mp_path_pip" ] && [ ! -x "$mp_path_pip" ];
+					then
+						echo "Python pip not installed, add $mp_pkg_pip"
+						mp_pkgs="$mp_pkg_pip $mp_pkgs"
+						mp_select_pip=1
+					fi
+	
+
+					#////////////////////////////////////////////////////////////////////////////////
+					# Check for installed virtualenv  in macports
+					#
+					if [ ! -f "$mp_path_virtualenv" ] && [ ! -x "$mp_path_virtualenv" ];
+					then
+						echo "Python pip not installed, add $mp_pkg_virtualenv"
+						mp_pkgs="$mp_pkg_virtualenv $mp_pkgs"
+						mp_select_virtualenv=1
+					fi
+	
+	
+					#////////////////////////////////////////////////////////////////////////////////
+					# install required packages
+					#
+					echo "Installing required Packages."			
+					sudo port -N install $mp_pkgs
+	
+	
+					#////////////////////////////////////////////////////////////////////////////////
+					# select python3.10 and/or pip313 as the default version, if not installed
+					#
+					if [ "$mp_select_python" -eq 1 ];
+					then
+						echo "Selecting $mp_pkg_python"
+						sudo port select --set python3 "python$mp_py_version"
+					fi
+					if [ "$mp_select_pip" -eq 1 ];
+					then
+						echo "Selecting $mp_pkg_pip"
+						sudo port select --set pip3 "pip$mp_py_version"
+					fi
+					if [ "$mp_select_virtualenv" -eq 1 ];
+					then
+						echo "Selecting $mp_pkg_virtualenv"
+						sudo port select --set virtualenv "virtualenv$mp_py_version"
+					fi
+
+					#////////////////////////////////////////////////////////////////////////////////
+					# adding macports Path to $PATH
+					#
+					if [[ ! $PATH =~ "$mp_path" ]];
+					then
+						echo "Adding $mp_path to \$PATH"
+						export PATH="$mp_path":$PATH
+					fi
+					;;
+	
+				"homebrew")
+					#/////////////////////////////////////////////////////////////////////////
+					# more testing needed
+					echo "Installing FreeDATA on top of homebrew"
+					brew update
+					brew install wget cmake portaudio python pyenv-virtualenv nvm node@22 npm
+					export PATH="/opt/homebrew/opt/node@22/bin:/opt/homebrew/bin:$PATH"
+					;;
+	
+				*)
+					echo "*************************************************************************"
+					echo "$osname $osversion $pkgmgr"
+					echo "This installation is not compatible, please install macports or homebrew"
+					echo "*************************************************************************"
+					exit 1
+			   		;;
+			esac
+			;;
+
+		*)
+			echo "*************************************************************************"
+			echo "This version of MacOS is not yet supported by this script."
+			echo $osname $osversion
+			echo "*************************************************************************"
+			exit 1
+			;;
+	esac
+	;;
+
+	*)
+		echo "*************************************************************************"
+		echo "This Operating System is not supported"
+		echo $osname $osversion
+		echo "*************************************************************************"
+		exit 1
+		;;
+
+esac
+
+
+
+#///////////////////////////////////////////////////////////////////////////////
+# find No CPU's and use half of them for compiling (make -j $ncpu)
+#
+ncpu=`sysctl hw.ncpu | awk '{print $2}'`
+ncpu=$(($ncpu / 2))
+if [ $ncpu -lt 1 ];
+then
+	ncpu=1
+fi
+
+
+
+echo "*************************************************************************"
+echo "Checking for hamlib 4.5.5 in FreeDATA-hamlib"
+echo "*************************************************************************"
+
+if [ -d "FreeDATA-hamlib.old" ];
+then
+	rm -rf FreeDATA-hamlib.old
+fi
+
+if [ -d "FreeDATA-hamlib" ];
+then
+	if [ -f "./FreeDATA-hamlib/bin/rigctl" ];
+	then
+		checkhamlibver=`./FreeDATA-hamlib/bin/rigctl --version | cut -f3 -d" "`
+		if [ "$checkhamlibver" != "4.5.5" ];
+		then
+			mv FreeDATA-hamlib FreeDATA-hamlib.old
+		else
+			echo "Hamlib 4.5.5 found, no installation needed."
+		fi
+	else
+		mv FreeDATA-hamlib FreeDATA-hamlib.old
+	fi
+fi
+
+if [ ! -d "FreeDATA-hamlib" ];
+then
+	echo "Installing hamlib 4.5.5 into FreeDATA-hamlib"
+	curdir=`pwd`
+	wget https://github.com/Hamlib/Hamlib/releases/download/4.5.5/hamlib-4.5.5.tar.gz
+	if [ -f "hamlib-4.5.5.tar.gz" ];
+	then
+		tar -xf hamlib-4.5.5.tar.gz
+	else
+		echo "Something went wrong.  hamlib-4.5.5.tar.gz not downloaded."
+		exit 1
+	fi
+	if [ -d "hamlib-4.5.5" ];
+	then
+		cd hamlib-4.5.5
+
+
+		#///////////////////////////////////////////////////////////////////////////////
+		# make sure the Libraries and Includes where found, no need for libusb
+		#
+		./configure --prefix=$curdir/FreeDATA-hamlib CPPFLAGS="-I/opt/local/include" LDFLAGS="-L/opt/local/lib/" --without-libusb
+		make -j $ncpu
+		make install
+		cd ..
+	else
+		echo "Something went wrong.  hamlib-4.5.5 directory not found."
+		exit 1
+	fi
+	if [ ! -f "$curdir/FreeDATA-hamlib/bin/rigctl" ];
+	then
+		echo "Something went wrong." $curdir"/FreeDATA.hamlib/bin/rigctl not found."
+                exit 1
+	else
+		echo "Cleaning up files from hamlib build."
+		rm -f hamlib-4.5.5.tar.gz
+		rm -rf hamlib-4.5.5
+        fi
+fi
+
+
+echo "*************************************************************************"
+echo "Checking for old FreeDATA directories"
+echo "*************************************************************************"
+if [ -d "FreeDATA.old" ];
+then
+	rm -rf FreeDATA.old
+fi
+if [ -d "FreeDATA-venv.old" ];
+then
+	rm -rf FreeDATA-venv.old
+fi
+if [ -d "FreeDATA" ];
+then
+	mv FreeDATA FreeDATA.old
+fi
+if [ -d "FreeDATA-venv" ];
+then
+	mv FreeDATA-venv FreeDATA-venv.old
+fi
+
+echo "*************************************************************************"
+echo "Creating Python Virtual Environment FreeDATA-venv"
+echo "*************************************************************************"
+python3 -m venv FreeDATA-venv
+
+echo "*************************************************************************"
+echo "Activating the Python Virtual Environment"
+echo "*************************************************************************"
+if [ -f "./FreeDATA-venv/bin/activate" ];
+then
+	source ./FreeDATA-venv/bin/activate
+else
+	echo "Something went wrong.  FreeDATA-venv virtual environment not created properly."
+	exit 1
+fi
+
+echo "*************************************************************************"
+echo "Updating pip and wheel"
+echo "*************************************************************************"
+pip3 install --upgrade pip wheel
+
+echo "*************************************************************************"
+echo "Downloading the FreeDATA software from the git repo"
+echo "*************************************************************************"
+if [ "$args" == "develop" ];
+then
+  echo "Downloading development version"
+  git clone https://github.com/DJ2LS/FreeDATA.git -b develop
+	git checkout develop
+elif [[ $args == v* ]];
+then
+    echo "Downloading specific version: $args"
+    git clone https://github.com/DJ2LS/FreeDATA.git -b $args
+else
+    echo "Downloading regular version"
+	git clone https://github.com/DJ2LS/FreeDATA.git
+fi
+
+
+echo "*************************************************************************"
+echo "Changing Directory into FreeDATA"
+echo "*************************************************************************"
+if [ -d "FreeDATA" ];
+then
+	cd FreeDATA
+else
+	echo "Something went wrong.  FreeDATA software not downloaded from git."
+	exit 1
+fi
+
+
+echo "*************************************************************************"
+echo "Installing required Python programs into the virtual environment"
+echo "*************************************************************************"
+
+#///////////////////////////////////////////////////////////////////////////////
+# Compiler can't find the Includes and Libraries
+#	
+if [ $pkgmgr == "macports" ];
+then
+	CFLAGS="-I/opt/local/include" LDFLAGS="-L/opt/local/lib" pip3 install --upgrade -r requirements.txt
+fi
+if [ $pkgmgr == "homebrew" ];
+then
+	CFLAGS="-I/opt/homebrew/include" LDFLAGS="-L/opt/homebrew/lib" pip3 install --upgrade -r requirements.txt
+fi
+
+
+echo "*************************************************************************"
+echo "Changing into the server directory"
+echo "*************************************************************************"
+cd freedata_server/lib
+
+
+echo "*************************************************************************"
+echo "Checking and removing any old codec2 libraries"
+echo "*************************************************************************"
+if [ -d "codec2" ];
+then
+	mv codec2 codec2.old
+fi
+
+echo "*************************************************************************"
+echo "Downloading the latest codec library"
+echo "*************************************************************************"
+git clone https://github.com/drowe67/codec2.git
+
+
+echo "*************************************************************************"
+echo "Changing into the codec2 library directory"
+echo "*************************************************************************"
+if [ -d "codec2" ];
+then
+	cd codec2
+else
+	echo "Something went wrong.  Codec2 software not downloaded from git."
+	exit 1
+fi
+	
+echo "*************************************************************************"
+echo "Setting up the codec2 build"
+echo "*************************************************************************"
+mkdir build_macos
+cd build_macos
+
+echo "*************************************************************************"
+echo "Building the codec2 library"
+echo "*************************************************************************"
+cmake ..
+make -j $ncpu
+
+if [ ! -f "src/libcodec2.1.2.dylib" ];
+then
+	echo "Something went wrong.  Codec2 software not built."
+	exit 1
+fi
+
+echo "*************************************************************************"
+echo "Building the FreeDATA GUI frontend"
+echo "*************************************************************************"
+cd ../../../..
+cd freedata_gui
+npm i
+npm run build
+
+# Return to the directory we started in
+cd ../..
+
+echo ""
+echo "*************************************************************************"
+echo "FreeDATA is installed, run with 'bash run-freedata-macos.sh'"
+echo "*************************************************************************"
+echo ""
diff --git a/tools/macOS/run-freedata-macos.sh b/tools/macOS/run-freedata-macos.sh
new file mode 100644
index 000000000..8026123e3
--- /dev/null
+++ b/tools/macOS/run-freedata-macos.sh
@@ -0,0 +1,183 @@
+#!/bin/bash
+#
+# Simple script to run FreeDATA in Linux
+# Dj Merrill - N1JOV
+#
+# slightly modified Version for macOS
+# All credits to the original creators
+# Oliver - HB9HBO
+#
+# Run this script in the directory that contains the "FreeDATA", 
+# "FreeDATA-venv", and "FreeDATA-hamlib" directories 
+# created by the install-freedata-linux.sh script
+#
+# Two log files are created in this directory:
+# FreeDATA-server.log: debug output from the server process
+# FreeDATA-client.log: debug output from the GUI front end
+# To view live, "tail -f FreeDATA-server.log" or "tail -f FreeDATA-client.log"
+#
+# We expect the config.ini file to be at $HOME/.config/FreeDATA/config.ini
+# If it isn't found, we copy config.ini.example there
+#
+# 2.0:	30 Jan 2025 (HB9HBO)
+#	checks if MacPorts or brew is installed
+# 1.9:	29.Jan 2025 (HB9HBO)
+#	MacOS version 
+# 1.8:  22 May 2024 (DJ2LS)
+#	add support for browser based gui
+# 1.7:  22 May 2024
+#	Slightly change the way we shutdown the server
+# 1.6:  05 May 2024
+#	Don't stop rigctld if it was started separate from FreeDATA
+#	We only want to clean up FreeDATA initiated processes
+# 1.5:  05 May 2024
+#	Check for rigctld at exit and stop it if needed
+# 1.4:  05 May 2024
+#	Added comments on how to view log outputs in realtime
+# 1.3:  02 May 2024
+#	Add support for hamlib installed by FreeDATA install script
+# 1.2:  30 Apr 2024
+# 1.1:  26 Apr 2024
+# 1.0:	25 Apr 2024 Initial release
+#
+
+
+#///////////////////////////////////////////////////////////////
+# verify installation of a pakage manager
+
+port=`which port`
+brew=`which brew`
+
+if [ ! -x "$port" ] && [ ! -x "$brew" ];
+then
+	echo "Macports or Homebrew not found in PATH!"
+	echo "Maybe you forgot adding the search path to your .bashrc or .zprofile?"
+	echo "Or try a logout/login, so the ENV Variables would setup correctly "
+	exit 1
+fi
+
+
+
+# Set path to find our hamlib install
+export PATH=./FreeDATA-hamlib/bin:$PATH
+export LD_LIBRARY_PATH=./FreeDATA-hamlib/lib:$LD_LIBRARY_PATH
+
+if [ ! -f "FreeDATA-hamlib/bin/rigctl" ];
+then
+	echo "Something went wrong.  FreeDATA-hamlib/bin/rigctl not found."
+	exit 1
+fi
+
+# Activate the Python Virtual Environment
+source ./FreeDATA-venv/bin/activate
+
+# Check to see if there is an old server running, and stop it if there is
+checkoldserver=`ps auxw | grep FreeDATA | grep server.py`
+
+if [ ! -z "$checkoldserver" ];
+then
+	oldserverpid=`echo $checkoldserver | cut -d" " -f2`
+	echo "*************************************************************************"
+	echo "Found old FreeDATA server at PID" $oldserverpid "- stopping it"
+	echo "*************************************************************************"
+	kill $oldserverpid
+	sleep 7
+fi
+
+# Check for an already running rigctld process
+# This was probably started by other means so we should leave this 
+# alone when we exit
+checkrigexist=`ps auxw | grep -i rigctld | grep -v grep`
+
+echo "*************************************************************************"
+echo "Running the FreeDATA server component"
+echo "*************************************************************************"
+
+# New versions use freedata_server, old version use modem
+if [ -d "FreeDATA/freedata_server" ];
+then
+	serverdir="FreeDATA/freedata_server"
+else
+	serverdir="FreeDATA/modem"
+fi
+
+
+#////////////////////////////////////////////////////////////////
+#	Changes for macOS
+#	Put the config and DB-file on a macOS like location
+#
+if [ ! -d $HOME/Library/Application\ Support/FreeDATA ];
+then
+	mkdir -p $HOME/Library/Application\ Support/FreeDATA
+fi
+if [ ! -f $HOME/Library/Application\ Support/FreeDATA/config.ini ];
+then
+	echo "*************************************************************************"
+	echo "No config file found.  Copying example config file to"
+	echo $HOME/Library/Application\ Support/FreeDATA/config.ini
+	echo "*************************************************************************"
+
+	cp $serverdir/config.ini.example $HOME/Library/Application\ Support/FreeDATA/config.ini
+
+
+	#////////////////////////////////////////////////////////////////
+	# Change the Server Port, macOS uses TCP 5000 for AirPlay
+	#
+	sed -i'' -e 's/modemport = 5000/modemport = 5050/' $HOME/Library/Application\ Support/FreeDATA/config.ini
+
+fi
+
+
+#////////////////////////////////////////////////////////////////
+#	Config and DB-File macOS like
+#
+FREEDATA_CONFIG=$HOME/Library/Application\ Support/FreeDATA/config.ini FREEDATA_DATABASE=$HOME/Library/Application\ Support/FreeDATA/freedata-messages.db python3 $serverdir/server.py > FreeDATA-server.log 2>&1 &
+serverpid=$!
+echo "Process ID of FreeDATA server is" $serverpid
+
+
+
+# Function to handle Ctrl-C
+function ctrl_c() {
+    echo "*************************************************************************"
+    echo "Stopping the server component"
+    echo "*************************************************************************"
+    kill -INT $serverpid
+
+	#################################################################
+	# 	macOS Change 5s to 5, doesn't like s
+    # Give time for the server to clean up rigctld if needed
+    sleep 5
+
+    # If rigctld was already running before starting FreeDATA, leave it alone
+    # otherwise we should clean it up
+    if [ -z "$checkrigexist" ]; then
+        # rigctld was started by FreeDATA and should have stopped when the
+        # server exited.  If it didn't, stop it now.
+        checkrigctld=$(ps auxw | grep -i rigctld | grep -v grep)
+        if [ ! -z "$checkrigctld" ]; then
+            echo "*************************************************************************"
+            echo "Stopping rigctld"
+            echo "*************************************************************************"
+            rigpid=$(echo $checkrigctld | awk '{print $2}')
+            kill $rigpid
+        fi
+    fi
+
+    # Return to the directory we started in
+    cd ..
+
+    # Exit the script
+    exit 0
+}
+
+
+# Trap Ctrl-C (SIGINT) and call the ctrl_c function
+trap ctrl_c SIGINT
+
+# Wait indefinitely for Ctrl-C
+echo "Server started with PID $serverpid. Press Ctrl-C to stop."
+while true; do
+    sleep 1
+done
+