diff --git a/Firmware/Dockerfile b/Firmware/Dockerfile
index f38806360..8d9f2ad93 100644
--- a/Firmware/Dockerfile
+++ b/Firmware/Dockerfile
@@ -76,12 +76,12 @@ RUN arduino-cli lib install "SparkFun MAX1704x Fuel Gauge Arduino Library"@1.0.4
 RUN arduino-cli lib install "SparkFun u-blox GNSS v3"@3.1.10
 RUN arduino-cli lib install "SparkFun Qwiic OLED Arduino Library"@1.0.13
 RUN arduino-cli lib install SSLClientESP32@2.0.0
-RUN arduino-cli lib install "SparkFun Extensible Message Parser"@1.0.4
+RUN arduino-cli lib install "SparkFun Extensible Message Parser"@1.0.6
 RUN arduino-cli lib install "SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0
 RUN arduino-cli lib install "ArduinoMqttClient"@0.1.8
 RUN arduino-cli lib install "SparkFun u-blox PointPerfect Library"@1.11.4
 RUN arduino-cli lib install "SparkFun IM19 IMU Arduino Library"@1.0.1
-RUN arduino-cli lib install "SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.9
+RUN arduino-cli lib install "SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.10
 RUN arduino-cli lib install "SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.8
 RUN arduino-cli lib install "SparkFun I2C Expander Arduino Library"@1.0.1
 RUN arduino-cli lib install "SparkFun Apple Accessory Arduino Library"@3.0.9
diff --git a/Firmware/RTK_Everywhere/AP-Config/index.html b/Firmware/RTK_Everywhere/AP-Config/index.html
index c16fc0aaa..bc9b2d930 100644
--- a/Firmware/RTK_Everywhere/AP-Config/index.html
+++ b/Firmware/RTK_Everywhere/AP-Config/index.html
@@ -903,6 +903,11 @@
                         <div class="collapse" id="ntripServerConfig0">
                             <div class="card card-body" style="margin-top:5px;">
 
+                                <div class="form-check mt-3 mb-2 box-margin20">
+                                    <label class="form-check-label" for="ntripServerCasterEnabled_0">Enable</label>
+                                    <input class="form-check-input" type="checkbox" value="" id="ntripServerCasterEnabled_0">
+                                </div>
+
                                 <div class="form-group row">
                                     <label for="ntripServerCasterHost_0"
                                         class="box-margin20 col-sm-3 col-5 col-form-label">Caster
@@ -976,6 +981,11 @@
                         <div class="collapse" id="ntripServerConfig1">
                             <div class="card card-body" style="margin-top:5px;">
 
+                                <div class="form-check mt-3 mb-2 box-margin20">
+                                    <label class="form-check-label" for="ntripServerCasterEnabled_1">Enable</label>
+                                    <input class="form-check-input" type="checkbox" value="" id="ntripServerCasterEnabled_1">
+                                </div>
+
                                 <div class="form-group row">
                                     <label for="ntripServerCasterHost_1"
                                         class="box-margin20 col-sm-3 col-5 col-form-label">Caster
@@ -1049,6 +1059,11 @@
                         <div class="collapse" id="ntripServerConfig2">
                             <div class="card card-body" style="margin-top:5px;">
 
+                                <div class="form-check mt-3 mb-2 box-margin20">
+                                    <label class="form-check-label" for="ntripServerCasterEnabled_2">Enable</label>
+                                    <input class="form-check-input" type="checkbox" value="" id="ntripServerCasterEnabled_2">
+                                </div>
+
                                 <div class="form-group row">
                                     <label for="ntripServerCasterHost_2"
                                         class="box-margin20 col-sm-3 col-5 col-form-label">Caster
@@ -1122,6 +1137,11 @@
                         <div class="collapse" id="ntripServerConfig3">
                             <div class="card card-body" style="margin-top:5px;">
 
+                                <div class="form-check mt-3 mb-2 box-margin20">
+                                    <label class="form-check-label" for="ntripServerCasterEnabled_3">Enable</label>
+                                    <input class="form-check-input" type="checkbox" value="" id="ntripServerCasterEnabled_3">
+                                </div>
+
                                 <div class="form-group row">
                                     <label for="ntripServerCasterHost_3"
                                         class="box-margin20 col-sm-3 col-5 col-form-label">Caster
diff --git a/Firmware/RTK_Everywhere/AP-Config/src/main.js b/Firmware/RTK_Everywhere/AP-Config/src/main.js
index f373f1ce5..9ddea0251 100644
--- a/Firmware/RTK_Everywhere/AP-Config/src/main.js
+++ b/Firmware/RTK_Everywhere/AP-Config/src/main.js
@@ -661,6 +661,16 @@ function parseIncoming(msg) {
             ge("antennaHeight_m").value = val / 1000.0;
         }
 
