diff --git a/src/airtime.cpp b/src/airtime.cpp
index 5c8eb67fd..66f4a0a57 100644
--- a/src/airtime.cpp
+++ b/src/airtime.cpp
@@ -3,7 +3,7 @@
 
 #define periodsToLog 48
 
-AirTime airTime;
+AirTime *airTime;
 
 // A reminder that there are 3600 seconds in an hour so I don't have
 // to keep googling it.
diff --git a/src/airtime.h b/src/airtime.h
index d79e8829b..439670010 100644
--- a/src/airtime.h
+++ b/src/airtime.h
@@ -51,4 +51,4 @@ class AirTime : private concurrency::OSThread
     virtual int32_t runOnce();
 };
 
-extern AirTime airTime;
\ No newline at end of file
+extern AirTime *airTime;
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 5808e3fa1..4bf110ad6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -518,8 +518,10 @@ void setup()
     initWifi(forceSoftAP);
 
     // Start web server thread.
-    //webServerThread = new WebServerThread();
+    webServerThread = new WebServerThread();
 
+    // Start airtime logger thread.
+    airTime = new AirTime();
 
     if (!rIf)
         recordCriticalError(CriticalErrorCode_NoRadio);
diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
index b4c93ac92..0266614af 100644
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@@ -97,7 +97,8 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
     // Count the packet toward our TX airtime utilization.
     //   We only count it if it can be added to the TX queue.
-    airTime.logAirtime(TX_LOG, xmitMsec);
+    airTime->logAirtime(TX_LOG, xmitMsec);
+    //airTime.logAirtime(TX_LOG, xmitMsec);
 
     // We want all sending/receiving to be done by our daemon thread, We use a delay here because this packet might have been sent
     // in response to a packet we just received.  So we want to make sure the other side has had a chance to reconfigure its radio
@@ -216,7 +217,8 @@ void RadioLibInterface::handleReceiveInterrupt()
     size_t length = iface->getPacketLength();
 
     xmitMsec = getPacketTime(length);
-    airTime.logAirtime(RX_ALL_LOG, xmitMsec);
+    airTime->logAirtime(RX_ALL_LOG, xmitMsec);
+    //airTime.logAirtime(RX_ALL_LOG, xmitMsec);
 
     int state = iface->readData(radiobuf, length);
     if (state != ERR_NONE) {
@@ -258,7 +260,8 @@ void RadioLibInterface::handleReceiveInterrupt()
             printPacket("Lora RX", mp);
 
             xmitMsec = getPacketTime(mp);
-            airTime.logAirtime(RX_LOG, xmitMsec);
+            airTime->logAirtime(RX_LOG, xmitMsec);
+            //airTime.logAirtime(RX_LOG, xmitMsec);
 
             deliverToReceiver(mp);
         }
diff --git a/src/mesh/wifi/WebServerThread.cpp b/src/mesh/wifi/WebServerThread.cpp
index 32fb5a385..991fd6d92 100644
--- a/src/mesh/wifi/WebServerThread.cpp
+++ b/src/mesh/wifi/WebServerThread.cpp
@@ -1,4 +1,5 @@
 #include "mesh/wifi/WebServerThread.h"
+#include "meshwifi/meshhttp.h"
 #include <Arduino.h>
 
 WebServerThread *webServerThread;
@@ -7,8 +8,10 @@ WebServerThread::WebServerThread() : concurrency::OSThread("WebServerThread") {}
 
 int32_t WebServerThread::runOnce()
 {
-    DEBUG_MSG("WebServerThread::runOnce()\n");
+    //DEBUG_MSG("WebServerThread::runOnce()\n");
+    handleWebResponse();
 
-    return (1000 * 1);
+    // Loop every 5ms. 
+    return (5);
 }