diff --git a/Code/data/config.html b/Code/data/config.html
index 8190b24d..3361e2c6 100644
--- a/Code/data/config.html
+++ b/Code/data/config.html
@@ -140,6 +140,7 @@
                             <option value="21">Set R (internal use)</option>
                             <option value="22">Reset filter rinse timer (-)</option>
                             <option value="23">Reset filter clean timer (-)</option>
+                            <option value="24">Set power on/off (0/1)</option>
                         </select>
                     </td>
                 </tr>
@@ -290,12 +291,13 @@ <h2>Command queue</h2>
 const setR = 21;
 const resetrinsefiltertimer = 22;
 const resetcleanfiltertimer = 23;
+const setpower = 24;
 
 const commandlist = [
 	'Set target', 'Set unit', 'Set bubbles', 'Set heat', 'Set pump', 'Reset queue', 'Reboot ESP',
 	'Internal cmd', 'Reset times', 'Reset Cl timer', 'Reset change filter timer', 'Set jets', 'Set brightness',
 	'Beep', 'Set ambient temp F.', 'Set ambient temp C.', 'Reset daily meter', 'Take control', 'Full power',
-    'Print text', 'Set ready', 'Set R', 'Reset rinse filter timer', 'Reset clean filter timer'
+    'Print text', 'Set ready', 'Set R', 'Reset rinse filter timer', 'Reset clean filter timer', 'Set power'
 ];
 
 function totimestamp()
diff --git a/Code/data/mqtt.html b/Code/data/mqtt.html
index 23cea464..2b8bbe7f 100644
--- a/Code/data/mqtt.html
+++ b/Code/data/mqtt.html
@@ -46,34 +46,31 @@
 					<td><input type="checkbox" id="enableMqtt"></td>
 				</tr>
 				<tr>
-					<td>IP Address:</td>
+					<td>MQTT host addr:</td>
 					<td>
-						<input type="text" id="mqttIpAddress1" maxlength="3" style="width:30px">
-						. <input type="text" id="mqttIpAddress2" maxlength="3" style="width:30px">
-						. <input type="text" id="mqttIpAddress3" maxlength="3" style="width:30px">
-						. <input type="text" id="mqttIpAddress4" maxlength="3" style="width:30px">
+						<input type="text" id="mqttHost" maxlength="63" value="IP or FQDN of the broker">
 					</td>
 				</tr>
 				<tr>
 					<td>Port:</td>
-					<td><input type="text" id="mqttPort"></td>
+					<td><input type="text" id="mqttPort" maxlength="31"></td>
 				</tr>
 				<tr>
 					<td>Username:</td>
-					<td><input type="text" id="mqttUsername"></td>
+					<td><input type="text" id="mqttUsername" maxlength="31"></td>
 				</tr>
 				<tr>
 					<td>Password:</td>
-					<td><input type="text" id="mqttPassword"></td>
+					<td><input type="text" id="mqttPassword" maxlength="31"></td>
 					<!--<td><input type="password" id="mqttPassword"><input type="checkbox" onclick="togglePlainText('mqttPassword')"></td>-->
 				</tr>
 				<tr>
 					<td>Client ID:</td>
-					<td><input type="text" id="mqttClientId"></td>
+					<td><input type="text" id="mqttClientId" maxlength="31"></td>
 				</tr>
 				<tr>
 					<td>Base Topic:</td>
-					<td><input type="text" id="mqttBaseTopic"></td>
+					<td><input type="text" id="mqttBaseTopic" maxlength="31"></td>
 				</tr>
 				<tr>
 					<td>Telemetry Interval (s):</td>
@@ -179,10 +176,10 @@
 			var json = JSON.parse(req.responseText);
 			console.log(json);
 			document.getElementById('enableMqtt').checked = json.enableMqtt;
-			document.getElementById('mqttIpAddress1').value = json.mqttIpAddress[0];
-			document.getElementById('mqttIpAddress2').value = json.mqttIpAddress[1];
-			document.getElementById('mqttIpAddress3').value = json.mqttIpAddress[2];
-			document.getElementById('mqttIpAddress4').value = json.mqttIpAddress[3];
+			document.getElementById('mqttHost').value = json.mqttHost;
+			// document.getElementById('mqttIpAddress2').value = json.mqttIpAddress[1];
+			// document.getElementById('mqttIpAddress3').value = json.mqttIpAddress[2];
+			// document.getElementById('mqttIpAddress4').value = json.mqttIpAddress[3];
 			document.getElementById('mqttPort').value = json.mqttPort;
 			document.getElementById('mqttUsername').value = json.mqttUsername;
 			document.getElementById('mqttPassword').value = json.mqttPassword;