+        //enableExtCorrRadio should be bool but is sent as uint8_t because it _could_ be 254
+        else if (id.includes("enableExtCorrRadio")) {
+            if (val == 0) {
+                ge(id).checked = false;
+            }
+            else {
+                ge(id).checked = true;
+            }
+        }
+
         //Check boxes / radio buttons
         else if (val == "true") {
             try {
diff --git a/Firmware/RTK_Everywhere/Base.ino b/Firmware/RTK_Everywhere/Base.ino
index bc86bbf3b..c2e04b1d2 100644
--- a/Firmware/RTK_Everywhere/Base.ino
+++ b/Firmware/RTK_Everywhere/Base.ino
@@ -2,21 +2,125 @@
 Base.ino
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-// This function gets called when an RTCM packet passes parser check in processUart1Message() task
-// Pass data along to NTRIP Server, or ESP-NOW radio
-void processRTCM(uint8_t *rtcmData, uint16_t dataLength)
+// Enough storage for two rounds of RTCM 1074,1084,1094,1124,1005
+// To help prevent the "no increase in file size" and "due to lack of RTCM" glitch:
+// RTCM is stored in PSRAM by the processUart1Message task and written by sendRTCMToConsumers
+const uint8_t rtcmConsumerBufferEntries = 16;
+const uint16_t rtcmConsumerBufferEntrySize = 1032; // RTCM can be up to 1024 + 6 bytes
+uint16_t rtcmConsumerBufferLengths[rtcmConsumerBufferEntries];
+volatile uint8_t rtcmConsumerBufferHead;
+volatile uint8_t rtcmConsumerBufferTail;
+uint8_t *rtcmConsumerBufferPtr = nullptr;
+
+//----------------------------------------
+// Allocate and initialize the rtcmConsumerBuffer
+//----------------------------------------
+bool rtcmConsumerBufferAllocated()
 {
-    // Give this byte to the various possible transmission methods
-    for (int x = 0; x < dataLength; x++)
+    if (rtcmConsumerBufferPtr == nullptr)
     {
-        for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
-            ntripServerProcessRTCM(serverIndex, rtcmData[x]);
+        rtcmConsumerBufferPtr = (uint8_t *)rtkMalloc(
+            (size_t)rtcmConsumerBufferEntrySize * (size_t)rtcmConsumerBufferEntries,
+            "ntripBuffer");
+        for (uint8_t i = 0; i < rtcmConsumerBufferEntries; i++)
+            rtcmConsumerBufferLengths[i] = 0;
+        rtcmConsumerBufferHead = 0;
+        rtcmConsumerBufferTail = 0;
+    }
+    if (rtcmConsumerBufferPtr == nullptr)
+    {
+        systemPrintln("rtcmConsumerBuffer malloc failed!");
+        return false;
     }
 
-    for (int x = 0; x < dataLength; x++)
-        espNowProcessRTCM(rtcmData[x]);
+    return true;
+}
 
-    loraProcessRTCM(rtcmData, dataLength);
+//----------------------------------------
+// Check how many RTCM buffers contain data
+//----------------------------------------
+uint8_t rtcmBuffersInUse()
+{
+    if (!rtcmConsumerBufferAllocated())
+        return 0;
+
+    uint8_t buffersInUse = rtcmConsumerBufferHead - rtcmConsumerBufferTail;
+    if (buffersInUse >= rtcmConsumerBufferEntries) // Wrap if Tail is > Head
+        buffersInUse += rtcmConsumerBufferEntries;
+    return buffersInUse;
+}
+
+//----------------------------------------
+// Check if any RTCM data is available
+//----------------------------------------
+bool rtcmDataAvailable()
+{
+    return (rtcmBuffersInUse() > 0);
+}
+
+//----------------------------------------
+// Store each RTCM message in a PSRAM buffer
+// This function gets called as each complete RTCM message comes in
+// The messages are written to the servers by sendRTCMToConsumers
+//----------------------------------------
+void storeRTCMForConsumers(uint8_t *rtcmData, uint16_t dataLength)
+{
+    if (!rtcmConsumerBufferAllocated())
+        return;
+
+    // Check if a buffer is available
+    if (rtcmBuffersInUse() < (rtcmConsumerBufferEntries - 1))
+    {
+        uint8_t *dest = rtcmConsumerBufferPtr;
+        dest += (size_t)rtcmConsumerBufferEntrySize * (size_t)rtcmConsumerBufferHead;
+        memcpy(dest, rtcmData, dataLength); // Store the RTCM
+        rtcmConsumerBufferLengths[rtcmConsumerBufferHead] = dataLength; // Store the length
+        rtcmConsumerBufferHead = rtcmConsumerBufferHead + 1; // Increment the Head
+        rtcmConsumerBufferHead = rtcmConsumerBufferHead % rtcmConsumerBufferEntries; // Wrap
+    }
+    else
+    {
+        if (settings.debugNtripServerRtcm && (!inMainMenu))
+            systemPrintln("rtcmConsumerBuffer full. RTCM lost");
+    }
+}
+
+//----------------------------------------
+// Send the stored RTCM to consumers: ntripServer, LoRa and ESP-NOW
+//----------------------------------------
+void sendRTCMToConsumers()
+{
+    if (!rtcmConsumerBufferAllocated())
+        return;
+
+    while (rtcmConsumerBufferHead != rtcmConsumerBufferTail)
+    {
+        uint8_t *dest = rtcmConsumerBufferPtr;
+        dest += (size_t)rtcmConsumerBufferEntrySize * (size_t)rtcmConsumerBufferTail;
+
+        // NTRIP Server
+        for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
+            ntripServerSendRTCM(serverIndex, dest, rtcmConsumerBufferLengths[rtcmConsumerBufferTail]);
+
+        // LoRa
+        loraProcessRTCM(dest, rtcmConsumerBufferLengths[rtcmConsumerBufferTail]);
+
+        // ESP-NOW
+        for (uint16_t x = 0; x < rtcmConsumerBufferLengths[rtcmConsumerBufferTail]; x++)
+            espNowProcessRTCM(dest[x]);
+
+        rtcmConsumerBufferTail = rtcmConsumerBufferTail + 1; // Increment the Tail
+        rtcmConsumerBufferTail = rtcmConsumerBufferTail % rtcmConsumerBufferEntries; // Wrap
+    }
+}
+
+//----------------------------------------
+// Store data ready to be passed along to NTRIP Server, or ESP-NOW radio
+// This function gets called when an RTCM packet passes parser check in processUart1Message() task
+//----------------------------------------
+void processRTCM(uint8_t *rtcmData, uint16_t dataLength)
+{
+    storeRTCMForConsumers(rtcmData, dataLength);
 
     rtcmLastPacketSent = millis();
     rtcmPacketsSent++;
diff --git a/Firmware/RTK_Everywhere/Begin.ino b/Firmware/RTK_Everywhere/Begin.ino
index b5b2d0b2b..a2ec06b0f 100644
--- a/Firmware/RTK_Everywhere/Begin.ino
+++ b/Firmware/RTK_Everywhere/Begin.ino
@@ -357,6 +357,7 @@ void beginBoard()
         pin_modeButton = 0;
         // 24, D2  : Status LED
         pin_baseStatusLED = 2;
+        //pin_debug = 2; // On EVK we can use the Status LED for debug
         // 29, D5  : GNSS TP via 74LVC4066 switch
         pin_GNSS_TimePulse = 5;
         // 14, D12 : I2C1 SDA via 74LVC4066 switch
@@ -421,6 +422,10 @@ void beginBoard()
         pinMode(pin_baseStatusLED, OUTPUT);
         baseStatusLedOff();
 
+        DMW_if systemPrintf("pin_debug: %d\r\n", pin_debug);
+        pinMode(pin_debug, OUTPUT);
+        pinDebugOff();
+
         DMW_if systemPrintf("pin_Cellular_Network_Indicator: %d\r\n", pin_Cellular_Network_Indicator);
         pinMode(pin_Cellular_Network_Indicator, INPUT);
 
diff --git a/Firmware/RTK_Everywhere/Bluetooth.ino b/Firmware/RTK_Everywhere/Bluetooth.ino
index 26134b983..88f9fe0b0 100644
--- a/Firmware/RTK_Everywhere/Bluetooth.ino
+++ b/Firmware/RTK_Everywhere/Bluetooth.ino
@@ -742,13 +742,13 @@ void bluetoothStop()
         {
             bluetoothSerialBle->flush();      // Complete any transfers
             bluetoothSerialBle->disconnect(); // Drop any clients
-            bluetoothSerialBle->end();        // Release resources
+            //bluetoothSerialBle->end();        // Release resources : causes FreeRTOS Task "BLEFlushTask_" should not return, Aborting now!
             //delete bluetoothSerialBle;
             //bluetoothSerialBle = nullptr;
 
             bluetoothSerialBleCommands->flush();      // Complete any transfers
             bluetoothSerialBleCommands->disconnect(); // Drop any clients
-            bluetoothSerialBleCommands->end();        // Release resources
+            //bluetoothSerialBleCommands->end();        // Release resources : causes FreeRTOS Task "BLEFlushTask_" should not return, Aborting now!
             //delete bluetoothSerialBleCommands;
             //bluetoothSerialBleCommands = nullptr;
 
@@ -776,13 +776,13 @@ void bluetoothStop()
         {
             bluetoothSerialBle->flush();      // Complete any transfers
             bluetoothSerialBle->disconnect(); // Drop any clients
-            bluetoothSerialBle->end();        // Release resources
+            //bluetoothSerialBle->end();        // Release resources : FreeRTOS Task "BLEFlushTask_" should not return, Aborting now!
             //delete bluetoothSerialBle;
             //bluetoothSerialBle = nullptr;
 
             bluetoothSerialBleCommands->flush();      // Complete any transfers
             bluetoothSerialBleCommands->disconnect(); // Drop any clients
-            bluetoothSerialBleCommands->end();        // Release resources
+            //bluetoothSerialBleCommands->end();        // Release resources : FreeRTOS Task "BLEFlushTask_" should not return, Aborting now!
             //delete bluetoothSerialBleCommands;
             //bluetoothSerialBleCommands = nullptr;
 
diff --git a/Firmware/RTK_Everywhere/Developer.ino b/Firmware/RTK_Everywhere/Developer.ino
index d10c41f16..e2a60abba 100644
--- a/Firmware/RTK_Everywhere/Developer.ino
+++ b/Firmware/RTK_Everywhere/Developer.ino
@@ -238,10 +238,11 @@ void ntripClientSettingsChanged() {}
 #ifndef COMPILE_NTRIP_SERVER
 bool ntripServerIsCasting(int serverIndex) {return false;}
 void ntripServerPrintStatus(int serverIndex) {systemPrintf("**NTRIP Server %d not compiled**\r\n", serverIndex);}
-void ntripServerProcessRTCM(int serverIndex, uint8_t incoming) {}
+void ntripServerSendRTCM(int serverIndex, uint8_t *rtcmData, uint16_t dataLength) {}
 void ntripServerStop(int serverIndex, bool shutdown) {online.ntripServer[serverIndex] = false;}
 void ntripServerUpdate() {}
 void ntripServerValidateTables() {}
+void ntripServerSettingsChanged(int serverIndex) {}
 #endif   // COMPILE_NTRIP_SERVER
 
 //----------------------------------------
diff --git a/Firmware/RTK_Everywhere/Display.ino b/Firmware/RTK_Everywhere/Display.ino
index 445827fb3..6544278c6 100644
--- a/Firmware/RTK_Everywhere/Display.ino
+++ b/Firmware/RTK_Everywhere/Display.ino
@@ -346,6 +346,7 @@ void displayUpdate()
                 break;
 
             case (STATE_BASE_CASTER_NOT_STARTED):
+            case (STATE_BASE_ASSIST_NOT_STARTED):
             case (STATE_BASE_NOT_STARTED):
             case (STATE_BASE_CONFIG_WAIT):
                 displayBaseStart(0); // Show 'Base' while the system configures the Base
@@ -1281,6 +1282,7 @@ void setModeIcon(std::vector<iconPropertyBlinking> *iconList)
         break;
 
     case (STATE_BASE_CASTER_NOT_STARTED):
+    case (STATE_BASE_ASSIST_NOT_STARTED):
     case (STATE_BASE_NOT_STARTED):
     case (STATE_BASE_CONFIG_WAIT):
         // Do nothing. Static display shown during state change.
diff --git a/Firmware/RTK_Everywhere/GNSS.h b/Firmware/RTK_Everywhere/GNSS.h
index 4bf005b47..2e6bd10e5 100644
--- a/Firmware/RTK_Everywhere/GNSS.h
+++ b/Firmware/RTK_Everywhere/GNSS.h
@@ -21,7 +21,8 @@ typedef enum
 class GNSS
 {
   protected:
-    float _altitude;           // Altitude in meters
+    double _altitude;           // Altitude in meters
+    double _geoidalSeparation; // Geoidal separation in meters
     float _horizontalAccuracy; // Horizontal position accuracy in meters
     double _latitude;          // Latitude in degrees
     double _longitude;         // Longitude in degrees
@@ -166,6 +167,9 @@ class GNSS
     // Returns the fix type or zero if not online
     virtual uint8_t getFixType();
 
+    // Returns the geoidal separation
+    virtual double getGeoidalSeparation();
+
     // Returns the hours of 24 hour clock or zero if not online
     virtual uint8_t getHour();
 
diff --git a/Firmware/RTK_Everywhere/GNSS_LG290P.h b/Firmware/RTK_Everywhere/GNSS_LG290P.h
index 1a3f7b33e..c32838136 100644
--- a/Firmware/RTK_Everywhere/GNSS_LG290P.h
+++ b/Firmware/RTK_Everywhere/GNSS_LG290P.h
@@ -230,6 +230,9 @@ class GNSS_LG290P : GNSS
     // Returns the fix type or zero if not online
     uint8_t getFixType();
 
+    // Returns the geoidal separation
+    double getGeoidalSeparation();
+
     // Returns the hours of 24 hour clock or zero if not online
     uint8_t getHour();
 
diff --git a/Firmware/RTK_Everywhere/GNSS_LG290P.ino b/Firmware/RTK_Everywhere/GNSS_LG290P.ino
index 198076cf0..5a06ca820 100644
--- a/Firmware/RTK_Everywhere/GNSS_LG290P.ino
+++ b/Firmware/RTK_Everywhere/GNSS_LG290P.ino
@@ -593,7 +593,10 @@ uint8_t GNSS_LG290P::getActiveRtcmMessageCount()
 double GNSS_LG290P::getAltitude()
 {
     if (online.gnss)
-        return (_lg290p->getAltitude());
+        // See issue #809
+        // getAltitude returns the Altitude above mean sea level (meters)
+        // For Height above Ellipsoid, we need to add the the geoidalSeparation
+        return (_lg290p->getAltitude() + _lg290p->getGeoidalSeparation());
     return (0);
 }
 
@@ -829,6 +832,16 @@ uint8_t GNSS_LG290P::getFixType()
     return 0;
 }
 
+//----------------------------------------
+// Returns the geoidal separation in meters or zero if the GNSS is offline
+//----------------------------------------
+double GNSS_LG290P::getGeoidalSeparation()
+{
+    if (online.gnss)
+        return (_lg290p->getGeoidalSeparation());
+    return (0);
+}
+
 //----------------------------------------
 // Get the horizontal position accuracy
 // Returns the horizontal position accuracy or zero if offline
diff --git a/Firmware/RTK_Everywhere/GNSS_Mosaic.h b/Firmware/RTK_Everywhere/GNSS_Mosaic.h
index 705cd8c39..92f938aec 100644
--- a/Firmware/RTK_Everywhere/GNSS_Mosaic.h
+++ b/Firmware/RTK_Everywhere/GNSS_Mosaic.h
@@ -699,6 +699,9 @@ class GNSS_MOSAIC : GNSS
     // Returns the fix type or zero if not online
     uint8_t getFixType();
 
+    // Returns the geoidal separation
+    double getGeoidalSeparation();
+
     // Returns the hours of 24 hour clock or zero if not online
     uint8_t getHour();
 
diff --git a/Firmware/RTK_Everywhere/GNSS_Mosaic.ino b/Firmware/RTK_Everywhere/GNSS_Mosaic.ino
index b222bd355..498a7a8c8 100644
--- a/Firmware/RTK_Everywhere/GNSS_Mosaic.ino
+++ b/Firmware/RTK_Everywhere/GNSS_Mosaic.ino
@@ -855,6 +855,8 @@ uint8_t GNSS_MOSAIC::getActiveMessageCount()
 //----------------------------------------
 double GNSS_MOSAIC::getAltitude()
 {
+    // _altitude contains the Ellipsoidal height (meters) from SBF Block 4007
+    // We don't need to adjust for the Geoidal Separation (Undulation)
     return _altitude;
 }
 
@@ -952,6 +954,14 @@ uint8_t GNSS_MOSAIC::getFixType()
     return _fixType;
 }
 
+//----------------------------------------
+// Returns the geoidal separation in meters or zero if the GNSS is offline
+//----------------------------------------
+double GNSS_MOSAIC::getGeoidalSeparation()
+{
+    return _geoidalSeparation;
+}
+
 //----------------------------------------
 // Returns the hours of 24 hour clock or zero if not online
 //----------------------------------------
@@ -2527,7 +2537,8 @@ void GNSS_MOSAIC::storeBlock4007(SEMP_PARSE_STATE *parse)
 {
     _latitude = sempSbfGetF8(parse, 16) * 180.0 / PI; // Convert from radians to degrees
     _longitude = sempSbfGetF8(parse, 24) * 180.0 / PI;
-    _altitude = (float)sempSbfGetF8(parse, 32);
+    _altitude = sempSbfGetF8(parse, 32); // Ellipsoidal height
+    _geoidalSeparation = (double)sempSbfGetF4(parse, 40); // Geoid undulation
     _horizontalAccuracy = ((float)sempSbfGetU2(parse, 90)) / 100.0; // Convert from cm to m
 
     // NrSV is the total number of satellites used in the PVT computation.
diff --git a/Firmware/RTK_Everywhere/GNSS_None.h b/Firmware/RTK_Everywhere/GNSS_None.h
index d56b09a98..e3245e3a7 100644
--- a/Firmware/RTK_Everywhere/GNSS_None.h
+++ b/Firmware/RTK_Everywhere/GNSS_None.h
@@ -234,6 +234,14 @@ class GNSS_None : public GNSS
         return _fixType;
     }
 
+    // Get the geoidal separation
+    // Outputs:
+    //   Returns the geoidal separation in meters or zero if the GNSS is offline
+    double getGeoidalSeparation()
+    {
+        return _geoidalSeparation;
+    }
+
     // Returns the hours of 24 hour clock or zero if not online
     uint8_t getHour()
     {
diff --git a/Firmware/RTK_Everywhere/GNSS_UM980.h b/Firmware/RTK_Everywhere/GNSS_UM980.h
index a337cf818..c09b4f5db 100644
--- a/Firmware/RTK_Everywhere/GNSS_UM980.h
+++ b/Firmware/RTK_Everywhere/GNSS_UM980.h
@@ -241,6 +241,9 @@ class GNSS_UM980 : GNSS
     // Returns the fix type or zero if not online
     uint8_t getFixType();
 
+    // Returns the geoidal separation
+    double getGeoidalSeparation();
+
     // Returns the hours of 24 hour clock or zero if not online
     uint8_t getHour();
 
diff --git a/Firmware/RTK_Everywhere/GNSS_UM980.ino b/Firmware/RTK_Everywhere/GNSS_UM980.ino
index 170956fca..af27b3442 100644
--- a/Firmware/RTK_Everywhere/GNSS_UM980.ino
+++ b/Firmware/RTK_Everywhere/GNSS_UM980.ino
@@ -510,7 +510,10 @@ uint8_t GNSS_UM980::getActiveRtcmMessageCount()
 double GNSS_UM980::getAltitude()
 {
     if (online.gnss)
-        return (_um980->getAltitude());
+        // See issue #809
+        // getAltitude returns the Height above mean sea level (meters) from BESTNAVB
+        // For Height above Ellipsoid, we need to add the the geoidalSeparation
+        return (_um980->getAltitude() + _um980->getGeoidalSeparation());
     return (0);
 }
 
@@ -586,6 +589,16 @@ uint8_t GNSS_UM980::getFixType()
     return 0;
 }
 
+//----------------------------------------
+// Returns the geoidal separation in meters or zero if the GNSS is offline
+//----------------------------------------
+double GNSS_UM980::getGeoidalSeparation()
+{
+    if (online.gnss)
+        return (_um980->getGeoidalSeparation());
+    return (0);
+}
+
 //----------------------------------------
 // Get the horizontal position accuracy
 // Returns the horizontal position accuracy or zero if offline
diff --git a/Firmware/RTK_Everywhere/GNSS_ZED.h b/Firmware/RTK_Everywhere/GNSS_ZED.h
index 3faa79850..ce6a01452 100644
--- a/Firmware/RTK_Everywhere/GNSS_ZED.h
+++ b/Firmware/RTK_Everywhere/GNSS_ZED.h
@@ -491,6 +491,9 @@ class GNSS_ZED : GNSS
     // Returns the fix type or zero if not online
     uint8_t getFixType();
 
+    // Returns the geoidal separation
+    double getGeoidalSeparation();
+
     // Returns the hours of 24 hour clock or zero if not online
     uint8_t getHour();
 
diff --git a/Firmware/RTK_Everywhere/GNSS_ZED.ino b/Firmware/RTK_Everywhere/GNSS_ZED.ino
index 514ae073f..dd35c46a6 100644
--- a/Firmware/RTK_Everywhere/GNSS_ZED.ino
+++ b/Firmware/RTK_Everywhere/GNSS_ZED.ino
@@ -892,6 +892,8 @@ uint8_t GNSS_ZED::getActiveRtcmMessageCount()
 //----------------------------------------
 double GNSS_ZED::getAltitude()
 {
+    // _altitude contains the Height above ellipsoid from NAV-PVT height
+    // We don't need to adjust for the Geoidal Separation (Undulation)
     return _altitude;
 }
 
@@ -936,6 +938,14 @@ uint8_t GNSS_ZED::getFixType()
     return (_fixType);
 }
 
+//----------------------------------------
+// Returns the geoidal separation in meters or zero if the GNSS is offline
+//----------------------------------------
+double GNSS_ZED::getGeoidalSeparation()
+{
+    return _geoidalSeparation;
+}
+
 //----------------------------------------
 // Get the horizontal position accuracy
 // Returns the horizontal position accuracy or zero if offline
@@ -2542,7 +2552,8 @@ void storePVTdata(UBX_NAV_PVT_data_t *ubxDataStruct)
 //----------------------------------------
 void GNSS_ZED::storePVTdataRadio(UBX_NAV_PVT_data_t *ubxDataStruct)
 {
-    _altitude = ubxDataStruct->height / 1000.0;
+    _altitude = (double)ubxDataStruct->height / 1000.0; // Height above ellipsoid in mm
+    _geoidalSeparation = (double)(ubxDataStruct->height - ubxDataStruct->hMSL) / 1000.0;
 
     _day = ubxDataStruct->day;
     _month = ubxDataStruct->month;
diff --git a/Firmware/RTK_Everywhere/LED.ino b/Firmware/RTK_Everywhere/LED.ino
index 2800611cf..042538944 100644
--- a/Firmware/RTK_Everywhere/LED.ino
+++ b/Firmware/RTK_Everywhere/LED.ino
@@ -50,6 +50,18 @@ void baseStatusLedOff()
         digitalWrite(pin_baseStatusLED, LOW);
 }
 
+void pinDebugOn()
+{
+    if (pin_debug != PIN_UNDEFINED)
+        digitalWrite(pin_debug, HIGH);
+}
+
+void pinDebugOff()
+{
+    if (pin_debug != PIN_UNDEFINED)
+        digitalWrite(pin_debug, LOW);
+}
+
 void baseStatusLedBlink()
 {
     if (pin_baseStatusLED != PIN_UNDEFINED)
diff --git a/Firmware/RTK_Everywhere/NVM.ino b/Firmware/RTK_Everywhere/NVM.ino
index ceb2efdc2..b2cbf5296 100644
--- a/Firmware/RTK_Everywhere/NVM.ino
+++ b/Firmware/RTK_Everywhere/NVM.ino
@@ -383,6 +383,14 @@ void recordSystemSettingsToFile(File *settingsFile)
             }
         }
         break;
+        case tNSCEn: {
+            for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
+            {
+                settingsFile->printf("%s%d=%d\r\n", rtkSettingsEntries[i].name, x,
+                                     settings.ntripServer_CasterEnabled[x]);
+            }
+        }
+        break;
         case tNSCHost: {
             for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
             {
@@ -1067,6 +1075,15 @@ bool parseLine(char *str)
                     }
                 }
                 break;
+                case tNSCEn: {
+                    int server;
+                    if (sscanf(suffix, "%d", &server) == 1)
+                    {
+                        settings.ntripServer_CasterEnabled[server] = d;
+                        knownSetting = true;
+                    }
+                }
+                break;
                 case tNSCHost: {
                     int server;
                     if (sscanf(suffix, "%d", &server) == 1)
diff --git a/Firmware/RTK_Everywhere/Network.ino b/Firmware/RTK_Everywhere/Network.ino
index 9f0de21f6..9541656d1 100644
--- a/Firmware/RTK_Everywhere/Network.ino
+++ b/Firmware/RTK_Everywhere/Network.ino
@@ -599,6 +599,20 @@ bool networkConsumerIsConnected(NETCONSUMER_t consumer)
     // Validate the consumer
     networkConsumerValidate(consumer);
 
+    // if (consumer == NETCONSUMER_NTRIP_SERVER_1)
+    // {
+    //     index = networkIndexTable[networkPriority];
+    //     systemPrintf("NETCONSUMER_NTRIP_SERVER_1: %ld %d %d %d %d\r\n",
+    //         networkHasInternet_bm,
+    //         networkConsumerPriority[consumer],
+    //         networkPriority,
+    //         index,
+    //         networkInterfaceHasInternet(index)
+    //         );
+    // }
+
+    // NETCONSUMER_NTRIP_SERVER_1: 2 3 3 3 0
+
     // If the client is using the highest priority network and that
     // network is still available then continue as normal
     if (networkHasInternet_bm && (networkConsumerPriority[consumer] == networkPriority))
@@ -826,7 +840,7 @@ void networkDisplayMode()
 
     if (rtkMode == 0)
     {
-        systemPrintf("rtkMode: 0 (Not specified)\r\n");
+        systemPrintf("rtkMode: 0 (Not Specified or Base Undecided)\r\n");
         return;
     }
 
@@ -2455,11 +2469,14 @@ void networkUpdate()
         }
     }
 
-    // Update the WiFi state
-    wifiStationUpdate();
-
-    // Update Ethernet
-    ethernetUpdate();
+    // Walk the list of network priorities in descending order
+    for (priority = 0; priority < NETWORK_OFFLINE; priority++)
+    {
+        // Update the networks in order of priority
+        index = networkIndexTable[priority];
+        if (networkInterfaceTable[index].updateMethod)
+            networkInterfaceTable[index].updateMethod();
+    }
 
     // Update the network services
     // Start or stop mDNS
diff --git a/Firmware/RTK_Everywhere/NtripClient.ino b/Firmware/RTK_Everywhere/NtripClient.ino
index b4447f072..56f15aef5 100644
--- a/Firmware/RTK_Everywhere/NtripClient.ino
+++ b/Firmware/RTK_Everywhere/NtripClient.ino
@@ -200,7 +200,7 @@ unsigned long lastGGAPush;
 
 bool ntripClientForcedShutdown = false; // NTRIP Client was turned off due to an error. Don't allow restart.
 
-bool settingsChanged = false; // Goes true when a menu or command modified the client credentials
+bool ntripClientSettingsHaveChanged = false; // Goes true when a menu or command modified the client credentials
 
 //----------------------------------------
 // NTRIP Client Routines
@@ -396,9 +396,9 @@ bool ntripClientEnabled(const char **line)
         enabled = settings.enableNtripClient;
 
         // Allow restart if settings change
-        if(settingsChanged == true)
+        if(ntripClientSettingsHaveChanged == true)
         {
-            settingsChanged = false;
+            ntripClientSettingsHaveChanged = false;
             ntripClientForcedShutdown = false;
         }
 
@@ -600,7 +600,7 @@ void ntripClientSetState(uint8_t newState)
 // Called from CLI call backs or serial menus to let machine know it can restart the client if it is shut down
 void ntripClientSettingsChanged()
 {
-    settingsChanged = true;
+    ntripClientSettingsHaveChanged = true;
 }
 
 //----------------------------------------
@@ -916,9 +916,9 @@ void ntripClientUpdate()
             }
 
             // Check if the there have been changes to the client settings
