diff --git a/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj b/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj
index c30c7eb..05084c9 100644
--- a/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj
+++ b/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj
@@ -89,7 +89,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\BTCDieselHeater;$(ProjectDir)..\..\..\libraries\WifiManager;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\WiFi\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\WebServer\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\DNSServer\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\ESPmDNS\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\Preferences\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\ArduinoOTA\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\Update\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\BluetoothSerial\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\BLE\src;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries\FS\src;$(ProjectDir)..\..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries;$(ProjectDir)..\..\..\libraries;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\cores\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\cores\esp32\libb64;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\variants\doitESP32devkitV1;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\config;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bluedroid;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bluedroid\api;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\app_trace;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\app_update;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bootloader_support;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bt;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\driver;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp_adc_cal;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp_http_client;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp-tls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\ethernet;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\fatfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\freertos;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\heap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\jsmn;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\log;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\mdns;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\mbedtls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\mbedtls_port;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\newlib;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\nvs_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\openssl;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\spi_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\sdmmc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\smartconfig_ack;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\spiffs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\tcpip_adapter;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\ulp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\vfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\wear_levelling;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\xtensa-debug-module;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\coap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\console;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\expat;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\json;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\lwip;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\nghttp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\soc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\wpa_supplicant;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\BTCDieselHeater;$(ProjectDir)..\..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\libraries;$(ProjectDir)..\..\..\libraries;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\cores\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\cores\esp32\libb64;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\variants\doitESP32devkitV1;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\config;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bluedroid;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bluedroid\api;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\app_trace;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\app_update;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bootloader_support;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\bt;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\driver;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp32;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp_adc_cal;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp_http_client;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\esp-tls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\ethernet;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\fatfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\freertos;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\heap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\jsmn;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\log;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\mdns;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\mbedtls;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\mbedtls_port;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\newlib;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\nvs_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\openssl;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\spi_flash;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\sdmmc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\smartconfig_ack;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\spiffs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\tcpip_adapter;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\ulp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\vfs;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\wear_levelling;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\xtensa-debug-module;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\coap;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\console;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\expat;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\json;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\lwip;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\nghttp;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\soc;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include\wpa_supplicant;$(ProjectDir)..\..\..\..\..\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.0\tools\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(ProjectDir)__vm\.BTCDieselHeater.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <PreprocessorDefinitions>__ESP32_ESp32__;__ESP32_ESP32__;ESP_PLATFORM;HAVE_CONFIG_H;F_CPU=240000000L;ARDUINO=10805;ARDUINO_ESP32_DEV;ARDUINO_ARCH_ESP32;ESP32;CORE_DEBUG_LEVEL=0;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -126,6 +126,9 @@
     <ClInclude Include="BTCWifi.h">
       <FileType>CppCode</FileType>
     </ClInclude>
+    <ClInclude Include="deadwood\BTCTelnetSpy.h">
+      <FileType>CppCode</FileType>
+    </ClInclude>
     <ClInclude Include="debugport.h">
       <FileType>CppCode</FileType>
     </ClInclude>
@@ -144,6 +147,9 @@
     <ClInclude Include="TxManage.h">
       <FileType>CppCode</FileType>
     </ClInclude>
+    <ClInclude Include="UtilClasses.h">
+      <FileType>CppCode</FileType>
+    </ClInclude>
     <ClInclude Include="__vm\.BTCDieselHeater.vsarduino.h" />
   </ItemGroup>
   <ItemGroup>
@@ -152,6 +158,7 @@
     <ClCompile Include="BTCota.cpp" />
     <ClCompile Include="BTCWebServer.cpp" />
     <ClCompile Include="BTCWifi.cpp" />
+    <ClCompile Include="deadwood\BTCTelnetSpy.cpp" />
     <ClCompile Include="NVStorage.cpp" />
     <ClCompile Include="Protocol.cpp" />
     <ClCompile Include="SmartError.cpp" />
diff --git a/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj.filters b/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj.filters
index bd67bdd..fe085fb 100644
--- a/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj.filters
+++ b/Arduino/BTCDieselHeater/BTCDieselHeater.vcxproj.filters
@@ -60,6 +60,12 @@
     <ClInclude Include="BTCWebServer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="UtilClasses.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="deadwood\BTCTelnetSpy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BluetoothESP32.cpp">
@@ -89,5 +95,8 @@
     <ClCompile Include="BTCWebServer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="deadwood\BTCTelnetSpy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file