@@ -203,12 +200,13 @@
 	req.open('POST', '/setmqtt/');
 	var json = {
 		'enableMqtt':(document.getElementById('enableMqtt').checked),
-		'mqttIpAddress':[
-			parseInt(document.getElementById('mqttIpAddress1').value),
-			parseInt(document.getElementById('mqttIpAddress2').value),
-			parseInt(document.getElementById('mqttIpAddress3').value),
-			parseInt(document.getElementById('mqttIpAddress4').value)
-		],
+		// 'mqttIpAddress':[
+		// 	parseInt(document.getElementById('mqttIpAddress1').value),
+		// 	parseInt(document.getElementById('mqttIpAddress2').value),
+		// 	parseInt(document.getElementById('mqttIpAddress3').value),
+		// 	parseInt(document.getElementById('mqttIpAddress4').value)
+		// ],
+        'mqttHost':(document.getElementById('mqttHost').value),
 		'mqttPort':parseInt(document.getElementById('mqttPort').value),
 		'mqttUsername':(document.getElementById('mqttUsername').value),
 		'mqttPassword':(document.getElementById('mqttPassword').value),
diff --git a/Code/lib/BWC_unified/FW_VERSION.h b/Code/lib/BWC_unified/FW_VERSION.h
index db8781ed..2335b3d7 100644
--- a/Code/lib/BWC_unified/FW_VERSION.h
+++ b/Code/lib/BWC_unified/FW_VERSION.h
@@ -1 +1 @@
-#define FW_VERSION "2024-07-23-1743"
+#define FW_VERSION "2024-10-07-1913"
diff --git a/Code/lib/BWC_unified/bwc.cpp b/Code/lib/BWC_unified/bwc.cpp
index 62b6b737..4f8a2c26 100644
--- a/Code/lib/BWC_unified/bwc.cpp
+++ b/Code/lib/BWC_unified/bwc.cpp
@@ -445,8 +445,8 @@ void BWC::_handleCommandQ() {
 bool BWC::_handlecommand(Commands cmd, int64_t val, const String& txt="")
 {
     bool restartESP = false;
-    
-    dsp->text += String(" ") + txt;
+
+    _format_text(txt);
     switch (cmd)
     {
     case SETTARGET:
@@ -595,6 +595,10 @@ bool BWC::_handlecommand(Commands cmd, int64_t val, const String& txt="")
         _vt_calibrated = true;
         _save_settings_needed = true;
         break;
+    case SETPOWER:
+        val = std::clamp((int)val, 0, 1);
+        cio->cio_toggles.power_change = (val != cio->cio_states.power);
+        break;
     default:
         break;
     }
@@ -615,6 +619,63 @@ bool BWC::_handlecommand(Commands cmd, int64_t val, const String& txt="")
     return false;
 }
 
+void BWC::_format_text(const String &txt)
+{
+    dsp->text += ' ';
+
+    /* Check for special character '<>' surrounding variable field */
+    /* Example "T <time>" would show "T 12 44" */
+    /*
+        possible field variables suggestion:
+        time
+        IP-addr
+        date
+
+    */
+
+    String field;
+    bool fieldmode = false;
+    field.reserve(15);
+    String formatted_text;
+    formatted_text.reserve(63);
+    for(unsigned int i = 0; i < txt.length(); i++)
+    {
+        if(txt[i] == '>') 
+        {
+            //process field
+            if(field.equals(F("time")))
+            {
+                //copy new fieldstring to formatted_text
+                tm buf;
+                time_t t = time(NULL);
+                gmtime_r(&t, &buf);
+                formatted_text += String(buf.tm_hour);
+                formatted_text += ' ';
+                formatted_text += String(buf.tm_min);
+            }
+            //other if statements go here
+
+            //set fieldmode off
+            fieldmode = false;
+            field.clear();
+        }
+        else if(txt[i] == '<')
+        {
+            //set fieldmode on
+            fieldmode = true;
+        }
+        else
+        {
+            //if fieldmode off - copy char to formatted_text
+            //else copy char to field
+            if(fieldmode) field += txt[i];
+            else formatted_text += txt[i];
+        }
+    }
+
+    dsp->text += formatted_text;
+}
+
 void BWC::_handleStateChanges()
 {
     if(_prev_cio_states != cio->cio_states || _prev_dsp_states.brightness != dsp->dsp_states.brightness) _new_data_available = true;
@@ -1528,7 +1589,7 @@ void BWC::_saveCommandQueue(){
         BWC_LOG_P(PSTR("Failed to save cmdq.json\n"),0);
         return;
     } else {
-        BWC_LOG_P(PSTR("Writing cmdq.json: "),0);
+        BWC_LOG_P(PSTR("Writing cmdq.json\n"),0);
     }
     /*Do not save instant reboot command. Don't ask me how I know.*/
     if(_command_que.size())
diff --git a/Code/lib/BWC_unified/bwc.h b/Code/lib/BWC_unified/bwc.h
index 77af1401..8143e4d4 100644
--- a/Code/lib/BWC_unified/bwc.h
+++ b/Code/lib/BWC_unified/bwc.h
@@ -16,25 +16,13 @@
 #include <vector>
 #include <optional>
 #include "enums.h"
-#include "CIO_PRE2021.h"
-#include "CIO_2021.h"
-#include "CIO_2021HJT.h"
-#include "CIO_54149E.h"
-#include "CIO_54173.h"
-#include "CIO_54154.h"
-#include "CIO_54144.h"
-#include "CIO_54138.h"
-#include "CIO_54123.h"
+#include "CIO_4W_MODEL_SPECIFIC.h"
+#include "CIO_TYPE1_MODEL_SPECIFIC.h"
+#include "CIO_TYPE2_MODEL_SPECIFIC.h"
 
-#include "DSP_PRE2021.h"
-#include "DSP_2021.h"
-#include "DSP_2021HJT.h"
-#include "DSP_54149E.h"
-#include "DSP_54173.h"
-#include "DSP_54154.h"
-#include "DSP_54144.h"
-#include "DSP_54138.h"
-#include "DSP_54123.h"
+#include "DSP_4W_MODEL_SPECIFIC.h"
+#include "DSP_TYPE1_MODEL_SPECIFIC.h"
+#include "DSP_TYPE2_MODEL_SPECIFIC.h"
 
 #include "FW_VERSION.h"
 #include "bwc_debug.h"
@@ -111,7 +99,8 @@ class BWC {
 
     private:
         bool _loadHardware(Models& cioNo, Models& dspNo, int pins[], std::optional<Power>& power_levels);
-        bool _handlecommand(Commands cmd, int64_t val, const String& txt);
+        bool _handlecommand(Commands cmd, int64_t val, const String &txt);
+        void _format_text(const String &txt);
         void _handleCommandQ();
         void _loadSettings();
         void _saveCommandQueue();
diff --git a/Code/lib/BWC_unified/enums.h b/Code/lib/BWC_unified/enums.h
index d4e75bb6..a552e5d5 100644
--- a/Code/lib/BWC_unified/enums.h
+++ b/Code/lib/BWC_unified/enums.h
@@ -81,7 +81,8 @@ enum Commands: byte
     SETREADY,
     SETR,
     RESETFRINSETIMER,
-    RESETFCLEANTIMER
+    RESETFCLEANTIMER,
+    SETPOWER
 };
 
 enum ToggleButtons: byte
diff --git a/Code/lib/cio/CIO_2021.cpp b/Code/lib/cio/CIO_2021.cpp
deleted file mode 100644
index 4e03c2e1..00000000
--- a/Code/lib/cio/CIO_2021.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "CIO_2021.h"
-
-uint16_t CIO_2021::getButtonCode(Buttons index)
-{
-    if(index >= sizeof(button_codes)/sizeof(uint16_t)) return 0;
-    return button_codes[index];
-}
-
-Buttons CIO_2021::getButton(uint16_t code)
-{
-    for(unsigned int i = 0; i < sizeof(button_codes)/sizeof(uint16_t); i++){
-        if(_button_code == button_codes[i]) return (Buttons)i;
-    }
-    return (Buttons)0;
-}
diff --git a/Code/lib/cio/CIO_2021.h b/Code/lib/cio/CIO_2021.h
deleted file mode 100644
index b9d7fa75..00000000
--- a/Code/lib/cio/CIO_2021.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_TYPE1.h"
-
-class CIO_2021: public CIO_6_TYPE1
-{
-    /*These must be declared for the API to work*/
-    public:
-        String getModel(){return _MYMODEL;};
-
-    /*internal use*/
-    public:
-        /*Only use for debugging*/
-        uint16_t getButtonCode(Buttons button_index) override;
-        Buttons getButton(uint16_t code) override;
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    /*These must be declared for the API to work*/
-    public:
-        const String _MYMODEL = "MIAMI2021";
-        const bool _HASJETS = false;
-        const bool _HASAIR = true;
-
-    private:
-        /*Binary representation of button presses on the display, like 0x1B1B.*/
-        uint16_t button_codes[10] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0809, 0x1012, 0x1112, 0x1312, 0x0200, 0x0000 };
-};
diff --git a/Code/lib/cio/CIO_2021HJT.cpp b/Code/lib/cio/CIO_2021HJT.cpp
deleted file mode 100644
index cbee9d38..00000000
--- a/Code/lib/cio/CIO_2021HJT.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "CIO_2021HJT.h"
-
-uint16_t CIO_2021_HJT::getButtonCode(Buttons index)
-{
-    if(index >= sizeof(button_codes)/sizeof(uint16_t)) return 0;
-    return button_codes[index];
-}
-
-Buttons CIO_2021_HJT::getButton(uint16_t code)
-{
-    for(unsigned int i = 0; i < sizeof(button_codes)/sizeof(uint16_t); i++){
-        if(_button_code == button_codes[i]) return (Buttons)i;
-    }
-    return (Buttons)0;
-}
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_2021HJT.h b/Code/lib/cio/CIO_2021HJT.h
deleted file mode 100644
index 9ac132d8..00000000
--- a/Code/lib/cio/CIO_2021HJT.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_TYPE1.h"
-
-class CIO_2021_HJT: public CIO_6_TYPE1
-{
-    /*These must be declared for the API to work*/
-    public:
-        String getModel(){return _MYMODEL;};
-
-    /*internal use*/
-    public:
-        /*Only use for debugging*/
-        uint16_t getButtonCode(Buttons button_index) override;
-        Buttons getButton(uint16_t code) override;
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    /*These must be declared for the API to work*/
-    public:
-        const String _MYMODEL = "MALDIVES2021";
-        const bool _HASJETS = true;
-        const bool _HASAIR = true;
-
-    private:
-        /*Binary representation of button presses on the display, like 0x1B1B.*/
-        uint16_t button_codes[11] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0a09, 0x1012, 0x1312, 0x0809, 0x0200, 0x0000, 0x1112 };
-};
diff --git a/Code/lib/cio/CIO_4W.h b/Code/lib/cio/CIO_4W.h
index f6c903fc..c2f67f0c 100644
--- a/Code/lib/cio/CIO_4W.h
+++ b/Code/lib/cio/CIO_4W.h
@@ -2,11 +2,8 @@
 #include <Arduino.h>
 #include <SoftwareSerial.h>
 #include "enums.h"
-#include "CIO_BASE.h"
 #include <umm_malloc/umm_heap_select.h>
-
-
-class BWC;
+#include "CIO_BASE.h"
 
 class CIO_4W : public CIO
 {
diff --git a/Code/lib/cio/CIO_4W_MODEL_SPECIFIC.h b/Code/lib/cio/CIO_4W_MODEL_SPECIFIC.h
new file mode 100644
index 00000000..e3f7fc13
--- /dev/null
+++ b/Code/lib/cio/CIO_4W_MODEL_SPECIFIC.h
@@ -0,0 +1,254 @@
+#pragma once
+#include <Arduino.h>
+#include "enums.h"
+#include "CIO_4W.h"
+
+class CIO_54123: public CIO_4W
+{
+    public:
+        String getModel(){return _MYMODEL;};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54123";
+        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
+        //#NO54112 - @jenswalit: "this is the Version Vegas 4Pin Pump 1->5V+ 2->Data 3->Data 4->5V-"
+        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
+        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
+        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
+        //everything else off. (1,0,0,0)
+        const uint8_t JUMPTABLE[4][4] = {
+        {1,0,2,3},
+        {0,1,2,3},
+        {1,2,0,3},
+        {1,3,0,2}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[4][4] = {
+        {0,0,0,0},
+        {1,0,0,0},
+        {0,0,1,0},
+        {0,0,1,2}  //the "2" means both heater elements
+        };
+
+        const uint8_t PUMPBITMASK =    B00010000;  //1 << 4;
+        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
+        const uint8_t JETSBITMASK =   B00000000;  //0;  //no jets on this machine.
+        const uint8_t HEATBITMASK1 =   B00000010;  //(1 << 1) "stage 1"
+        const uint8_t HEATBITMASK2 =   B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
+        const uint8_t POWERBITMASK =   B00000001;  //1;
+        const bool _HASJETS = false;
+        const bool _HASAIR = true;
+};
+
+class CIO_54138: public CIO_4W
+{
+    public:
+        String getModel(){return _MYMODEL;};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54138";
+        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
+        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
+        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
+        //everything else off. (1,0,0,0)
+        const uint8_t JUMPTABLE[5][4] = {
+        {1,2,3,4},
+        {0,2,3,4},
+        {1,0,3,4},
+        {1,2,0,4},
+        {1,2,0,3}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[5][4] = {
+        {0,0,0,0},
+        {1,0,0,0},
+        {0,1,0,0},
+        {0,0,1,0},
+        {0,0,1,2}  //the "2" means both heater elements
+        };
+
+        const uint8_t PUMPBITMASK =   B00000101;  //5
+        const uint8_t BUBBLESBITMASK =   B00000010;  //2
+        const uint8_t JETSBITMASK =   B00001000;  //8
+        const uint8_t HEATBITMASK1 =   B00110000;  //48 heater stage 1 = 50%
+        const uint8_t HEATBITMASK2 =   B01000000;  //64 heater stage 2 = 100%
+        //lines below should be tested. It would be consistent with 54173 model.
+        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
+        //const uint8_t HEATBITMASK1 =   B00000000;  //00  heater stage 1 = off
+        //const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
+        const uint8_t POWERBITMASK =   B10000000;  //128
+        const bool _HASJETS = true;
+        const bool _HASAIR = true;
+};
+
+class CIO_54144: public CIO_4W
+{
+    public:
+        String getModel(){return _MYMODEL;};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54144";
+        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
+        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
+        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
+        //everything else off. (1,0,0,0)
+        const uint8_t JUMPTABLE[5][4] = {
+        // b,j,p,h
+        {1,2,3,4},
+        {0,2,3,4},
+        {1,0,3,4},
+        {1,2,0,4},
+        {1,2,0,3}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[5][4] = {
+        {0,0,0,0},
+        {1,0,0,0},
+        {0,1,0,0},
+        {0,0,1,0},
+        {0,0,1,2}  //the "2" means both heater elements
+        };
+
+        const uint8_t PUMPBITMASK =   B00000101;  //5
+        const uint8_t BUBBLESBITMASK =   B00000010;  //2
+        const uint8_t JETSBITMASK =   B00001000;  //8
+        // const uint8_t HEATBITMASK1 =   B00000000;  //0    heater stage 1 = off
+        // const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
+        //lines below should be tested. It would be consistent with 54173 model.
+        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
+        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
+        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
+        const uint8_t POWERBITMASK =   B10000000;  //128
+        const bool _HASJETS = true;
+        const bool _HASAIR = false;
+};
+
+class CIO_54154: public CIO_4W
+{
+    public:
+        String getModel(){return _MYMODEL;};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54154";
+        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
+        //Requested by @chunkysteveo
+        const uint8_t JUMPTABLE[6][4] = {
+        {3,0,1,2},
+        {4,1,0,2},
+        {5,2,0,1},
+        {0,3,4,5},
+        {1,4,3,5},
+        {2,5,3,4}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[6][4] = {
+        {0,0,0,0},
+        {0,0,1,0},
+        {0,0,1,2},
+        {1,0,0,0},  //the "2" means both heater elements
+        {1,0,1,0},
+        {1,0,1,1}
+        };
+
+        const uint8_t PUMPBITMASK =    B00010000;  //1 << 4;
+        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
+        const uint8_t JETSBITMASK =   B00000000;  //0;  //no jets on this machine.
+        const uint8_t HEATBITMASK1 =   B00000010;  //(1 << 1) "stage 1"
+        const uint8_t HEATBITMASK2 =   B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
+        const uint8_t POWERBITMASK =   B00000001;  //1;
+        const bool _HASJETS = false;
+        const bool _HASAIR = true;
+};
+
+class CIO_54173: public CIO_4W
+{
+    public:
+        String getModel(){return _MYMODEL;}
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} 
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} 
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} 
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} 
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} 
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} 
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];}
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];}
+        bool getHasjets() override {return _HASJETS;}
+        bool getHasair() override {return _HASAIR;}
+
+    private:
+        const String _MYMODEL = "NO54173";
+        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
+        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
+        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
+        //everything else off. (1,0,0,0)
+        const uint8_t JUMPTABLE[8][4] = {
+        {6,4,1,3},
+        {7,4,0,3},
+        {3,5,6,7},
+        {2,4,0,1},
+        {5,0,1,3},
+        {4,6,1,3},
+        {0,5,7,2},
+        {1,5,6,2}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[8][4] = {
+        {0,0,0,0},
+        {0,0,1,0},
+        {1,0,1,1},
+        {0,0,1,2},  //the "2" means both heater elements
+        {0,1,0,0},
+        {1,1,0,0},
+        {1,0,0,0},
+        {1,0,1,0}
+        };
+
+        const uint8_t PUMPBITMASK =   B00000101;  //5
+        const uint8_t BUBBLESBITMASK =   B00000010;  //2
+        const uint8_t JETSBITMASK =   B00001000;  //8
+        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
+        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
+        const uint8_t POWERBITMASK =   B10000000;  //128
+        const bool _HASJETS = true;
+        const bool _HASAIR = true;
+};
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_54123.h b/Code/lib/cio/CIO_54123.h
deleted file mode 100644
index c646256d..00000000
--- a/Code/lib/cio/CIO_54123.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_4W.h"
-
-class CIO_54123: public CIO_4W
-{
-    public:
-        String getModel(){return _MYMODEL;};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54123";
-        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
-        //#NO54112 - @jenswalit: "this is the Version Vegas 4Pin Pump 1->5V+ 2->Data 3->Data 4->5V-"
-        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
-        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
-        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
-        //everything else off. (1,0,0,0)
-        const uint8_t JUMPTABLE[4][4] = {
-        {1,0,2,3},
-        {0,1,2,3},
-        {1,2,0,3},
-        {1,3,0,2}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[4][4] = {
-        {0,0,0,0},
-        {1,0,0,0},
-        {0,0,1,0},
-        {0,0,1,2}  //the "2" means both heater elements
-        };
-
-        const uint8_t PUMPBITMASK =    B00010000;  //1 << 4;
-        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
-        const uint8_t JETSBITMASK =   B00000000;  //0;  //no jets on this machine.
-        const uint8_t HEATBITMASK1 =   B00000010;  //(1 << 1) "stage 1"
-        const uint8_t HEATBITMASK2 =   B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
-        const uint8_t POWERBITMASK =   B00000001;  //1;
-        const bool _HASJETS = false;
-        const bool _HASAIR = true;
-};
diff --git a/Code/lib/cio/CIO_54138.h b/Code/lib/cio/CIO_54138.h
deleted file mode 100644
index 6a146e87..00000000
--- a/Code/lib/cio/CIO_54138.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_4W.h"
-
-class CIO_54138: public CIO_4W
-{
-    public:
-        String getModel(){return _MYMODEL;};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54138";
-        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
-        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
-        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
-        //everything else off. (1,0,0,0)
-        const uint8_t JUMPTABLE[5][4] = {
-        {1,2,3,4},
-        {0,2,3,4},
-        {1,0,3,4},
-        {1,2,0,4},
-        {1,2,0,3}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[5][4] = {
-        {0,0,0,0},
-        {1,0,0,0},
-        {0,1,0,0},
-        {0,0,1,0},
-        {0,0,1,2}  //the "2" means both heater elements
-        };
-
-        const uint8_t PUMPBITMASK =   B00000101;  //5
-        const uint8_t BUBBLESBITMASK =   B00000010;  //2
-        const uint8_t JETSBITMASK =   B00001000;  //8
-        const uint8_t HEATBITMASK1 =   B00110000;  //48 heater stage 1 = 50%
-        const uint8_t HEATBITMASK2 =   B01000000;  //64 heater stage 2 = 100%
-        //lines below should be tested. It would be consistent with 54173 model.
-        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
-        //const uint8_t HEATBITMASK1 =   B00000000;  //00  heater stage 1 = off
-        //const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
-        const uint8_t POWERBITMASK =   B10000000;  //128
-        const bool _HASJETS = true;
-        const bool _HASAIR = true;
-};
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_54144.h b/Code/lib/cio/CIO_54144.h
deleted file mode 100644
index 6ff05ed1..00000000
--- a/Code/lib/cio/CIO_54144.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_4W.h"
-
-class CIO_54144: public CIO_4W
-{
-    public:
-        String getModel(){return _MYMODEL;};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54144";
-        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
-        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
-        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
-        //everything else off. (1,0,0,0)
-        const uint8_t JUMPTABLE[5][4] = {
-        // b,j,p,h
-        {1,2,3,4},
-        {0,2,3,4},
-        {1,0,3,4},
-        {1,2,0,4},
-        {1,2,0,3}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[5][4] = {
-        {0,0,0,0},
-        {1,0,0,0},
-        {0,1,0,0},
-        {0,0,1,0},
-        {0,0,1,2}  //the "2" means both heater elements
-        };
-
-        const uint8_t PUMPBITMASK =   B00000101;  //5
-        const uint8_t BUBBLESBITMASK =   B00000010;  //2
-        const uint8_t JETSBITMASK =   B00001000;  //8
-        // const uint8_t HEATBITMASK1 =   B00000000;  //0    heater stage 1 = off
-        // const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
-        //lines below should be tested. It would be consistent with 54173 model.
-        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
-        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
-        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
-        const uint8_t POWERBITMASK =   B10000000;  //128
-        const bool _HASJETS = true;
-        const bool _HASAIR = false;
-};
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_54154.h b/Code/lib/cio/CIO_54154.h
deleted file mode 100644
index 2fcd6117..00000000
--- a/Code/lib/cio/CIO_54154.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_4W.h"
-
-class CIO_54154: public CIO_4W
-{
-    public:
-        String getModel(){return _MYMODEL;};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54154";
-        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
-        //Requested by @chunkysteveo
-        const uint8_t JUMPTABLE[6][4] = {
-        {3,0,1,2},
-        {4,1,0,2},
-        {5,2,0,1},
-        {0,3,4,5},
-        {1,4,3,5},
-        {2,5,3,4}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[6][4] = {
-        {0,0,0,0},
-        {0,0,1,0},
-        {0,0,1,2},
-        {1,0,0,0},  //the "2" means both heater elements
-        {1,0,1,0},
-        {1,0,1,1}
-        };
-
-        const uint8_t PUMPBITMASK =    B00010000;  //1 << 4;
-        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
-        const uint8_t JETSBITMASK =   B00000000;  //0;  //no jets on this machine.
-        const uint8_t HEATBITMASK1 =   B00000010;  //(1 << 1) "stage 1"
-        const uint8_t HEATBITMASK2 =   B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
-        const uint8_t POWERBITMASK =   B00000001;  //1;
-        const bool _HASJETS = false;
-        const bool _HASAIR = true;
-};
diff --git a/Code/lib/cio/CIO_54173.h b/Code/lib/cio/CIO_54173.h
deleted file mode 100644
index 9b2dc605..00000000
--- a/Code/lib/cio/CIO_54173.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_4W.h"
-
-class CIO_54173: public CIO_4W
-{
-    public:
-        String getModel(){return _MYMODEL;}
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} 
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} 
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} 
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} 
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} 
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} 
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];}
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];}
-        bool getHasjets() override {return _HASJETS;}
-        bool getHasair() override {return _HASAIR;}
-
-    private:
-        const String _MYMODEL = "NO54173";
-        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
-        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
-        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
-        //everything else off. (1,0,0,0)
-        const uint8_t JUMPTABLE[8][4] = {
-        {6,4,1,3},
-        {7,4,0,3},
-        {3,5,6,7},
-        {2,4,0,1},
-        {5,0,1,3},
-        {4,6,1,3},
-        {0,5,7,2},
-        {1,5,6,2}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[8][4] = {
-        {0,0,0,0},
-        {0,0,1,0},
-        {1,0,1,1},
-        {0,0,1,2},  //the "2" means both heater elements
-        {0,1,0,0},
-        {1,1,0,0},
-        {1,0,0,0},
-        {1,0,1,0}
-        };
-
-        const uint8_t PUMPBITMASK =   B00000101;  //5
-        const uint8_t BUBBLESBITMASK =   B00000010;  //2
-        const uint8_t JETSBITMASK =   B00001000;  //8
-        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
-        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
-        const uint8_t POWERBITMASK =   B10000000;  //128
-        const bool _HASJETS = true;
-        const bool _HASAIR = true;
-};
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_PRE2021.cpp b/Code/lib/cio/CIO_PRE2021.cpp
deleted file mode 100644
index be6677b4..00000000
--- a/Code/lib/cio/CIO_PRE2021.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "CIO_PRE2021.h"
-
-Buttons CIO_PRE2021::getButton(uint16_t code)
-{
-    for(unsigned int i = 0; i < sizeof(button_codes)/sizeof(uint16_t); i++){
-        if(_button_code == button_codes[i]) return (Buttons)i;
-    }
-    return (Buttons)0;
-}
-
-uint16_t CIO_PRE2021::getButtonCode(Buttons index)
-{
-    if(index >= sizeof(button_codes)/sizeof(uint16_t)) return 0;
-    return button_codes[index];
-}
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_PRE2021.h b/Code/lib/cio/CIO_PRE2021.h
deleted file mode 100644
index af6d9791..00000000
--- a/Code/lib/cio/CIO_PRE2021.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "CIO_TYPE1.h"
-
-class CIO_PRE2021 : public CIO_6_TYPE1
-{
-    public:
-        String getModel(){return _MYMODEL;};
-        uint16_t getButtonCode(Buttons button_index) override;
-        Buttons getButton(uint16_t code) override;
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "PRE2021";
-        /*Binary representation of button presses on the display, like 0x1B1B.*/
-        uint16_t button_codes[10] = { 0x1B1B, 0x0200, 0x0100, 0x0300, 0x1012, 0x1212, 0x1112, 0x1312, 0x0809, 0x0000 };
-        const bool _HASJETS = false;
-        const bool _HASAIR = true;
-
-};
diff --git a/Code/lib/cio/CIO_TYPE1_MODEL_SPECIFIC.cpp b/Code/lib/cio/CIO_TYPE1_MODEL_SPECIFIC.cpp
new file mode 100644
index 00000000..445b494d
--- /dev/null
+++ b/Code/lib/cio/CIO_TYPE1_MODEL_SPECIFIC.cpp
@@ -0,0 +1,43 @@
+#include "CIO_TYPE1_MODEL_SPECIFIC.h"
+
+Buttons CIO_PRE2021::getButton(uint16_t code)
+{
+    for(unsigned int i = 0; i < sizeof(button_codes)/sizeof(uint16_t); i++){
+        if(_button_code == button_codes[i]) return (Buttons)i;
+    }
+    return (Buttons)0;
+}
+
+uint16_t CIO_PRE2021::getButtonCode(Buttons index)
+{
+    if(index >= sizeof(button_codes)/sizeof(uint16_t)) return 0;
+    return button_codes[index];
+}
+
+uint16_t CIO_2021_HJT::getButtonCode(Buttons index)
+{
+    if(index >= sizeof(button_codes)/sizeof(uint16_t)) return 0;
+    return button_codes[index];
+}
+
+Buttons CIO_2021_HJT::getButton(uint16_t code)
+{
+    for(unsigned int i = 0; i < sizeof(button_codes)/sizeof(uint16_t); i++){
+        if(_button_code == button_codes[i]) return (Buttons)i;
+    }
+    return (Buttons)0;
+}
+
+uint16_t CIO_2021::getButtonCode(Buttons index)
+{
+    if(index >= sizeof(button_codes)/sizeof(uint16_t)) return 0;
+    return button_codes[index];
+}
+
+Buttons CIO_2021::getButton(uint16_t code)
+{
+    for(unsigned int i = 0; i < sizeof(button_codes)/sizeof(uint16_t); i++){
+        if(_button_code == button_codes[i]) return (Buttons)i;
+    }
+    return (Buttons)0;
+}
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_TYPE1_MODEL_SPECIFIC.h b/Code/lib/cio/CIO_TYPE1_MODEL_SPECIFIC.h
new file mode 100644
index 00000000..211fabc7
--- /dev/null
+++ b/Code/lib/cio/CIO_TYPE1_MODEL_SPECIFIC.h
@@ -0,0 +1,72 @@
+#pragma once
+#include <Arduino.h>
+#include "enums.h"
+#include "CIO_TYPE1.h"
+
+class CIO_PRE2021 : public CIO_6_TYPE1
+{
+    public:
+        String getModel(){return _MYMODEL;};
+        uint16_t getButtonCode(Buttons button_index) override;
+        Buttons getButton(uint16_t code) override;
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "PRE2021";
+        /*Binary representation of button presses on the display, like 0x1B1B.*/
+        uint16_t button_codes[10] = { 0x1B1B, 0x0200, 0x0100, 0x0300, 0x1012, 0x1212, 0x1112, 0x1312, 0x0809, 0x0000 };
+        const bool _HASJETS = false;
+        const bool _HASAIR = true;
+
+};
+
+class CIO_2021_HJT: public CIO_6_TYPE1
+{
+    /*These must be declared for the API to work*/
+    public:
+        String getModel(){return _MYMODEL;};
+
+    /*internal use*/
+    public:
+        /*Only use for debugging*/
+        uint16_t getButtonCode(Buttons button_index) override;
+        Buttons getButton(uint16_t code) override;
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    /*These must be declared for the API to work*/
+    public:
+        const String _MYMODEL = "MALDIVES2021";
+        const bool _HASJETS = true;
+        const bool _HASAIR = true;
+
+    private:
+        /*Binary representation of button presses on the display, like 0x1B1B.*/
+        uint16_t button_codes[11] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0a09, 0x1012, 0x1312, 0x0809, 0x0200, 0x0000, 0x1112 };
+};
+
+class CIO_2021: public CIO_6_TYPE1
+{
+    /*These must be declared for the API to work*/
+    public:
+        String getModel(){return _MYMODEL;};
+
+    /*internal use*/
+    public:
+        /*Only use for debugging*/
+        uint16_t getButtonCode(Buttons button_index) override;
+        Buttons getButton(uint16_t code) override;
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    /*These must be declared for the API to work*/
+    public:
+        const String _MYMODEL = "MIAMI2021";
+        const bool _HASJETS = false;
+        const bool _HASAIR = true;
+
+    private:
+        /*Binary representation of button presses on the display, like 0x1B1B.*/
+        uint16_t button_codes[10] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0809, 0x1012, 0x1112, 0x1312, 0x0200, 0x0000 };
+};
\ No newline at end of file
diff --git a/Code/lib/cio/CIO_54149E.cpp b/Code/lib/cio/CIO_TYPE2_MODEL_SPECIFIC.cpp
similarity index 90%
rename from Code/lib/cio/CIO_54149E.cpp
rename to Code/lib/cio/CIO_TYPE2_MODEL_SPECIFIC.cpp
index 87b6a81c..a03dc180 100644
--- a/Code/lib/cio/CIO_54149E.cpp
+++ b/Code/lib/cio/CIO_TYPE2_MODEL_SPECIFIC.cpp
@@ -1,4 +1,4 @@
-#include "CIO_54149E.h"
+#include "CIO_TYPE2_MODEL_SPECIFIC.h"
 
 uint16_t CIO_54149E::getButtonCode(Buttons index)
 {
diff --git a/Code/lib/cio/CIO_54149E.h b/Code/lib/cio/CIO_TYPE2_MODEL_SPECIFIC.h
similarity index 100%
rename from Code/lib/cio/CIO_54149E.h
rename to Code/lib/cio/CIO_TYPE2_MODEL_SPECIFIC.h
diff --git a/Code/lib/dsp/DSP_2021.cpp b/Code/lib/dsp/DSP_2021.cpp
deleted file mode 100644
index 353fba4a..00000000
--- a/Code/lib/dsp/DSP_2021.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "DSP_2021.h"
-
-Buttons DSP_2021::buttonCodeToIndex(uint16_t code)
-{
-    for(unsigned int i = 0; i < sizeof(_button_codes)/sizeof(uint16_t); i++){
-        if(code == _button_codes[i]) return (Buttons)i;
-    }
-    return (Buttons)0;
-}
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_2021.h b/Code/lib/dsp/DSP_2021.h
deleted file mode 100644
index c252a6c4..00000000
--- a/Code/lib/dsp/DSP_2021.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_TYPE1.h"
-
-class DSP_2021 : public DSP_6_TYPE1 
-{
-    public:
-        String getModel() {return _MYMODEL;};
-        Buttons buttonCodeToIndex(uint16_t code);
-        bool getHasjets() {return _HASJETS;};
-
-    private:
-        String _MYMODEL = "2021";
-        uint16_t _button_codes[10] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0809, 0x1012, 0x1112, 0x1312, 0x0200, 0x0000 };
-        uint16_t _oldButtonCode = _button_codes[NOBTN];
-        bool _HASJETS;
-};
diff --git a/Code/lib/dsp/DSP_2021HJT.cpp b/Code/lib/dsp/DSP_2021HJT.cpp
deleted file mode 100644
index 23b1df0f..00000000
--- a/Code/lib/dsp/DSP_2021HJT.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "DSP_2021HJT.h"
-
-Buttons DSP_2021_HJT::buttonCodeToIndex(uint16_t code)
-{
-    for(unsigned int i = 0; i < sizeof(_button_codes)/sizeof(uint16_t); i++){
-        if(code == _button_codes[i]) return (Buttons)i;
-    }
-    return (Buttons)0;
-}
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_2021HJT.h b/Code/lib/dsp/DSP_2021HJT.h
deleted file mode 100644
index 05b19ed5..00000000
--- a/Code/lib/dsp/DSP_2021HJT.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_TYPE1.h"
-
-class DSP_2021_HJT : public DSP_6_TYPE1 
-{
-    public:
-        String getModel() {return _MYMODEL;};
-        Buttons buttonCodeToIndex(uint16_t code);
-        bool getHasjets() {return _HASJETS;};
-
-    private:
-        String _MYMODEL = "2021HJT";
-        uint16_t _button_codes[11] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0a09, 0x1012, 0x1312, 0x0809, 0x0200, 0x0000, 0x1112 };
-        uint16_t _oldButtonCode = _button_codes[NOBTN];
-        bool _HASJETS;
-};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_4W_MODEL_SPECIFIC.h b/Code/lib/dsp/DSP_4W_MODEL_SPECIFIC.h
new file mode 100644
index 00000000..b48f6f0f
--- /dev/null
+++ b/Code/lib/dsp/DSP_4W_MODEL_SPECIFIC.h
@@ -0,0 +1,253 @@
+#pragma once
+#include <Arduino.h>
+#include "enums.h"
+#include "DSP_4W.h"
+
+class DSP_54123 : public DSP_4W
+{
+    public:
+        virtual ~DSP_54123(){};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        String getModel(){return _MYMODEL;};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54123";
+        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
+        //Requested by @chunkysteveo
+        const uint8_t JUMPTABLE[4][4] = {
+        // b,j,p,h
+        {1,0,2,3},
+        {0,1,2,3},
+        {1,2,0,3},
+        {1,3,0,2}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[4][4] = {
+        {0,0,0,0},
+        {1,0,0,0},
+        {0,0,1,0},
+        {0,0,1,2}  //the "2" means both heater elements
+        };
+
+        const uint8_t PUMPBITMASK =     B00010000;  //1 << 4;
+        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
+        const uint8_t JETSBITMASK =     B00000000;  //0;  //no jets on this machine.
+        const uint8_t HEATBITMASK1 =    B00000010;  //(1 << 1) "stage 1"
+        const uint8_t HEATBITMASK2 =    B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
+        const uint8_t POWERBITMASK =    B00000001;  //1;
+        const bool _HASJETS = false;
+        const bool _HASAIR = true;
+};
+
+class DSP_54138 : public DSP_4W
+{
+    public:
+        virtual ~DSP_54138(){};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        String getModel(){return _MYMODEL;};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54138";
+        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
+        //Requested by @chunkysteveo
+        const uint8_t JUMPTABLE[5][4] = {
+        // b,j,p,h
+        {1,2,3,4},
+        {0,2,3,4},
+        {1,0,3,4},
+        {1,2,0,4},
+        {1,2,0,3}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[5][4] = {
+        {0,0,0,0},
+        {1,0,0,0},
+        {0,1,0,0},
+        {0,0,1,0},
+        {0,0,1,2}  //the "2" means both heater elements
+        };
+
+        const uint8_t PUMPBITMASK =   B00000101;  //5
+        const uint8_t BUBBLESBITMASK =   B00000010;  //2
+        const uint8_t JETSBITMASK =   B00001000;  //8
+        const uint8_t HEATBITMASK1 =   B00110000;  //48 heater stage 1 = 50%
+        const uint8_t HEATBITMASK2 =   B01000000;  //64 heater stage 2 = 100%
+        //lines below should be tested. It would be consistent with 54173 model.
+        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
+        //const uint8_t HEATBITMASK1 =   B00000000;  //00  heater stage 1 = off
+        //const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
+        const uint8_t POWERBITMASK =   B10000000;  //128
+        const bool _HASJETS = true;
+        const bool _HASAIR = true;
+};
+
+class DSP_54144 : public DSP_4W
+{
+    public:
+        virtual ~DSP_54144(){};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        String getModel(){return _MYMODEL;};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54144";
+        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
+        //Requested by @chunkysteveo
+        const uint8_t JUMPTABLE[5][4] = {
+        // b,j,p,h
+        {1,2,3,4},
+        {0,2,3,4},
+        {1,0,3,4},
+        {1,2,0,4},
+        {1,2,0,3}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[5][4] = {
+        {0,0,0,0},
+        {1,0,0,0},
+        {0,1,0,0},
+        {0,0,1,0},
+        {0,0,1,2}  //the "2" means both heater elements
+        };
+
+        const uint8_t PUMPBITMASK =   B00000101;  //5
+        const uint8_t BUBBLESBITMASK =   B00000010;  //2
+        const uint8_t JETSBITMASK =   B00001000;  //8
+        // const uint8_t HEATBITMASK1 =   B00000000;  //0    heater stage 1 = off
+        // const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
+        //lines below should be tested. It would be consistent with 54173 model.
+        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
+        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
+        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
+        const uint8_t POWERBITMASK =   B10000000;  //128
+        const bool _HASJETS = true;
+        const bool _HASAIR = false;
+};
+
+class DSP_54154 : public DSP_4W
+{
+    public:
+        virtual ~DSP_54154(){};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        String getModel(){return _MYMODEL;};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54154";
+        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
+        //Requested by @chunkysteveo
+        const uint8_t JUMPTABLE[6][4] = {
+        {3,0,1,2},
+        {4,1,0,2},
+        {5,2,0,1},
+        {0,3,4,5},
+        {1,4,3,5},
+        {2,5,3,4}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[6][4] = {
+        {0,0,0,0},
+        {0,0,1,0},
+        {0,0,1,2},
+        {1,0,0,0},  //the "2" means both heater elements
+        {1,0,1,0},
+        {1,0,1,1}
+        };
+
+        const uint8_t PUMPBITMASK =    B00010000;  //1 << 4;
+        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
+        const uint8_t JETSBITMASK =   B00000000;  //0;  //no jets on this machine.
+        const uint8_t HEATBITMASK1 =   B00000010;  //(1 << 1) "stage 1"
+        const uint8_t HEATBITMASK2 =   B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
+        const uint8_t POWERBITMASK =   B00000001;  //1;
+        const bool _HASJETS = false;
+        const bool _HASAIR = true;
+};
+
+class DSP_54173 : public DSP_4W
+{
+    public:
+        virtual ~DSP_54173(){};
+        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
+        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
+        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
+        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
+        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
+        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
+        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
+        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
+        String getModel(){return _MYMODEL;};
+        bool getHasjets() override {return _HASJETS;};
+        bool getHasair() override {return _HASAIR;};
+
+    private:
+        const String _MYMODEL = "NO54173";
+        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
+        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
+        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
+        //everything else off. (1,0,0,0)
+        const uint8_t JUMPTABLE[8][4] = {
+        {6,4,1,3},
+        {7,4,0,3},
+        {3,5,6,7},
+        {2,4,0,1},
+        {5,0,1,3},
+        {4,6,1,3},
+        {0,5,7,2},
+        {1,5,6,2}
+        };
+        //Bubbles, Jets, Pump, Heat
+        const uint8_t ALLOWEDSTATES[8][4] = {
+        {0,0,0,0},
+        {0,0,1,0},
+        {1,0,1,1},
+        {0,0,1,2},  //the "2" means both heater elements
+        {0,1,0,0},
+        {1,1,0,0},
+        {1,0,0,0},
+        {1,0,1,0}
+        };
+
+        const uint8_t PUMPBITMASK =   B00000101;  //5
+        const uint8_t BUBBLESBITMASK =   B00000010;  //2
+        const uint8_t JETSBITMASK =   B00001000;  //8
+        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
+        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
+        const uint8_t POWERBITMASK =   B10000000;  //128
+        const bool _HASJETS = true;
+        const bool _HASAIR = true;
+};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_54123.h b/Code/lib/dsp/DSP_54123.h
deleted file mode 100644
index ad9d7512..00000000
--- a/Code/lib/dsp/DSP_54123.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_4W.h"
-
-class DSP_54123 : public DSP_4W
-{
-    public:
-        virtual ~DSP_54123(){};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        String getModel(){return _MYMODEL;};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54123";
-        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
-        //Requested by @chunkysteveo
-        const uint8_t JUMPTABLE[4][4] = {
-        // b,j,p,h
-        {1,0,2,3},
-        {0,1,2,3},
-        {1,2,0,3},
-        {1,3,0,2}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[4][4] = {
-        {0,0,0,0},
-        {1,0,0,0},
-        {0,0,1,0},
-        {0,0,1,2}  //the "2" means both heater elements
-        };
-
-        const uint8_t PUMPBITMASK =     B00010000;  //1 << 4;
-        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
-        const uint8_t JETSBITMASK =     B00000000;  //0;  //no jets on this machine.
-        const uint8_t HEATBITMASK1 =    B00000010;  //(1 << 1) "stage 1"
-        const uint8_t HEATBITMASK2 =    B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
-        const uint8_t POWERBITMASK =    B00000001;  //1;
-        const bool _HASJETS = false;
-        const bool _HASAIR = true;
-};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_54138.h b/Code/lib/dsp/DSP_54138.h
deleted file mode 100644
index c5147c65..00000000
--- a/Code/lib/dsp/DSP_54138.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_4W.h"
-
-class DSP_54138 : public DSP_4W
-{
-    public:
-        virtual ~DSP_54138(){};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        String getModel(){return _MYMODEL;};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54138";
-        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
-        //Requested by @chunkysteveo
-        const uint8_t JUMPTABLE[5][4] = {
-        // b,j,p,h
-        {1,2,3,4},
-        {0,2,3,4},
-        {1,0,3,4},
-        {1,2,0,4},
-        {1,2,0,3}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[5][4] = {
-        {0,0,0,0},
-        {1,0,0,0},
-        {0,1,0,0},
-        {0,0,1,0},
-        {0,0,1,2}  //the "2" means both heater elements
-        };
-
-        const uint8_t PUMPBITMASK =   B00000101;  //5
-        const uint8_t BUBBLESBITMASK =   B00000010;  //2
-        const uint8_t JETSBITMASK =   B00001000;  //8
-        const uint8_t HEATBITMASK1 =   B00110000;  //48 heater stage 1 = 50%
-        const uint8_t HEATBITMASK2 =   B01000000;  //64 heater stage 2 = 100%
-        //lines below should be tested. It would be consistent with 54173 model.
-        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
-        //const uint8_t HEATBITMASK1 =   B00000000;  //00  heater stage 1 = off
-        //const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
-        const uint8_t POWERBITMASK =   B10000000;  //128
-        const bool _HASJETS = true;
-        const bool _HASAIR = true;
-};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_54144.h b/Code/lib/dsp/DSP_54144.h
deleted file mode 100644
index b8b81ea8..00000000
--- a/Code/lib/dsp/DSP_54144.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_4W.h"
-
-class DSP_54144 : public DSP_4W
-{
-    public:
-        virtual ~DSP_54144(){};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        String getModel(){return _MYMODEL;};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54144";
-        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
-        //Requested by @chunkysteveo
-        const uint8_t JUMPTABLE[5][4] = {
-        // b,j,p,h
-        {1,2,3,4},
-        {0,2,3,4},
-        {1,0,3,4},
-        {1,2,0,4},
-        {1,2,0,3}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[5][4] = {
-        {0,0,0,0},
-        {1,0,0,0},
-        {0,1,0,0},
-        {0,0,1,0},
-        {0,0,1,2}  //the "2" means both heater elements
-        };
-
-        const uint8_t PUMPBITMASK =   B00000101;  //5
-        const uint8_t BUBBLESBITMASK =   B00000010;  //2
-        const uint8_t JETSBITMASK =   B00001000;  //8
-        // const uint8_t HEATBITMASK1 =   B00000000;  //0    heater stage 1 = off
-        // const uint8_t HEATBITMASK2 =   B00110000;  //48  heater stage 2 = on
-        //lines below should be tested. It would be consistent with 54173 model.
-        //If heating is slow this is probably the cause but I don't want to change it before someone tests it.
-        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
-        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
-        const uint8_t POWERBITMASK =   B10000000;  //128
-        const bool _HASJETS = true;
-        const bool _HASAIR = false;
-};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_54154.h b/Code/lib/dsp/DSP_54154.h
deleted file mode 100644
index add94546..00000000
--- a/Code/lib/dsp/DSP_54154.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_4W.h"
-
-class DSP_54154 : public DSP_4W
-{
-    public:
-        virtual ~DSP_54154(){};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        String getModel(){return _MYMODEL;};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54154";
-        //WARNING: THIS DEVICE HAS DIFFERENT PINOUTS!!! CHECK BEFORE USING
-        //Requested by @chunkysteveo
-        const uint8_t JUMPTABLE[6][4] = {
-        {3,0,1,2},
-        {4,1,0,2},
-        {5,2,0,1},
-        {0,3,4,5},
-        {1,4,3,5},
-        {2,5,3,4}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[6][4] = {
-        {0,0,0,0},
-        {0,0,1,0},
-        {0,0,1,2},
-        {1,0,0,0},  //the "2" means both heater elements
-        {1,0,1,0},
-        {1,0,1,1}
-        };
-
-        const uint8_t PUMPBITMASK =    B00010000;  //1 << 4;
-        const uint8_t BUBBLESBITMASK =  B00100000;  //1 << 5;
-        const uint8_t JETSBITMASK =   B00000000;  //0;  //no jets on this machine.
-        const uint8_t HEATBITMASK1 =   B00000010;  //(1 << 1) "stage 1"
-        const uint8_t HEATBITMASK2 =   B00001000;  //(1 << 3) "stage 2" (thanks @dietmar-1 for testing and reporting this)
-        const uint8_t POWERBITMASK =   B00000001;  //1;
-        const bool _HASJETS = false;
-        const bool _HASAIR = true;
-};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_54173.h b/Code/lib/dsp/DSP_54173.h
deleted file mode 100644
index 1d0a14d6..00000000
--- a/Code/lib/dsp/DSP_54173.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_4W.h"
-
-class DSP_54173 : public DSP_4W
-{
-    public:
-        virtual ~DSP_54173(){};
-        uint8_t getPumpBitmask() override {return PUMPBITMASK;} ;
-        uint8_t getBubblesBitmask() override {return BUBBLESBITMASK;} ;
-        uint8_t getJetsBitmask() override {return JETSBITMASK;} ;
-        uint8_t getHeatBitmask1() override {return HEATBITMASK1;} ;
-        uint8_t getHeatBitmask2() override {return HEATBITMASK2;} ;
-        uint8_t getPowerBitmask() override {return POWERBITMASK;} ;
-        uint8_t getJumptable(int row, int col) override {return JUMPTABLE[row][col];};
-        uint8_t getAllowedstates(int row, int col) override {return ALLOWEDSTATES[row][col];};
-        String getModel(){return _MYMODEL;};
-        bool getHasjets() override {return _HASJETS;};
-        bool getHasair() override {return _HASAIR;};
-
-    private:
-        const String _MYMODEL = "NO54173";
-        //what row in allowedstates to go to when pressing Bubbles, Jets, Pump, Heat (columns in that order)
-        //Example: We are in state zero (first row). If we press Bubbles (first column) then there is a 6
-        //meaning current state (row) is now 6. According to ALLOWEDSTATES table, we turn on Bubbles and keep
-        //everything else off. (1,0,0,0)
-        const uint8_t JUMPTABLE[8][4] = {
-        {6,4,1,3},
-        {7,4,0,3},
-        {3,5,6,7},
-        {2,4,0,1},
-        {5,0,1,3},
-        {4,6,1,3},
-        {0,5,7,2},
-        {1,5,6,2}
-        };
-        //Bubbles, Jets, Pump, Heat
-        const uint8_t ALLOWEDSTATES[8][4] = {
-        {0,0,0,0},
-        {0,0,1,0},
-        {1,0,1,1},
-        {0,0,1,2},  //the "2" means both heater elements
-        {0,1,0,0},
-        {1,1,0,0},
-        {1,0,0,0},
-        {1,0,1,0}
-        };
-
-        const uint8_t PUMPBITMASK =   B00000101;  //5
-        const uint8_t BUBBLESBITMASK =   B00000010;  //2
-        const uint8_t JETSBITMASK =   B00001000;  //8
-        const uint8_t HEATBITMASK1 =   B00110000;  //48  heater stage 1 = 50%
-        const uint8_t HEATBITMASK2 =   B01000000;  //64  heater stage 2 = 100%
-        const uint8_t POWERBITMASK =   B10000000;  //128
-        const bool _HASJETS = true;
-        const bool _HASAIR = true;
-};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_PRE2021.cpp b/Code/lib/dsp/DSP_PRE2021.cpp
deleted file mode 100644
index e8abff4f..00000000
--- a/Code/lib/dsp/DSP_PRE2021.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "DSP_PRE2021.h"
-
-Buttons DSP_PRE2021::buttonCodeToIndex(uint16_t code)
-{
-    for(unsigned int i = 0; i < sizeof(_button_codes)/sizeof(uint16_t); i++){
-        if(code == _button_codes[i]) return (Buttons)i;
-    }
-    return (Buttons)0;
-}
diff --git a/Code/lib/dsp/DSP_PRE2021.h b/Code/lib/dsp/DSP_PRE2021.h
deleted file mode 100644
index 77fe5fed..00000000
--- a/Code/lib/dsp/DSP_PRE2021.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include "enums.h"
-#include "DSP_TYPE1.h"
-
-class DSP_PRE2021 : public DSP_6_TYPE1 
-{
-    public:
-        DSP_PRE2021(){};
-        Buttons buttonCodeToIndex(uint16_t code) override;
-        bool getHasjets() {return _HASJETS;};
-        String getModel() {return _MYMODEL;};
-
-    private:
-        String _MYMODEL = "PRE2021";
-        uint16_t _button_codes[10] = { 0x1B1B, 0x0200, 0x0100, 0x0300, 0x1012, 0x1212, 0x1112, 0x1312, 0x0809, 0x0000 };
-        bool _HASJETS = 0;
-};
diff --git a/Code/lib/dsp/DSP_TYPE1_MODEL_SPECIFIC.cpp b/Code/lib/dsp/DSP_TYPE1_MODEL_SPECIFIC.cpp
new file mode 100644
index 00000000..72be3b66
--- /dev/null
+++ b/Code/lib/dsp/DSP_TYPE1_MODEL_SPECIFIC.cpp
@@ -0,0 +1,25 @@
+#include "DSP_TYPE1_MODEL_SPECIFIC.h"
+
+Buttons DSP_PRE2021::buttonCodeToIndex(uint16_t code)
+{
+    for(unsigned int i = 0; i < sizeof(_button_codes)/sizeof(uint16_t); i++){
+        if(code == _button_codes[i]) return (Buttons)i;
+    }
+    return (Buttons)0;
+}
+
+Buttons DSP_2021_HJT::buttonCodeToIndex(uint16_t code)
+{
+    for(unsigned int i = 0; i < sizeof(_button_codes)/sizeof(uint16_t); i++){
+        if(code == _button_codes[i]) return (Buttons)i;
+    }
+    return (Buttons)0;
+}
+
+Buttons DSP_2021::buttonCodeToIndex(uint16_t code)
+{
+    for(unsigned int i = 0; i < sizeof(_button_codes)/sizeof(uint16_t); i++){
+        if(code == _button_codes[i]) return (Buttons)i;
+    }
+    return (Buttons)0;
+}
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_TYPE1_MODEL_SPECIFIC.h b/Code/lib/dsp/DSP_TYPE1_MODEL_SPECIFIC.h
new file mode 100644
index 00000000..3aa5006f
--- /dev/null
+++ b/Code/lib/dsp/DSP_TYPE1_MODEL_SPECIFIC.h
@@ -0,0 +1,46 @@
+#pragma once
+#include <Arduino.h>
+#include "enums.h"
+#include "DSP_TYPE1.h"
+
+class DSP_PRE2021 : public DSP_6_TYPE1 
+{
+    public:
+        DSP_PRE2021(){};
+        Buttons buttonCodeToIndex(uint16_t code) override;
+        bool getHasjets() {return _HASJETS;};
+        String getModel() {return _MYMODEL;};
+
+    private:
+        String _MYMODEL = "PRE2021";
+        uint16_t _button_codes[10] = { 0x1B1B, 0x0200, 0x0100, 0x0300, 0x1012, 0x1212, 0x1112, 0x1312, 0x0809, 0x0000 };
+        bool _HASJETS = 0;
+};
+
+class DSP_2021_HJT : public DSP_6_TYPE1 
+{
+    public:
+        String getModel() {return _MYMODEL;};
+        Buttons buttonCodeToIndex(uint16_t code);
+        bool getHasjets() {return _HASJETS;};
+
+    private:
+        String _MYMODEL = "2021HJT";
+        uint16_t _button_codes[11] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0a09, 0x1012, 0x1312, 0x0809, 0x0200, 0x0000, 0x1112 };
+        uint16_t _oldButtonCode = _button_codes[NOBTN];
+        bool _HASJETS;
+};
+
+class DSP_2021 : public DSP_6_TYPE1 
+{
+    public:
+        String getModel() {return _MYMODEL;};
+        Buttons buttonCodeToIndex(uint16_t code);
+        bool getHasjets() {return _HASJETS;};
+
+    private:
+        String _MYMODEL = "2021";
+        uint16_t _button_codes[10] = { 0x1B1B, 0x0100, 0x0300, 0x1212, 0x0809, 0x1012, 0x1112, 0x1312, 0x0200, 0x0000 };
+        uint16_t _oldButtonCode = _button_codes[NOBTN];
+        bool _HASJETS;
+};
\ No newline at end of file
diff --git a/Code/lib/dsp/DSP_54149E.cpp b/Code/lib/dsp/DSP_TYPE2_MODEL_SPECIFIC.cpp
similarity index 85%
rename from Code/lib/dsp/DSP_54149E.cpp
rename to Code/lib/dsp/DSP_TYPE2_MODEL_SPECIFIC.cpp
index 8abf151e..5bded662 100644
--- a/Code/lib/dsp/DSP_54149E.cpp
+++ b/Code/lib/dsp/DSP_TYPE2_MODEL_SPECIFIC.cpp
@@ -1,4 +1,4 @@
-#include "DSP_54149E.h"
+#include "DSP_TYPE2_MODEL_SPECIFIC.h"
 
 Buttons DSP_54149E::buttonCodeToIndex(uint16_t code)
 {
diff --git a/Code/lib/dsp/DSP_54149E.h b/Code/lib/dsp/DSP_TYPE2_MODEL_SPECIFIC.h
similarity index 100%
rename from Code/lib/dsp/DSP_54149E.h
rename to Code/lib/dsp/DSP_TYPE2_MODEL_SPECIFIC.h
diff --git a/Code/lib/smarthomes/ha.hpp b/Code/lib/smarthomes/ha.hpp
index 52e8cf80..c3a3a7bd 100644
--- a/Code/lib/smarthomes/ha.hpp
+++ b/Code/lib/smarthomes/ha.hpp
@@ -1273,6 +1273,41 @@ void setupHA()
     Serial.println(F("switch"));
 
 
+                                        /* spa power switch */
+    doc[(_dev)] = devicedoc[(_dev)];
+    payload.clear();
+    unique_id = mqtt_info->mqttBaseTopic + F("_powerswitch")+mychipid;
+    topic = HA_PREFIX_F;
+    topic += F("/switch/");
+    topic += unique_id;
+    topic += F("/config");
+    doc[(_name)] = F("Power switch");
+    doc[(_uniq_id)] = unique_id;
+    doc[(_stat_t)] = mqtt_info->mqttBaseTopic+F("/message");
+    doc[(_cmd_t)] = mqtt_info->mqttBaseTopic+F("/command");
+    doc[(_val_tpl)] = F("{{ value_json.PWR }}");
+    doc[_expire_after] = 700;
+    doc[_icon] = F("mdi:power");
+    doc[(_avty_t)] = mqtt_info->mqttBaseTopic+F("/Status");
+    doc[(_pl_avail)] = _alive;
+    doc[(_pl_not_avail)] = _dead;
+    doc["pl_on"] = F("{CMD:24,VALUE:true,XTIME:0,INTERVAL:0}");
+    doc["pl_off"] = F("{CMD:24,VALUE:false,XTIME:0,INTERVAL:0}");
+    doc["state_on"] = 1;
+    doc["state_off"] = 0;
+    if (serializeJson(doc, payload) == 0)
+    {
+        // Serial.println(F("Failed to serialize HA message!"));
+        return;
+    }
+    mqttClient->publish(topic.c_str(), payload.c_str(), true);
+    mqttClient->loop();
+    // Serial.println(payload);
+    doc.clear();
+    doc.garbageCollect();
+
+
+
                                         /* spa heat regulation switch */
     doc[(_dev)] = devicedoc[(_dev)];
     payload.clear();
diff --git a/Code/src/config.h b/Code/src/config.h
index 9a783b3a..ad58f99e 100644
--- a/Code/src/config.h
+++ b/Code/src/config.h
@@ -153,7 +153,7 @@ bool useControlSelector = false;
 
 struct sMQTT_info
 {
-    IPAddress mqttIpAddress;
+    String mqttHost;
     int mqttTelemetryInterval;
     int mqttPort;
     String mqttUsername;
diff --git a/Code/src/main.cpp b/Code/src/main.cpp
index a9b550b4..3fb01a39 100644
--- a/Code/src/main.cpp
+++ b/Code/src/main.cpp
@@ -72,7 +72,7 @@ void setup()
         mqtt_info = new sMQTT_info;
         mqtt_info->mqttBaseTopic = MQTT_BASE_TOPIC_F;
         mqtt_info->mqttClientId = MQTT_CLIENT_ID_F;
-        mqtt_info->mqttIpAddress = IPAddress(192,168,0,20);
+        mqtt_info->mqttHost = F("192.168.0.20");
         mqtt_info->mqttPassword = MQTT_PASSWORD_F;
         mqtt_info->mqttPort = 1883;
         mqtt_info->mqttTelemetryInterval = 600;
@@ -171,12 +171,14 @@ void loop()
     if (periodicTimerFlag)
     {
         periodicTimerFlag = false;
+        if(WiFi.getMode() == WIFI_AP_STA)
         {
-            if (enableMqtt && !mqttClient->loop() && (WiFi.status() == WL_CONNECTED))
-            {
-                BWC_LOG_P(PSTR("MQTT > Not connected\n"),0);
-                mqttConnect();
-            }
+            wifi_manual_reconnect();
+        }
+        if (enableMqtt && !mqttClient->loop() && (WiFi.status() == WL_CONNECTED))
+        {
+            BWC_LOG_P(PSTR("MQTT > Not connected\n"),0);
+            mqttConnect();
         }
         // Leverage the pre-existing periodicTimerFlag to also set temperature, if enabled
         setTemperatureFromSensor();
@@ -324,7 +326,7 @@ void startWiFi()
 {
     BWC_LOG_P(PSTR("startWiFi() @ millis: %d\n"), millis());
     //WiFi.mode(WIFI_STA);
-    WiFi.setAutoReconnect(true);
+    WiFi.setAutoReconnect(false);
     WiFi.persistent(true);
     WiFi.hostname(DEVICE_NAME_F);
     WiFi.mode(WIFI_STA); //WiFi.setOutputPower(15.0);
@@ -347,6 +349,12 @@ void startWiFi()
         WiFi.config(ip4Address, ip4Gateway, ip4Subnet, ip4DnsPrimary, ip4DnsSecondary);
     }
 
+    wifi_manual_reconnect();
+    BWC_YIELD;
+}
+
+void wifi_manual_reconnect()
+{
     /* Connect in station mode to the AP given (your router/ap) */
     if (wifi_info->enableAp)
     {
@@ -354,14 +362,13 @@ void startWiFi()
 
         WiFi.begin(wifi_info->apSsid.c_str(), wifi_info->apPwd.c_str());
         // checkWifi_ticker->attach(2.0, checkWiFi_ISR);
-        BWC_LOG_P(PSTR("WiFi > AP info loaded. Waiting for connection ...\n"),0);
+        BWC_LOG_P(PSTR("WiFi > AP info loaded. Waiting for connection ...\n"), 0);
     }
-    else 
+    else
     {
-        BWC_LOG_P(PSTR("WiFi > AP info not found. Using last known AP ...\n"),0);
+        BWC_LOG_P(PSTR("WiFi > AP info not found. Using last known AP ...\n"), 0);
         WiFi.begin();
     }
-    BWC_YIELD;
 }
 
 /**
@@ -371,7 +378,7 @@ void startSoftAp()
 {
     disconnected_flag = false;
     if(WiFi.getMode() == WIFI_AP_STA) {
-        BWC_LOG_P(PSTR("Soft AP IP: %s\n"),WiFi.softAPIP().toString().c_str());
+        BWC_LOG_P(PSTR("Soft AP IP: %s.\n"),WiFi.softAPIP().toString().c_str());
         return;
     }
     BWC_LOG_P(PSTR("Station > disconnected. Starting soft AP\n"),0);
@@ -1465,7 +1472,7 @@ void loadMqtt()
     File file = LittleFS.open("mqtt.json", "r");
     if (!file)
     {
-        BWC_LOG_P(PSTR("MQTT > Failed to read mqtt.json. Using defaults."),0);
+        BWC_LOG_P(PSTR("MQTT > Failed to read mqtt.json. Using defaults.\n"),0);
         return;
     }
 
@@ -1481,10 +1488,7 @@ void loadMqtt()
 
     mqtt_info->useMqtt = doc[F("enableMqtt")];
     // enableMqtt = useMqtt; //will be set with start complete timer
-    mqtt_info->mqttIpAddress[0] = doc[F("mqttIpAddress")][0];
-    mqtt_info->mqttIpAddress[1] = doc[F("mqttIpAddress")][1];
-    mqtt_info->mqttIpAddress[2] = doc[F("mqttIpAddress")][2];
-    mqtt_info->mqttIpAddress[3] = doc[F("mqttIpAddress")][3];
+    mqtt_info->mqttHost = doc[F("mqttHost")].as<String>();
     mqtt_info->mqttPort = doc[F("mqttPort")];
     mqtt_info->mqttUsername = doc[F("mqttUsername")].as<String>();
     mqtt_info->mqttPassword = doc[F("mqttPassword")].as<String>();
@@ -1509,10 +1513,7 @@ void saveMqtt()
     DynamicJsonDocument doc(1024);
 
     doc[F("enableMqtt")] = mqtt_info->useMqtt;
-    doc[F("mqttIpAddress")][0] = mqtt_info->mqttIpAddress[0];
-    doc[F("mqttIpAddress")][1] = mqtt_info->mqttIpAddress[1];
-    doc[F("mqttIpAddress")][2] = mqtt_info->mqttIpAddress[2];
-    doc[F("mqttIpAddress")][3] = mqtt_info->mqttIpAddress[3];
+    doc[F("mqttHost")] = mqtt_info->mqttHost;
     doc[F("mqttPort")] = mqtt_info->mqttPort;
     doc[F("mqttUsername")] = mqtt_info->mqttUsername;
     doc[F("mqttPassword")] = mqtt_info->mqttPassword;
@@ -1539,10 +1540,7 @@ void handleGetMqtt()
     DynamicJsonDocument doc(1024);
 
     doc[F("enableMqtt")] = mqtt_info->useMqtt;
-    doc[F("mqttIpAddress")][0] = mqtt_info->mqttIpAddress[0];
-    doc[F("mqttIpAddress")][1] = mqtt_info->mqttIpAddress[1];
-    doc[F("mqttIpAddress")][2] = mqtt_info->mqttIpAddress[2];
-    doc[F("mqttIpAddress")][3] = mqtt_info->mqttIpAddress[3];
+    doc[F("mqttHost")] = mqtt_info->mqttHost;
     doc[F("mqttPort")] = mqtt_info->mqttPort;
     doc[F("mqttUsername")] = mqtt_info->mqttUsername;
     doc[F("mqttPassword")] = "<enter password>";
@@ -1583,10 +1581,7 @@ void handleSetMqtt()
 
     mqtt_info->useMqtt = doc[F("enableMqtt")];
     enableMqtt = mqtt_info->useMqtt;
-    mqtt_info->mqttIpAddress[0] = doc[F("mqttIpAddress")][0];
-    mqtt_info->mqttIpAddress[1] = doc[F("mqttIpAddress")][1];
-    mqtt_info->mqttIpAddress[2] = doc[F("mqttIpAddress")][2];
-    mqtt_info->mqttIpAddress[3] = doc[F("mqttIpAddress")][3];
+    mqtt_info->mqttHost = doc[F("mqttHost")].as<String>();
     mqtt_info->mqttPort = doc[F("mqttPort")];
     mqtt_info->mqttUsername = doc[F("mqttUsername")].as<String>();
     mqtt_info->mqttPassword = doc[F("mqttPassword")].as<String>();
@@ -1795,7 +1790,7 @@ void startMqtt()
         mqttClient->disconnect();
 
         // setup MQTT broker information as defined earlier
-        mqttClient->setServer(mqtt_info->mqttIpAddress, mqtt_info->mqttPort);
+        mqttClient->setServer(mqtt_info->mqttHost.c_str(), mqtt_info->mqttPort);
         // set buffer for larger messages, new to library 2.8.0
         // if (mqttClient->setBufferSize(1536))
         {
diff --git a/Code/src/main.h b/Code/src/main.h
index fb2adaba..439c90a7 100644
--- a/Code/src/main.h
+++ b/Code/src/main.h
@@ -89,6 +89,7 @@ void getOtherInfo(String &rtn);
 void sendMQTT();
 void sendMQTTConfig();
 void startWiFi();
+void wifi_manual_reconnect();
 void startSoftAp();
 void checkNTP_ISR();
 void checkNTP();
diff --git a/bwc-manual.pdf b/bwc-manual.pdf
index 6bd82dbd..0324bc9e 100644
Binary files a/bwc-manual.pdf and b/bwc-manual.pdf differ