-            if(settingsChanged == true)
+            if(ntripClientSettingsHaveChanged == true)
             {
-                settingsChanged = false;
+                ntripClientSettingsHaveChanged = false;
                 ntripClientRestart();
             }
             // Check for timeout receiving NTRIP data
diff --git a/Firmware/RTK_Everywhere/NtripServer.ino b/Firmware/RTK_Everywhere/NtripServer.ino
index e03af9a99..c2e5418b0 100644
--- a/Firmware/RTK_Everywhere/NtripServer.ino
+++ b/Firmware/RTK_Everywhere/NtripServer.ino
@@ -122,6 +122,213 @@ NtripServer.ino
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
+#ifdef  COMPILE_NETWORK
+
+// NTRIP Server data
+const TickType_t serverSemaphore_shortWait_ms = 10 / portTICK_PERIOD_MS;
+const TickType_t serverSemaphore_longWait_ms = 100 / portTICK_PERIOD_MS;
+typedef struct
+{
+    // Network connection used to push RTCM to NTRIP caster
+    NetworkClient *networkClient;
+    volatile uint8_t state;
+
+    // Count of bytes sent by the NTRIP server to the NTRIP caster
+    volatile uint32_t bytesSent;
+
+    // Throttle the time between connection attempts
+    // ms - Max of 4,294,967,295 or 4.3M seconds or 71,000 minutes or 1193 hours or 49 days between attempts
+    volatile uint32_t connectionAttemptTimeout;
+    volatile int connectionAttempts; // Count the number of connection attempts between restarts
+
+    // NTRIP server timer usage:
+    //  * Reconnection delay
+    //  * Measure the connection response time
+    //  * Receive RTCM correction data timeout
+    //  * Monitor last RTCM byte received for frame counting
+    volatile uint32_t timer;
+    volatile uint32_t startTime;
+    volatile int connectionAttemptsTotal; // Count the number of connection attempts absolutely
+
+    // Better debug printing by ntripServerSendRTCM
+    volatile uint32_t rtcmBytesSent;
+    volatile uint32_t previousMilliseconds;
+
+
+    // Protect all methods that manipulate timer with a mutex - to avoid race conditions
+    // Also protect the write from connected checks
+    SemaphoreHandle_t serverSemaphore = NULL;
+
+    unsigned long millisSinceTimer()
+    {
+        unsigned long retVal = 0;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            retVal = millis() - timer;
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;
+    }
+
+    unsigned long millisSinceStartTime()
+    {
+        unsigned long retVal = 0;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            retVal = millis() - startTime;
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;
+    }
+
+    void updateTimerAndBytesSent()
+    {
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            bytesSent = bytesSent + 1;
+            rtcmBytesSent = rtcmBytesSent + 1;
+            timer = millis();
+            xSemaphoreGive(serverSemaphore);
+        }
+    }
+
+    void updateTimerAndBytesSent(uint16_t dataLength)
+    {
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            bytesSent = bytesSent + dataLength;
+            rtcmBytesSent = rtcmBytesSent + dataLength;
+            timer = millis();
+            xSemaphoreGive(serverSemaphore);
+        }
+    }
+
+    bool checkBytesSentAndReset(uint32_t timerLimit, uint32_t *totalBytesSent)
+    {
+        bool retVal = false;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            if (((millis() - timer) > timerLimit) && (bytesSent > 0))
+            {
+                retVal = true;
+                *totalBytesSent = bytesSent;
+                bytesSent = 0;
+            }
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;
+    }
+
+    unsigned long getUptime()
+    {
+        unsigned long retVal = 0;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            retVal = timer - startTime;
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;
+    }
+
+    void setTimerToMillis()
+    {
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            timer = millis();
+            xSemaphoreGive(serverSemaphore);
+        }
+    }
+
+    bool checkConnectionAttemptTimeout()
+    {
+        bool retVal = false;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            if ((millis() - timer) >= connectionAttemptTimeout)
+            {
+                retVal = true;
+            }
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;
+    }
+
+    bool networkClientConnected(bool assumeConnected)
+    {
+        bool retVal = assumeConnected;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_longWait_ms) == pdPASS)
+        {
+            retVal = (bool)networkClient->connected();
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;        
+    }
+
+    size_t networkClientWrite(const uint8_t *buf, size_t size)
+    {
+        size_t retVal = 0;
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_longWait_ms) == pdPASS)
+        {
+            retVal = networkClient->write(buf, size);
+            xSemaphoreGive(serverSemaphore);
+        }
+        return retVal;        
+    }
+
+    void networkClientAbsorb()
+    {
+        static uint8_t *buffer = nullptr;
+        const size_t bufferSize = 256;
+        if (buffer == nullptr)
+            buffer = (uint8_t *)rtkMalloc(bufferSize, "networkClientAbsorb");
+        if (serverSemaphore == NULL)
+            serverSemaphore = xSemaphoreCreateMutex();
+        if (xSemaphoreTake(serverSemaphore, serverSemaphore_shortWait_ms) == pdPASS)
+        {
+            if (buffer == nullptr)
+            {
+                while (networkClient->available())
+                    networkClient->read(); // Absorb any unwanted incoming traffic
+            }
+            else
+            {
+                while (networkClient->available())
+                {
+                    int bytesRead = networkClient->read(buffer, bufferSize); // Absorb any unwanted incoming traffic
+                    if ((bytesRead > 0) && settings.debugNtripServerRtcm && (!inMainMenu))
+                    {
+                        systemPrintln("Data received from networkClient:");
+                        dumpBuffer(buffer, bytesRead);
+                    }
+                }
+            }
+            xSemaphoreGive(serverSemaphore);
+        }
+    }
+} NTRIP_SERVER_DATA;
+
+#endif  // COMPILE_NETWORK
+
 #ifdef COMPILE_NTRIP_SERVER
 
 //----------------------------------------
@@ -175,6 +382,14 @@ const RtkMode_t ntripServerMode = RTK_MODE_BASE_FIXED;
 // NTRIP Servers
 static NTRIP_SERVER_DATA ntripServerArray[NTRIP_SERVER_MAX];
 
+bool ntripServerSettingsHaveChanged[NTRIP_SERVER_MAX] =
+{
+    false,
+    false,
+    false,
+    false,
+}; // Goes true when a menu or command modified the server credentials
+
 //----------------------------------------
 // NTRIP Server Routines
 //----------------------------------------
@@ -205,9 +420,12 @@ bool ntripServerConnectCaster(int serverIndex)
         systemPrintf("NTRIP Server %d connecting to %s:%d\r\n", serverIndex,
                      settings.ntripServer_CasterHost[serverIndex], settings.ntripServer_CasterPort[serverIndex]);
 
-    // Attempt a connection to the NTRIP caster
+    // Record the settings as unchanged
+    ntripServerSettingsHaveChanged[serverIndex] = false;
+
+    // Attempt a connection to the NTRIP caster - using the full default 3000ms _timeout
     if (!ntripServer->networkClient->connect(settings.ntripServer_CasterHost[serverIndex],
-                                             settings.ntripServer_CasterPort[serverIndex]))
+                                             settings.ntripServer_CasterPort[serverIndex], 3000))
     {
         if (settings.debugNtripServerState)
             systemPrintf("NTRIP Server %d connection to NTRIP caster %s:%d failed\r\n", serverIndex,
@@ -306,13 +524,16 @@ bool ntripServerEnabled(int serverIndex, const char ** line)
         }
 
         // Verify that the parameters were specified
-        if ((settings.ntripServer_CasterHost[serverIndex][0] == 0)
+        if ((settings.ntripServer_CasterEnabled[serverIndex] == false)
+            || (settings.ntripServer_CasterHost[serverIndex][0] == 0)
             || (settings.ntripServer_CasterPort[serverIndex] == 0)
             || (settings.ntripServer_MountPoint[serverIndex][0] == 0))
         {
             if (line)
             {
-                if (settings.ntripServer_CasterHost[serverIndex][0] == 0)
+                if (settings.ntripServer_CasterEnabled[serverIndex] == false)
+                    *line = ", Caster not enabled!";
+                else if (settings.ntripServer_CasterHost[serverIndex][0] == 0)
                     *line = ", Caster host not specified!";
                 else if (settings.ntripServer_CasterPort[serverIndex] == 0)
                     *line = ", Caster port not specified!";
@@ -407,9 +628,9 @@ void ntripServerPrintStatus(int serverIndex)
 }
 
 //----------------------------------------
-// This function gets called as each RTCM byte comes in
+// This function sends stored, complete RTCM messages to connected servers
 //----------------------------------------
-void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
+void ntripServerSendRTCM(int serverIndex, uint8_t *rtcmData, uint16_t dataLength)
 {
     NTRIP_SERVER_DATA *ntripServer = &ntripServerArray[serverIndex];
 
@@ -439,14 +660,17 @@ void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
             systemPrintf("NTRIP Server %d transmitted %d RTCM bytes to Caster\r\n", serverIndex,
                             totalBytesSent);
 
-        if (ntripServer->networkClient && ntripServer->networkClient->connected())
+        if (ntripServer->networkClient && ntripServer->networkClientConnected(true))
         {
-            if (ntripServer->networkClient->write(incoming) == 1) // Send this byte to socket
+            unsigned long entryTime = millis();
+
+            //pinDebugOn();
+            if (ntripServer->networkClientWrite(rtcmData, dataLength) == dataLength) // Send this byte to socket
             {
-                ntripServer->updateTimerAndBytesSent();
+                //pinDebugOff();
+                ntripServer->updateTimerAndBytesSent(dataLength);
                 netOutgoingRTCM = true;
-                while (ntripServer->networkClient->available())
-                    ntripServer->networkClient->read(); // Absorb any unwanted incoming traffic
+                ntripServer->networkClientAbsorb(); // Absorb any unwanted incoming traffic
             }
             // Failed to write the data
             else
@@ -456,13 +680,15 @@ void ntripServerProcessRTCM(int serverIndex, uint8_t incoming)
                     systemPrintf("NTRIP Server %d broken connection to %s\r\n", serverIndex,
                                  settings.ntripServer_CasterHost[serverIndex]);
             }
-        }
-    }
+            //pinDebugOff();
 
-    // Indicate that the GNSS is providing correction data
-    else if (ntripServer->state == NTRIP_SERVER_WAIT_GNSS_DATA)
-    {
-        ntripServerSetState(serverIndex, NTRIP_SERVER_CONNECTING);
+            if (((millis() - entryTime) > settings.networkClientWriteTimeout_ms) && settings.debugNtripServerRtcm && (!inMainMenu))
+            {
+                if (pin_debug != PIN_UNDEFINED)
+                    systemPrint(debugMessagePrefix);
+                systemPrintf("ntripServer write took %ldms\r\n", millis() - entryTime);
+            }
+        }
     }
 }
 
@@ -560,7 +786,7 @@ void ntripServerStop(int serverIndex, bool shutdown)
     if (ntripServer->networkClient)
     {
         // Break the NTRIP server connection if necessary
-        if (ntripServer->networkClient->connected())
+        if (ntripServer->networkClientConnected(true))
             ntripServer->networkClient->stop();
 
         // Free the NTRIP server resources
@@ -581,6 +807,8 @@ void ntripServerStop(int serverIndex, bool shutdown)
     {
         if (settings.debugNtripServerState)
             systemPrintf("NTRIP Server %d shutdown requested!\r\n", serverIndex);
+        if (settings.debugNtripServerState && (!settings.ntripServer_CasterEnabled[serverIndex]))
+            systemPrintf("NTRIP Server %d caster not enabled!\r\n", serverIndex);
         if (settings.debugNtripServerState && (!settings.ntripServer_CasterHost[serverIndex][0]))
             systemPrintf("NTRIP Server %d caster host not configured!\r\n", serverIndex);
         if (settings.debugNtripServerState && (!settings.ntripServer_CasterPort[serverIndex]))
@@ -626,14 +854,25 @@ void ntripServerUpdate(int serverIndex)
         ntripServerSetState(serverIndex, ntripServer->state);
     connected = networkConsumerIsConnected(NETWORK_CONSUMER(serverIndex));
     enabled = ntripServerEnabled(serverIndex, &line);
+
+    // Determine if no longer enabled
     if (!enabled && (ntripServer->state > NTRIP_SERVER_OFF))
         ntripServerShutdown(serverIndex);
 
     // Determine if the network has failed
-    else if ((ntripServer->state > NTRIP_SERVER_WAIT_FOR_NETWORK)
-        && (!connected))
+    else if ((ntripServer->state >= NTRIP_SERVER_NETWORK_CONNECTED)
+             && (!connected))
         ntripServerRestart(serverIndex);
 
+    // Determine if the settings have changed while connected
+    else if ((ntripServer->state >= NTRIP_SERVER_NETWORK_CONNECTED)
+             && (connected)
+             && (ntripServerSettingsHaveChanged[serverIndex]))
+        ntripServerRestart(serverIndex);
+
+    // Clear the ntripServerSettingsHaveChanged flag. Oneshot
+    ntripServerSettingsHaveChanged[serverIndex] = false;
+
     // Enable the network and the NTRIP server if requested
     switch (ntripServer->state)
     {
@@ -684,6 +923,13 @@ void ntripServerUpdate(int serverIndex)
             // Failed to connect to to the network, attempt to restart the network
             ntripServerRestart(serverIndex);
 
+        // Determine if the settings have changed
+        else if (ntripServerSettingsHaveChanged[serverIndex])
+        {
+            ntripServerSettingsHaveChanged[serverIndex] = false;
+            ntripServerRestart(serverIndex);
+        }
+
         else if (settings.enableNtripServer)
         {
             // No RTCM correction data sent yet
@@ -696,7 +942,11 @@ void ntripServerUpdate(int serverIndex)
 
     // Wait for GNSS correction data
     case NTRIP_SERVER_WAIT_GNSS_DATA:
-        // State change handled in ntripServerProcessRTCM
+        // There is a small risk that any other connected servers will absorb the
+        // data before rtcmDataAvailable() is able to return true. We may need to
+        // add a data-was-available timer or similar?
+        if (rtcmDataAvailable())
+            ntripServerSetState(serverIndex, NTRIP_SERVER_CONNECTING);
         break;
 
     // Initiate the connection to the NTRIP caster
@@ -782,6 +1032,13 @@ void ntripServerUpdate(int serverIndex)
                 online.ntripServer[serverIndex] = true;
                 ntripServer->startTime = millis();
                 ntripServerSetState(serverIndex, NTRIP_SERVER_CASTING);
+
+                // Now we are ready to start casting, decrease timeout to networkClientWriteTimeout_ms
+                // The default timeout is WIFI_CLIENT_DEF_CONN_TIMEOUT_MS (3000)
+                // Each write will retry up to WIFI_CLIENT_MAX_WRITE_RETRY (10) times
+                // NetworkClient uses the same _timeout for both the initial connection and
+                // subsequent writes. The trick is to setConnectionTimeout after we are connected
+                ntripServer->networkClient->setConnectionTimeout(settings.networkClientWriteTimeout_ms);
             }
 
             // Look for '401 Unauthorized'
@@ -814,16 +1071,26 @@ void ntripServerUpdate(int serverIndex)
     // NTRIP server authorized to send RTCM correction data to NTRIP caster
     case NTRIP_SERVER_CASTING:
         // Check for a broken connection
-        if (!ntripServer->networkClient->connected())
+        if (!ntripServer->networkClientConnected(true))
         {
             // Broken connection, retry the NTRIP connection
             systemPrintf("Connection to NTRIP Caster %d - %s was lost\r\n", serverIndex,
                          settings.ntripServer_CasterHost[serverIndex]);
             ntripServerRestart(serverIndex);
         }
+        // Determine if the settings have changed
+        else if (ntripServerSettingsHaveChanged[serverIndex])
+        {
+            systemPrintf("NTRIP Server %d breaking connection to %s - settings changed!\r\n", serverIndex,
+                         settings.ntripServer_CasterHost[serverIndex]);
+            ntripServerSettingsHaveChanged[serverIndex] = false;
+            ntripServerRestart(serverIndex);
+        }
         else if (ntripServer->millisSinceTimer() > (10 * 1000))
         {
             // GNSS stopped sending RTCM correction data
+            if (pin_debug != PIN_UNDEFINED)
+                systemPrint(debugMessagePrefix);
             systemPrintf("NTRIP Server %d breaking connection to %s due to lack of RTCM data!\r\n", serverIndex,
                          settings.ntripServer_CasterHost[serverIndex]);
             ntripServerRestart(serverIndex);
@@ -878,4 +1145,10 @@ void ntripServerValidateTables()
         reportFatalError("Fix ntripServerStateNameEntries to match NTRIPServerState");
 }
 
+// Called from CLI call backs or serial menus to let machine know it can restart the server
+void ntripServerSettingsChanged(int serverIndex)
+{
+    ntripServerSettingsHaveChanged[serverIndex] = true;
+}
+
 #endif  // COMPILE_NTRIP_SERVER
diff --git a/Firmware/RTK_Everywhere/RTK_Everywhere.ino b/Firmware/RTK_Everywhere/RTK_Everywhere.ino
index b76007af6..e72b087e3 100644
--- a/Firmware/RTK_Everywhere/RTK_Everywhere.ino
+++ b/Firmware/RTK_Everywhere/RTK_Everywhere.ino
@@ -228,10 +228,13 @@ const uint16_t HTTPS_PORT = 443;
 #define SECONDS_IN_AN_HOUR (MINUTES_IN_AN_HOUR * SECONDS_IN_A_MINUTE)
 #define SECONDS_IN_A_DAY (HOURS_IN_A_DAY * SECONDS_IN_AN_HOUR)
 
+const char *debugMessagePrefix = "# => "; // Something ~unique and easy to trigger on
+
 // Hardware connections
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // These pins are set in beginBoard()
 #define PIN_UNDEFINED -1
+int pin_debug = PIN_UNDEFINED;              // LED on EVK
 int pin_batteryStatusLED = PIN_UNDEFINED;   // LED on Torch
 int pin_baseStatusLED = PIN_UNDEFINED;      // LED on EVK
 int pin_bluetoothStatusLED = PIN_UNDEFINED; // LED on Torch
@@ -427,7 +430,7 @@ bool savePossibleSettings = true; // Save possible vs. available settings. See r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #ifdef COMPILE_WIFI
 int packetRSSI;
-RTK_WIFI wifi(false);
+RTK_WIFI wifi(false); // wifi(false); is non-verbose. For verbose, change to wifi(true); 
 #endif // COMPILE_WIFI
 
 // WiFi Globals - For other module direct access
@@ -619,7 +622,7 @@ volatile bool inDirectConnectMode = false; // Global state to indicate if GNSS/L
 
 #define SERIAL_SIZE_TX 512
 uint8_t wBuffer[SERIAL_SIZE_TX]; // Buffer for writing from incoming SPP to F9P
-const int btReadTaskStackSize = 4000;
+const int btReadTaskStackSize = 3000;
 
 // Array of start-of-sentence offsets into the ring buffer
 #define AMOUNT_OF_RING_BUFFER_DATA_TO_DISCARD (settings.gnssHandlerBufferSize >> 2)
@@ -1714,7 +1717,11 @@ void logUpdate()
                 else
                 {
                     if ((settings.enablePrintLogFileStatus) && (!inMainMenu))
+                    {
+                        if (pin_debug != PIN_UNDEFINED)
+                            systemPrint(debugMessagePrefix);
                         systemPrintf("No increase in file size: %llu -> %llu\r\n", lastLogSize, logFileSize);
+                    }
                     logIncreasing = false;
 
                     endSD(false, true); // alreadyHaveSemaphore, releaseSemaphore
diff --git a/Firmware/RTK_Everywhere/States.ino b/Firmware/RTK_Everywhere/States.ino
index b56019bbc..7e6da7c1d 100644
--- a/Firmware/RTK_Everywhere/States.ino
+++ b/Firmware/RTK_Everywhere/States.ino
@@ -163,6 +163,17 @@ void stateUpdate()
 
             /*
                               .-----------------------------------.
+                              |  STATE_BASE_ASSIST_NOT_STARTED    |
+                              |            Text: 'Base'           |
+                              '-----------------------------------'
+                                                |
+                                                | Copy current position into settings
+                                                | Set fixedBase true
+                                                | STATE_BASE_NOT_STARTED falls into
+                                                | STATE_BASE_FIXED_NOT_STARTED
+                                                | 
+                                                V
+                              .-----------------------------------.
                   startBase() |      STATE_BASE_NOT_STARTED       |
                  .------------|            Text: 'Base'           |
                  |    = false '-----------------------------------'
@@ -210,8 +221,47 @@ void stateUpdate()
         }
         break;
 
+        // User wants to switch to fixed base, using the current position as
+        // the fixed base position.
+        // Note: this works when switching from Rover (e.g. with RTK Fix)
+        //       or when switching from Temporary Base (after Survey-In)
+        case (STATE_BASE_ASSIST_NOT_STARTED): {
+            // Mark RTK_MODE as BASE_UNDECIDED to avoid starting NTRIP Client when we do not need it
+            RTK_MODE(RTK_MODE_BASE_UNDECIDED);
+            firstRoverStart = false; // If base is starting, no test menu, normal button use.
+
+            if (online.gnss == false)
+                return;
+
+            // Copy current position into fixed base position
+            // For now, use the geodetic position only
+            settings.fixedBase = true;
+            settings.fixedBaseCoordinateType = COORD_TYPE_GEODETIC;
+            settings.fixedLat = gnss->getLatitude();
+            settings.fixedLong = gnss->getLongitude();
+
+            // See issue #809
+            // gnss->getAltitude() will always return Height above ellipsoid
+            // even if the underlying library getAltitude does not
+            settings.fixedAltitude = gnss->getAltitude();
+
+            systemPrint("Switching to Fixed Base mode using:");
+            systemPrint(" Lat: ");
+            systemPrint(settings.fixedLat, haeNumberOfDecimals);
+            systemPrint(", Lon: ");
+            systemPrint(settings.fixedLong, haeNumberOfDecimals);
+            systemPrint(", Alt: ");
+            systemPrintln(settings.fixedAltitude, 4);
+
+            // STATE_BASE_NOT_STARTED will record settings for next POR
+
+            changeState(STATE_BASE_NOT_STARTED);
+        }
+        break;
+
         case (STATE_BASE_NOT_STARTED): {
-            RTK_MODE(RTK_MODE_BASE_SURVEY_IN);
+            // Mark RTK_MODE as BASE_UNDECIDED to avoid starting NTRIP Client when we may not need it
+            RTK_MODE(RTK_MODE_BASE_UNDECIDED);
             firstRoverStart = false; // If base is starting, no test menu, normal button use.
 
             if (online.gnss == false)
@@ -243,12 +293,15 @@ void stateUpdate()
                 displayBaseSuccess(500); // Show 'Base Started'
 
                 if (settings.fixedBase == false)
+                {
                     changeState(STATE_BASE_TEMP_SETTLE);
+                    RTK_MODE(RTK_MODE_BASE_SURVEY_IN); // Now allow NTRIP Client to start
+                }
                 else
                 {
                     gnssConfigure(GNSS_CONFIG_BASE_FIXED); // Request start of fixed base
                     changeState(STATE_BASE_FIXED_NOT_STARTED);
-                    RTK_MODE(RTK_MODE_BASE_FIXED);
+                    RTK_MODE(RTK_MODE_BASE_FIXED); // Now allow NTRIP Server to start
                 }
             }
         }
@@ -361,7 +414,7 @@ void stateUpdate()
                   = false |        Text: "Base Started"       |
             .-------------|                                   |
             |             '-----------------------------------'
-            V                               |
+            V                                 |
           STATE_ROVER_NOT_STARTED             | startBase() = true
           (Rover diagram)                     V
                           .-----------------------------------.
@@ -658,6 +711,8 @@ const char *getState(SystemState state, char *buffer)
         return "STATE_ROVER_RTK_FIX";
     case (STATE_BASE_CASTER_NOT_STARTED):
         return "STATE_BASE_CASTER_NOT_STARTED";
+    case (STATE_BASE_ASSIST_NOT_STARTED):
+        return "STATE_BASE_ASSIST_NOT_STARTED";
     case (STATE_BASE_NOT_STARTED):
         return "STATE_BASE_NOT_STARTED";
     case (STATE_BASE_CONFIG_WAIT):
@@ -672,6 +727,7 @@ const char *getState(SystemState state, char *buffer)
         return "STATE_BASE_FIXED_NOT_STARTED";
     case (STATE_BASE_FIXED_TRANSMITTING):
         return "STATE_BASE_FIXED_TRANSMITTING";
+
     case (STATE_DISPLAY_SETUP):
         return "STATE_DISPLAY_SETUP";
     case (STATE_WEB_CONFIG_NOT_STARTED):
@@ -768,6 +824,7 @@ typedef struct _RTK_MODE_ENTRY
 const RTK_MODE_ENTRY stateModeTable[] = {
     {"Rover", STATE_ROVER_NOT_STARTED, STATE_ROVER_RTK_FIX},
     {"Base Caster", STATE_BASE_CASTER_NOT_STARTED, STATE_BASE_CASTER_NOT_STARTED},
+    {"Base Assist", STATE_BASE_ASSIST_NOT_STARTED, STATE_BASE_ASSIST_NOT_STARTED},
     {"Base", STATE_BASE_NOT_STARTED, STATE_BASE_FIXED_TRANSMITTING},
     {"Setup", STATE_DISPLAY_SETUP, STATE_PROFILE}, // Covers SETUP, WEB_CONFIG, TEST
     {"Provisioning", STATE_KEYS_REQUESTED, STATE_KEYS_REQUESTED},
@@ -801,7 +858,7 @@ bool inRoverMode()
 
 bool inBaseMode()
 {
-    if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
+    if (systemState >= STATE_BASE_CASTER_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
         return (true);
     return (false);
 }
@@ -833,9 +890,16 @@ void constructSetupDisplay(std::vector<setupButton> *buttons)
 {
     buttons->clear();
 
+    // Can't use inBaseMode() or inRoverMode() here because we are in STATE_DISPLAY_SETUP
     addSetupButton(buttons, "Base", STATE_BASE_NOT_STARTED);
     addSetupButton(buttons, "BaseCast", STATE_BASE_CASTER_NOT_STARTED);
+    if (present.display_type == DISPLAY_128x64)
+        addSetupButton(buttons, "BaseAssist", STATE_BASE_ASSIST_NOT_STARTED);
+    else
+        addSetupButton(buttons, "BaseAsst", STATE_BASE_ASSIST_NOT_STARTED);
+
     addSetupButton(buttons, "Rover", STATE_ROVER_NOT_STARTED);
+
     if (present.ethernet_ws5500 == true)
     {
         addSetupButton(buttons, "NTP", STATE_NTPSERVER_NOT_STARTED);
@@ -866,5 +930,6 @@ void constructSetupDisplay(std::vector<setupButton> *buttons)
             }
         }
     }
+
     addSetupButton(buttons, "Exit", STATE_NOT_SET);
 }
diff --git a/Firmware/RTK_Everywhere/Tasks.ino b/Firmware/RTK_Everywhere/Tasks.ino
index 230406b2e..ef8cf6841 100644
--- a/Firmware/RTK_Everywhere/Tasks.ino
+++ b/Firmware/RTK_Everywhere/Tasks.ino
@@ -357,7 +357,15 @@ void gnssReadTask(void *e)
         reportFatalError("Failed to initialize the parser");
 
     if (settings.debugGnss)
-        sempEnableDebugOutput(rtkParse);
+    {
+        sempEnableDebugOutput(rtkParse); // Standard debug on Serial
+        //sempEnableDebugOutput(rtkParse, &Serial, true); // Verbose debug
+    }
+
+    // Abort NMEA and Unicore Hash on non-printable character
+    // Help faster recovery from UART errors on EVK
+    sempAbortNmeaOnNonPrintable(rtkParse);
+    sempAbortHashOnNonPrintable(rtkParse);
 
     bool sbfParserNeeded = present.gnss_mosaicX5;
     bool spartnParserNeeded = present.gnss_mosaicX5 && (productVariant != RTK_FLEX);
@@ -450,20 +458,33 @@ void gnssReadTask(void *e)
             while (serialGNSS->available())
             {
                 // Read the data from UART1
-                uint8_t incomingData[500];
+                static uint8_t incomingData[256];
                 int bytesIncoming = serialGNSS->read(incomingData, sizeof(incomingData));
                 totalRxByteCount += bytesIncoming;
 
+                if ((bytesIncoming < 0) || (bytesIncoming > sizeof(incomingData)))
+                {
+                    if (settings.debugGnss)
+                        systemPrintf("gnssReadTask: bytesIncoming = %d\r\n", bytesIncoming);
+                }
+
                 for (int x = 0; x < bytesIncoming; x++)
                 {
                     // Update the parser state based on the incoming byte
                     // On mosaic-X5, pass the byte to sbfParse. On all other platforms, pass it straight to rtkParse
-                    sempParseNextByte(sbfParserNeeded ? sbfParse : rtkParse, incomingData[x]);
+                    if (!sbfParserNeeded)
+                    {
+                        //pinDebugOn();
+                        sempParseNextByte(rtkParse, incomingData[x]);
+                        //pinDebugOff();
+                    }
 
                     // See notes above. On the mosaic-X5, check that the incoming SBF blocks have expected IDs and
                     // lengths to help prevent raw L-Band data being misidentified as SBF
-                    if (sbfParserNeeded)
+                    else // if (sbfParserNeeded)
                     {
+                        sempParseNextByte(sbfParse, incomingData[x]);
+
                         SEMP_SCRATCH_PAD *scratchPad = (SEMP_SCRATCH_PAD *)sbfParse->scratchPad;
 
                         // Check if this is Length MSB
@@ -884,7 +905,9 @@ void processUart1Message(SEMP_PARSE_STATE *parse, uint16_t type)
     if (inBaseMode() && type == RTK_RTCM_PARSER_INDEX)
     {
         // Pass data along to NTRIP Server, ESP-NOW radio, or LoRa
+        //pinDebugOn();
         processRTCM(parse->buffer, parse->length);
+        //pinDebugOff();
     }
 
     // Determine if we are using the PPL - UM980, LG290P, or mosaic-X5
@@ -1258,8 +1281,9 @@ void processUart1Message(SEMP_PARSE_STATE *parse, uint16_t type)
     }
     else
     {
-        systemPrintf("processUart1Message could not get ringBuffer semaphore - held by %s\r\n",
-                     ringBufferSemaphoreHolder);
+        if (settings.debugGnss && (!inMainMenu))
+            systemPrintf("processUart1Message could not get ringBuffer semaphore - held by %s\r\n",
+                         ringBufferSemaphoreHolder);
     }
 }
 
@@ -1350,6 +1374,21 @@ void handleGnssDataTask(void *e)
             systemPrintln("handleGnssDataTask running");
         }
 
+        //----------------------------------------------------------------------
+        // Send RTCM to consumers
+        //
+        // RTCM has its own storage in rtcmConsumerBuffer (Base.ino)
+        // It does not use the main ringBuffer
+        // But we do the writing here so all traffic generated in the same place
+        //----------------------------------------------------------------------
+
+        startMillis = millis();
+
+        sendRTCMToConsumers();
+
+        if ((millis() - startMillis) > settings.networkClientWriteTimeout_ms)
+            slowConsumer = "RTCM Consumers";
+
         usedSpace = 0;
 
         // Use a semaphore to prevent handleGnssDataTask from gatecrashing
@@ -1565,6 +1604,8 @@ void handleGnssDataTask(void *e)
                     {
                         markSemaphore(FUNCTION_WRITESD);
 
+                        //pinDebugOn();
+
                         do // Do the SD write in a do loop so we can break out if needed
                         {
                             if (settings.enablePrintSDBuffers && (!inMainMenu))
@@ -1722,6 +1763,9 @@ void handleGnssDataTask(void *e)
                             }
                         } while (0);
 
+
+                        //pinDebugOff();
+
                         xSemaphoreGive(sdCardSemaphore);
                     } // End sdCardSemaphore
                     else
@@ -1788,8 +1832,9 @@ void handleGnssDataTask(void *e)
         }
         else
         {
-            systemPrintf("handleGnssDataTask could not get ringBuffer semaphore - held by %s\r\n",
-                         ringBufferSemaphoreHolder);
+            if (settings.debugGnss && (!inMainMenu))
+                systemPrintf("handleGnssDataTask could not get ringBuffer semaphore - held by %s\r\n",
+                             ringBufferSemaphoreHolder);
         }
 
         //----------------------------------------------------------------------
@@ -2208,6 +2253,8 @@ void buttonCheckTask(void *e)
                 case STATE_ROVER_FIX:
                 case STATE_ROVER_RTK_FLOAT:
                 case STATE_ROVER_RTK_FIX:
+                case STATE_BASE_CASTER_NOT_STARTED:
+                case STATE_BASE_ASSIST_NOT_STARTED:
                 case STATE_BASE_NOT_STARTED:
                 case STATE_BASE_CONFIG_WAIT:
                 case STATE_BASE_TEMP_SETTLE:
diff --git a/Firmware/RTK_Everywhere/menuBase.ino b/Firmware/RTK_Everywhere/menuBase.ino
index ea67e72cd..884091e1b 100644
--- a/Firmware/RTK_Everywhere/menuBase.ino
+++ b/Firmware/RTK_Everywhere/menuBase.ino
@@ -122,17 +122,21 @@ void menuBase()
             {
                 systemPrintf("NTRIP Server #%d\r\n", serverIndex + 1);
 
-                systemPrintf("%d) Set Caster Address: %s\r\n", (0 + (serverIndex * 6)) + ntripServerOptionOffset,
+                int menuEntry = (serverIndex * 7) + ntripServerOptionOffset;
+                systemPrintf("%d) Caster:             %s%s\r\n", 0 + menuEntry,
+                             (menuEntry < 10) ? " " : "",
+                             settings.ntripServer_CasterEnabled[serverIndex] ? "Enabled" : "Disabled");
+                systemPrintf("%d) Set Caster Address: %s\r\n", 1 + menuEntry,
                              &settings.ntripServer_CasterHost[serverIndex][0]);
-                systemPrintf("%d) Set Caster Port: %d\r\n", (1 + (serverIndex * 6)) + ntripServerOptionOffset,
+                systemPrintf("%d) Set Caster Port:    %d\r\n", 2 + menuEntry,
                              settings.ntripServer_CasterPort[serverIndex]);
-                systemPrintf("%d) Set Caster User: %s\r\n", (2 + (serverIndex * 6)) + ntripServerOptionOffset,
+                systemPrintf("%d) Set Caster User:    %s\r\n", 3 + menuEntry,
                              &settings.ntripServer_CasterUser[serverIndex][0]);
-                systemPrintf("%d) Set Caster User PW: %s\r\n", (3 + (serverIndex * 6)) + ntripServerOptionOffset,
+                systemPrintf("%d) Set Caster User PW: %s\r\n", 4 + menuEntry,
                              &settings.ntripServer_CasterUserPW[serverIndex][0]);
-                systemPrintf("%d) Set Mountpoint: %s\r\n", (4 + (serverIndex * 6)) + ntripServerOptionOffset,
+                systemPrintf("%d) Set Mountpoint:     %s\r\n", 5 + menuEntry,
                              &settings.ntripServer_MountPoint[serverIndex][0]);
-                systemPrintf("%d) Set Mountpoint PW: %s\r\n", (5 + (serverIndex * 6)) + ntripServerOptionOffset,
+                systemPrintf("%d) Set Mountpoint PW:  %s\r\n", 6 + menuEntry,
                              &settings.ntripServer_MountPointPW[serverIndex][0]);
             }
         }
@@ -336,23 +340,28 @@ void menuBase()
 
         // NTRIP Server entries
         else if ((settings.enableNtripServer == true) && (incoming >= ntripServerOptionOffset) &&
-                 incoming < (ntripServerOptionOffset + 6 * NTRIP_SERVER_MAX))
+                 incoming < (ntripServerOptionOffset + 7 * NTRIP_SERVER_MAX))
         {
             // Down adjust user's selection
             incoming -= ntripServerOptionOffset;
-            int serverNumber = incoming / 6;
-            incoming -= (serverNumber * 6);
+            int serverNumber = incoming / 7;
+            incoming -= (serverNumber * 7);
 
             if (incoming == 0)
+            {
+                settings.ntripServer_CasterEnabled[serverNumber] ^= 1; // Toggle
+                ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
+            }
+            else if (incoming == 1)
             {
                 systemPrintf("Enter Caster Address for Server %d: ", serverNumber + 1);
                 if (getUserInputString(&settings.ntripServer_CasterHost[serverNumber][0], NTRIP_SERVER_STRING_SIZE) ==
                     INPUT_RESPONSE_VALID)
                 {
-                    // NTRIP Server state machine will update automatically
+                    ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
                 }
             }
-            else if (incoming == 1)
+            else if (incoming == 2)
             {
                 // Arbitrary 99k max port #
                 char tempString[100];
@@ -364,10 +373,10 @@ void menuBase()
                 if (getNewSetting(tempString, 1, 99999, &settings.ntripServer_CasterPort[serverNumber]) ==
                     INPUT_RESPONSE_VALID)
                 {
-                    // NTRIP Server state machine will update automatically
+                    ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
                 }
             }
-            else if (incoming == 2)
+            else if (incoming == 3)
             {
                 if (strlen(settings.ntripServer_CasterHost[serverNumber]) > 0)
                     systemPrintf("Enter Caster User for %s: ", settings.ntripServer_CasterHost[serverNumber]);
@@ -377,10 +386,10 @@ void menuBase()
                 if (getUserInputString(&settings.ntripServer_CasterUser[serverNumber][0], NTRIP_SERVER_STRING_SIZE) ==
                     INPUT_RESPONSE_VALID)
                 {
-                    // NTRIP Server state machine will update automatically
+                    ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
                 }
             }
-            else if (incoming == 3)
+            else if (incoming == 4)
             {
                 if (strlen(settings.ntripServer_MountPoint[serverNumber]) > 0)
                     systemPrintf("Enter password for Caster User %s: ", settings.ntripServer_CasterUser[serverNumber]);
@@ -390,10 +399,10 @@ void menuBase()
                 if (getUserInputString(&settings.ntripServer_CasterUserPW[serverNumber][0], NTRIP_SERVER_STRING_SIZE) ==
                     INPUT_RESPONSE_VALID)
                 {
-                    // NTRIP Server state machine will update automatically
+                    ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
                 }
             }
-            else if (incoming == 4)
+            else if (incoming == 5)
             {
                 if (strlen(settings.ntripServer_CasterHost[serverNumber]) > 0)
                     systemPrintf("Enter Mount Point for %s: ", settings.ntripServer_CasterHost[serverNumber]);
@@ -403,10 +412,10 @@ void menuBase()
                 if (getUserInputString(&settings.ntripServer_MountPoint[serverNumber][0], NTRIP_SERVER_STRING_SIZE) ==
                     INPUT_RESPONSE_VALID)
                 {
-                    // NTRIP Server state machine will update automatically
+                    ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
                 }
             }
-            else if (incoming == 5)
+            else if (incoming == 6)
             {
                 if (strlen(settings.ntripServer_MountPoint[serverNumber]) > 0)
                     systemPrintf("Enter password for Mount Point %s: ", settings.ntripServer_MountPoint[serverNumber]);
@@ -416,7 +425,7 @@ void menuBase()
                 if (getUserInputString(&settings.ntripServer_MountPointPW[serverNumber][0], NTRIP_SERVER_STRING_SIZE) ==
                     INPUT_RESPONSE_VALID)
                 {
-                    // NTRIP Server state machine will update automatically
+                    ntripServerSettingsChanged(serverNumber); // Notify the NTRIP Server state machine of new credentials
                 }
             }
         }
diff --git a/Firmware/RTK_Everywhere/menuCommands.ino b/Firmware/RTK_Everywhere/menuCommands.ino
index 418b9678d..eec1dcceb 100644
--- a/Firmware/RTK_Everywhere/menuCommands.ino
+++ b/Firmware/RTK_Everywhere/menuCommands.ino
@@ -910,6 +910,15 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
             }
         }
         break;
+        case tNSCEn: {
+            int server;
+            if (sscanf(suffix, "%d", &server) == 1)
+            {
+                settings.ntripServer_CasterEnabled[server] = (bool)settingValue;
+                knownSetting = true;
+            }
+        }
+        break;
         case tNSCHost: {
             int server;
             if (sscanf(suffix, "%d", &server) == 1)
@@ -1589,6 +1598,16 @@ void createSettingsString(char *newSettings)
                 }
             }
             break;
+            case tNSCEn: {
+                for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
+                {
+                    char tempString[50];
+                    snprintf(tempString, sizeof(tempString), "%s%d,%s,", rtkSettingsEntries[i].name, x,
+                             settings.ntripServer_CasterEnabled[x] ? "true" : "false");
+                    stringRecord(newSettings, tempString);
+                }
+            }
+            break;
             case tNSCHost: {
                 for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
                 {
@@ -2239,6 +2258,15 @@ SettingValueResponse getSettingValue(bool inCommands, const char *settingName, c
                 }
             }
             break;
+            case tNSCEn: {
+                int server;
+                if (sscanf(suffix, "%d", &server) == 1)
+                {
+                    writeToString(settingValueStr, settings.ntripServer_CasterEnabled[server]);
+                    knownSetting = true;
+                }
+            }
+            break;
             case tNSCHost: {
                 int server;
                 if (sscanf(suffix, "%d", &server) == 1)
@@ -2628,6 +2656,16 @@ void commandList(bool inCommands, int i)
             }
         }
         break;
+        case tNSCEn: {
+            for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
+            {
+                snprintf(settingName, sizeof(settingName), "%s%d", rtkSettingsEntries[i].name, x);
+
+                getSettingValue(inCommands, settingName, settingValue);
+                commandSendExecuteListResponse(settingName, "bool", settingValue);
+            }
+        }
+        break;
         case tNSCHost: {
             for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
             {
diff --git a/Firmware/RTK_Everywhere/menuSystem.ino b/Firmware/RTK_Everywhere/menuSystem.ino
index a551bca71..8a1674f12 100644
--- a/Firmware/RTK_Everywhere/menuSystem.ino
+++ b/Firmware/RTK_Everywhere/menuSystem.ino
@@ -163,6 +163,7 @@ void menuSystem()
         systemPrintf("Mode: %s\r\n", stateToRtkMode(systemState));
 
         // Support mode switching
+        systemPrintln("A) Switch to Base mode using Base Assist");
         systemPrintln("B) Switch to Base mode");
         systemPrintln("C) Switch to Base Caster mode");
         if (present.ethernet_ws5500 == true)
@@ -379,6 +380,12 @@ void menuSystem()
         }
 
         // Support mode switching
+        else if (incoming == 'A')
+        {
+            forceSystemStateUpdate = true; // Immediately go to this new state
+            baseCasterDisableOverride();   // Leave Caster mode
+            changeState(STATE_BASE_ASSIST_NOT_STARTED);
+        }
         else if (incoming == 'B')
         {
             forceSystemStateUpdate = true; // Immediately go to this new state
@@ -648,7 +655,8 @@ void menuDebugHardware()
             int newDelay = getUserInputNumber(); // Returns EXIT, TIMEOUT, or long
             if ((newDelay != INPUT_RESPONSE_GETNUMBER_EXIT) && (newDelay != INPUT_RESPONSE_GETNUMBER_TIMEOUT))
             {
-                settings.cliBlePrintDelay_ms = newDelay;
+                if ((newDelay >= 0) && (newDelay <= 1000))
+                    settings.cliBlePrintDelay_ms = newDelay;
             }
         }
 
@@ -715,6 +723,8 @@ void menuDebugNetwork()
         systemPrint("11) Print network layer status: ");
         systemPrintf("%s\r\n", settings.printNetworkStatus ? "Enabled" : "Disabled");
 
+        systemPrintf("12) NetworkClient write timeout: %ldms\r\n", settings.networkClientWriteTimeout_ms);
+
         // NTP
         systemPrint("20) Debug NTP: ");
         systemPrintf("%s\r\n", settings.debugNtp ? "Enabled" : "Disabled");
@@ -773,6 +783,16 @@ void menuDebugNetwork()
             settings.debugNetworkLayer ^= 1;
         else if (incoming == 11)
             settings.printNetworkStatus ^= 1;
+        else if (incoming == 12)
+        {
+            systemPrintf("Enter NetworkClient timeout (%d to %d): ", 100, 3000);
+            int newDelay = getUserInputNumber(); // Returns EXIT, TIMEOUT, or long
+            if ((newDelay != INPUT_RESPONSE_GETNUMBER_EXIT) && (newDelay != INPUT_RESPONSE_GETNUMBER_TIMEOUT))
+            {
+                if ((newDelay >= 100) && (newDelay <= 3000))
+                    settings.networkClientWriteTimeout_ms = newDelay;
+            }
+        }
         else if (incoming == 20)
             settings.debugNtp ^= 1;
         else if (incoming == 21)
diff --git a/Firmware/RTK_Everywhere/settings.h b/Firmware/RTK_Everywhere/settings.h
index 18be8d845..811ac56f7 100644
--- a/Firmware/RTK_Everywhere/settings.h
+++ b/Firmware/RTK_Everywhere/settings.h
@@ -61,6 +61,9 @@ typedef enum {
     tCmnRtNm,
     tCnRtRtB,
     tCnRtRtR,
+
+    tNSCEn,
+
     // Add new settings types above <---------------->
     // (Maintain the enum of existing settings types!)
 } RTK_Settings_Types;
@@ -92,34 +95,35 @@ typedef enum
     STATE_ROVER_RTK_FIX,                //  5
 
     STATE_BASE_CASTER_NOT_STARTED,      //  6, Set override flag
-    STATE_BASE_NOT_STARTED,             //  7
-    STATE_BASE_CONFIG_WAIT,             //  8
-    STATE_BASE_TEMP_SETTLE,             //  9, User has indicated base, but current pos accuracy is too low
-    STATE_BASE_TEMP_SURVEY_STARTED,     // 10
-    STATE_BASE_TEMP_TRANSMITTING,       // 11
-    STATE_BASE_FIXED_NOT_STARTED,       // 12
-    STATE_BASE_FIXED_TRANSMITTING,      // 13
-
-    STATE_DISPLAY_SETUP,                // 14
-    STATE_WEB_CONFIG_NOT_STARTED,       // 15
-    STATE_WEB_CONFIG_WAIT_FOR_NETWORK,  // 16
-    STATE_WEB_CONFIG,                   // 17
-    STATE_TEST,                         // 18
-    STATE_TESTING,                      // 19
-    STATE_PROFILE,                      // 20
-
-    STATE_KEYS_REQUESTED,               // 21
-
-    STATE_ESPNOW_PAIRING_NOT_STARTED,   // 22
-    STATE_ESPNOW_PAIRING,               // 23
-
-    STATE_NTPSERVER_NOT_STARTED,        // 24
-    STATE_NTPSERVER_NO_SYNC,            // 25
-    STATE_NTPSERVER_SYNC,               // 26
-
-    STATE_SHUTDOWN,                     // 27
-
-    STATE_NOT_SET,                      // 28, Must be last on list
+    STATE_BASE_ASSIST_NOT_STARTED,      //  7
+    STATE_BASE_NOT_STARTED,             //  8
+    STATE_BASE_CONFIG_WAIT,             //  9
+    STATE_BASE_TEMP_SETTLE,             // 10, User has indicated base, but current pos accuracy is too low
+    STATE_BASE_TEMP_SURVEY_STARTED,     // 11
+    STATE_BASE_TEMP_TRANSMITTING,       // 12
+    STATE_BASE_FIXED_NOT_STARTED,       // 13
+    STATE_BASE_FIXED_TRANSMITTING,      // 14
+
+    STATE_DISPLAY_SETUP,                // 15
+    STATE_WEB_CONFIG_NOT_STARTED,       // 16
+    STATE_WEB_CONFIG_WAIT_FOR_NETWORK,  // 17
+    STATE_WEB_CONFIG,                   // 18
+    STATE_TEST,                         // 19
+    STATE_TESTING,                      // 20
+    STATE_PROFILE,                      // 21
+
+    STATE_KEYS_REQUESTED,               // 22
+
+    STATE_ESPNOW_PAIRING_NOT_STARTED,   // 23
+    STATE_ESPNOW_PAIRING,               // 24
+
+    STATE_NTPSERVER_NOT_STARTED,        // 25
+    STATE_NTPSERVER_NO_SYNC,            // 26
+    STATE_NTPSERVER_SYNC,               // 27
+
+    STATE_SHUTDOWN,                     // 28
+
+    STATE_NOT_SET,                      // 29, Must be last on list
 } SystemState;
 volatile SystemState systemState = STATE_NOT_SET;
 SystemState lastSystemState = STATE_NOT_SET;
@@ -127,6 +131,7 @@ SystemState requestedSystemState = STATE_NOT_SET;
 bool newSystemStateRequested = false;
 
 // Base modes set with RTK_MODE
+#define RTK_MODE_BASE_UNDECIDED     0
 #define RTK_MODE_BASE_FIXED         0x0001  // 1 << 0
 #define RTK_MODE_BASE_SURVEY_IN     0x0002  // 1 << 1
 #define RTK_MODE_NTP                0x0004  // 1 << 2
@@ -444,142 +449,6 @@ enum PeriodDisplayValues
 #define PERIODIC_SETTING(x) (settings.periodicDisplay & PERIODIC_MASK(x))
 #define PERIODIC_TOGGLE(x) settings.periodicDisplay = settings.periodicDisplay ^ PERIODIC_MASK(x)
 
-#ifdef  COMPILE_NETWORK
-
-// NTRIP Server data
-typedef struct
-{
-    // Network connection used to push RTCM to NTRIP caster
-    NetworkClient *networkClient;
-    volatile uint8_t state;
-
-    // Count of bytes sent by the NTRIP server to the NTRIP caster
-    volatile uint32_t bytesSent;
-
-    // Throttle the time between connection attempts
-    // ms - Max of 4,294,967,295 or 4.3M seconds or 71,000 minutes or 1193 hours or 49 days between attempts
-    volatile uint32_t connectionAttemptTimeout;
-    volatile int connectionAttempts; // Count the number of connection attempts between restarts
-
-    // NTRIP server timer usage:
-    //  * Reconnection delay
-    //  * Measure the connection response time
-    //  * Receive RTCM correction data timeout
-    //  * Monitor last RTCM byte received for frame counting
-    volatile uint32_t timer;
-    volatile uint32_t startTime;
-    volatile int connectionAttemptsTotal; // Count the number of connection attempts absolutely
-
-    // Better debug printing by ntripServerProcessRTCM
-    volatile uint32_t rtcmBytesSent;
-    volatile uint32_t previousMilliseconds;
-
-
-    // Protect all methods that manipulate timer with a mutex - to avoid race conditions
-    // Remember that data is pushed to the servers by
-    // gnssReadTask -> processUart1Message -> processRTCM -> ntripServerProcessRTCM
-    SemaphoreHandle_t serverSemaphore = NULL;
-
-    unsigned long millisSinceTimer()
-    {
-        unsigned long retVal = 0;
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            retVal = millis() - timer;
-            xSemaphoreGive(serverSemaphore);
-        }
-        return retVal;
-    }
-
-    unsigned long millisSinceStartTime()
-    {
-        unsigned long retVal = 0;
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            retVal = millis() - startTime;
-            xSemaphoreGive(serverSemaphore);
-        }
-        return retVal;
-    }
-
-    void updateTimerAndBytesSent()
-    {
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            bytesSent = bytesSent + 1;
-            rtcmBytesSent = rtcmBytesSent + 1;
-            timer = millis();
-            xSemaphoreGive(serverSemaphore);
-        }
-    }
-
-    bool checkBytesSentAndReset(uint32_t timerLimit, uint32_t *totalBytesSent)
-    {
-        bool retVal = false;
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            if (((millis() - timer) > timerLimit) && (bytesSent > 0))
-            {
-                retVal = true;
-                *totalBytesSent = bytesSent;
-                bytesSent = 0;
-            }
-            xSemaphoreGive(serverSemaphore);
-        }
-        return retVal;
-    }
-
-    unsigned long getUptime()
-    {
-        unsigned long retVal = 0;
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            retVal = timer - startTime;
-            xSemaphoreGive(serverSemaphore);
-        }
-        return retVal;
-    }
-
-    void setTimerToMillis()
-    {
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            timer = millis();
-            xSemaphoreGive(serverSemaphore);
-        }
-    }
-
-    bool checkConnectionAttemptTimeout()
-    {
-        bool retVal = false;
-        if (serverSemaphore == NULL)
-            serverSemaphore = xSemaphoreCreateMutex();
-        if (xSemaphoreTake(serverSemaphore, 10 / portTICK_PERIOD_MS) == pdPASS)
-        {
-            if ((millis() - timer) >= connectionAttemptTimeout)
-            {
-                retVal = true;
-            }
-            xSemaphoreGive(serverSemaphore);
-        }
-        return retVal;
-    }
-} NTRIP_SERVER_DATA;
-
-#endif  // COMPILE_NETWORK
-
 typedef enum
 {
     ESPNOW_OFF = 0,
@@ -913,7 +782,7 @@ struct Settings
 
     // GNSS UART
     uint16_t serialGNSSRxFullThreshold = 50; // RX FIFO full interrupt. Max of ~128. See pinUART2Task().
-    int uartReceiveBufferSize = 1024 * 4; // This buffer is filled automatically as the UART receives characters. EVK needs 4K
+    int uartReceiveBufferSize = 1024 * 2; // This buffer is filled automatically as the UART receives characters
 
     // Hardware
     bool enableExternalHardwareEventLogging = false; // Log when INT/TM2 pin goes low
@@ -946,6 +815,8 @@ struct Settings
     // Network layer
     bool debugNetworkLayer = false;    // Enable debugging of the network layer
     bool printNetworkStatus = true;    // Print network status (delays, failovers, IP address)
+    // networkClient _timeout in ms (lib default is 3000). This limits write glitches to about 3.4s
+    uint32_t networkClientWriteTimeout_ms = 250;
 
     // NTP
     bool debugNtp = false;
@@ -979,6 +850,13 @@ struct Settings
     bool debugNtripServerState = false;
     bool enableNtripServer = false;
     bool enableRtcmMessageChecking = false;
+    bool ntripServer_CasterEnabled[NTRIP_SERVER_MAX] =
+    {
+        false,
+        false,
+        false,
+        false,
+    };
     char ntripServer_CasterHost[NTRIP_SERVER_MAX][NTRIP_SERVER_STRING_SIZE] = // It's free...
     {
         "rtk2go.com",
@@ -1614,6 +1492,7 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
     // Network layer
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.debugNetworkLayer, "debugNetworkLayer", nullptr, },
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.printNetworkStatus, "printNetworkStatus", nullptr, },
+    { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _uint32_t, 0, & settings.networkClientWriteTimeout_ms, "networkClientWriteTimeout", nullptr, },
 
 //                         F
 //                         a
@@ -1658,6 +1537,7 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.debugNtripServerState, "debugNtripServerState", nullptr, },
     { 1, 1, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.enableNtripServer, "enableNtripServer", nullptr, },
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.enableRtcmMessageChecking, "enableRtcmMessageChecking", nullptr, },
+    { 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tNSCEn,    NTRIP_SERVER_MAX, & settings.ntripServer_CasterEnabled[0], "ntripServerCasterEnabled_", nullptr, },
     { 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tNSCHost,  NTRIP_SERVER_MAX, & settings.ntripServer_CasterHost[0], "ntripServerCasterHost_", nullptr, },
     { 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tNSCPort,  NTRIP_SERVER_MAX, & settings.ntripServer_CasterPort[0], "ntripServerCasterPort_", nullptr, },
     { 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tNSCUser,  NTRIP_SERVER_MAX, & settings.ntripServer_CasterUser[0], "ntripServerCasterUser_", nullptr, },
@@ -2168,18 +2048,23 @@ extern NETWORK_POLL_SEQUENCE laraBootSequence[];
 extern NETWORK_POLL_SEQUENCE laraOffSequence[];
 extern NETWORK_POLL_SEQUENCE laraOnSequence[];
 
+typedef void (* NETWORK_UPDATE_METHOD)();
+extern void ethernetUpdate();
+extern void wifiStationUpdate();
+
 // networkInterfaceTable entry
 typedef struct _NETWORK_TABLE_ENTRY
 {
-    NetworkInterface * netif;       // Network interface object address
-    bool mDNS;                      // Set true to use mDNS service
-    NetIndex_t index;               // Table index, also default priority
-    uint8_t pdState;                // Periodic display state value
-    NETWORK_POLL_SEQUENCE * boot;   // Boot sequence, may be nullptr
-    NETWORK_POLL_SEQUENCE * start;  // Start sequence (Off --> On), may be nullptr
-    NETWORK_POLL_SEQUENCE * stop;   // Stop routine (On --> Off), may be nullptr
-    const char * name;              // Name of the network interface
-    bool * present;                 // Address of present bool or nullptr if always available
+    NetworkInterface * netif;           // Network interface object address
+    bool mDNS;                          // Set true to use mDNS service
+    NetIndex_t index;                   // Table index, also default priority
+    uint8_t pdState;                    // Periodic display state value
+    NETWORK_POLL_SEQUENCE * boot;       // Boot sequence, may be nullptr
+    NETWORK_POLL_SEQUENCE * start;      // Start sequence (Off --> On), may be nullptr
+    NETWORK_POLL_SEQUENCE * stop;       // Stop routine (On --> Off), may be nullptr
+    const char * name;                  // Name of the network interface
+    bool * present;                     // Address of present bool or nullptr if always available
+    NETWORK_UPDATE_METHOD updateMethod; // Update method
 } NETWORK_TABLE_ENTRY;
 
 // List of networks in default priority order!  These entries must match
@@ -2189,24 +2074,24 @@ typedef struct _NETWORK_TABLE_ENTRY
 // as the priority drops to that level. The stop routine is called as the
 // priority rises above that level. The priority will continue to fall or
 // rise until a network is found that is online.
-const NETWORK_TABLE_ENTRY networkInterfaceTable[] =
-{ //     Interface  mDNS    Index                   Periodic State      Boot Sequence           Start Sequence      Stop Sequence       Name                    Present
+NETWORK_TABLE_ENTRY networkInterfaceTable[] =
+{ //     Interface  mDNS    Index                   Periodic State      Boot Sequence           Start Sequence      Stop Sequence       Name                    Present                   Update method
     #ifdef COMPILE_ETHERNET
-        {&ETH,      true,   NETWORK_ETHERNET,       PD_ETHERNET_STATE,  nullptr,                nullptr,            nullptr,            "Ethernet",             &present.ethernet_ws5500},
+        {&ETH,      true,   NETWORK_ETHERNET,       PD_ETHERNET_STATE,  nullptr,                nullptr,            nullptr,            "Ethernet",             &present.ethernet_ws5500, ethernetUpdate},
     #else
-        {nullptr,   false,  NETWORK_ETHERNET,       PD_ETHERNET_STATE,  nullptr,                nullptr,            nullptr,            "Ethernet-NotCompiled", nullptr},
+        {nullptr,   false,  NETWORK_ETHERNET,       PD_ETHERNET_STATE,  nullptr,                nullptr,            nullptr,            "Ethernet-NotCompiled", nullptr,                  nullptr},
     #endif  // COMPILE_ETHERNET
 
     #ifdef COMPILE_WIFI
-        {&WiFi.STA, true,   NETWORK_WIFI_STATION,   PD_WIFI_STATE,      nullptr,                nullptr,            nullptr,            "WiFi Station",         nullptr},
+        {&WiFi.STA, true,   NETWORK_WIFI_STATION,   PD_WIFI_STATE,      nullptr,                nullptr,            nullptr,            "WiFi Station",         nullptr,                  wifiStationUpdate},
     #else
-        {nullptr,   false,  NETWORK_WIFI_STATION,   PD_WIFI_STATE,      nullptr,                nullptr,            nullptr,            "WiFi-NotCompiled",     nullptr},
+        {nullptr,   false,  NETWORK_WIFI_STATION,   PD_WIFI_STATE,      nullptr,                nullptr,            nullptr,            "WiFi-NotCompiled",     nullptr,                  nullptr},
     #endif  // COMPILE_WIFI
 
     #ifdef  COMPILE_CELLULAR
-        {&PPP,      false,  NETWORK_CELLULAR,       PD_CELLULAR_STATE,  laraBootSequence,       laraOnSequence,     laraOffSequence,    "Cellular",             &present.cellular_lara},
+        {&PPP,      false,  NETWORK_CELLULAR,       PD_CELLULAR_STATE,  laraBootSequence,       laraOnSequence,     laraOffSequence,    "Cellular",             &present.cellular_lara,   nullptr},
     #else
-        {nullptr,   false,  NETWORK_CELLULAR,       PD_CELLULAR_STATE,  nullptr,                nullptr,            nullptr,            "Cellular-NotCompiled", nullptr,            },
+        {nullptr,   false,  NETWORK_CELLULAR,       PD_CELLULAR_STATE,  nullptr,                nullptr,            nullptr,            "Cellular-NotCompiled", nullptr,                  nullptr},
     #endif  // COMPILE_CELLULAR
 };
 const int networkInterfaceTableEntries = sizeof(networkInterfaceTable) / sizeof(networkInterfaceTable[0]);
diff --git a/Firmware/Tools/Dinger.py b/Firmware/Tools/Dinger.py
new file mode 100644
index 000000000..311b9303e
--- /dev/null
+++ b/Firmware/Tools/Dinger.py
@@ -0,0 +1,51 @@
+import argparse
+import multiprocessing
+import serial
+from datetime import datetime
+
+def dinger(port, baud, find, printLines):
+    ser = serial.Serial(port, baud)
+    buffer = list(find)
+    for i in range(len(find)):
+        buffer[i] = ' '
+    while True:
+        for i in range(1, len(find)):
+            buffer[i-1] = buffer[i]
+        buffer[len(find) - 1] = ser.read()
+        s = ''
+        for c in buffer:
+            s += chr(ord(c))
+        if s == find:
+            print('\a') # Ding
+            print("Ding! " + str(find) + " found at " + datetime.now().isoformat())
+            if (printLines > 0):
+                for i in range (printLines):
+                    print(str(ser.readline())[2:-1])
+        
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='Dinger')
+
+    parser.add_argument('-port', type=str, default="COM1",
+                        help='COM port')
+
+    parser.add_argument('-baud', type=int, default=115200,
+                        help='Baud rate')
+
+    parser.add_argument('-find', type=str, default="# => ",
+                        help='Ding on this')
+
+    parser.add_argument('-print', type=int, default=1,
+                        help='Print following lines')
+
+    args = parser.parse_args()
+
+    proc = multiprocessing.Process(target = dinger, args = (args.port, args.baud, args.find, args.print))
+    proc.start()
+
+    try:
+        while True:
+            pass
+    except KeyboardInterrupt:
+        proc.terminate()
diff --git a/Firmware/Tools/NTRIP_Sink.py b/Firmware/Tools/NTRIP_Sink.py
new file mode 100644
index 000000000..5e489833c
--- /dev/null
+++ b/Firmware/Tools/NTRIP_Sink.py
@@ -0,0 +1,60 @@
+import socket
+import argparse
+import multiprocessing
+import time
+
+def client(server, port):
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.bind((server, port))
+    sock.listen()
+    totalBytes = 0
+    lastBytes = 0
+    startTime = time.time()
+    while True:
+        print("Waiting for new connection")
+        conn, addr = sock.accept()
+        print("Connection from " + str(addr))
+        print("Sending ICY 200 OK")
+        conn.send(b"ICY 200 OK")
+        conn.settimeout(5.0)
+        keepGoing = True
+        while keepGoing:
+            try:
+                payload = conn.recv(1024)
+            except TimeoutError:
+                keepGoing = False
+            totalBytes += len(payload)
+            if time.time() - startTime > 5:
+                startTime = time.time()
+                rate = int((totalBytes - lastBytes) / 5)
+                lastBytes = totalBytes
+                print("Total bytes: " + str(totalBytes) + " (" + str(rate) + " Bps)")
+        conn.close()
+        print()
+        
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='TCP Server')
+
+    parser.add_argument('-server', type=str, default="",
+                        help='Host Name or IP Address (e.g. 127.0.0.1 localhost)')
+
+    parser.add_argument('-port', type=int, default=2101,
+                        help='TCP Port Number')
+
+    args = parser.parse_args()
+
+    if (args.server != ""):
+        print("Listening on " + args.server + ":" + str(args.port))
+    else:
+        print("Listening on port " + str(args.port))
+
+    proc = multiprocessing.Process(target = client, args = (args.server, args.port))
+    proc.start()
+
+    try:
+        while True:
+            pass
+    except KeyboardInterrupt:
+        proc.terminate()