diff --git a/main/dnsannounce.cpp b/main/dnsannounce.cpp
index e98479e..78b99c7 100644
--- a/main/dnsannounce.cpp
+++ b/main/dnsannounce.cpp
@@ -11,6 +11,11 @@
 #include "lwip/dns.h"
 #include "globals.h"
 
+void init_dns_announce()
+{
+
+}
+
 void handle_dns_announce()
 {
     const auto staStatus = wifi_stack::get_sta_status();
diff --git a/main/dnsannounce.h b/main/dnsannounce.h
index e9da219..f42b211 100644
--- a/main/dnsannounce.h
+++ b/main/dnsannounce.h
@@ -1,2 +1,4 @@
 #pragma once
+
+void init_dns_announce();
 void handle_dns_announce();
diff --git a/main/drivingstatistics.cpp b/main/drivingstatistics.cpp
index 9408aac..22a5809 100644
--- a/main/drivingstatistics.cpp
+++ b/main/drivingstatistics.cpp
@@ -49,6 +49,11 @@ uint16_t getEfficiencyClassColor()
     else                       return 0xF800;
 }
 
+void initStatistics()
+{
+
+}
+
 void calculateStatistics()
 {
     EVERY_N_MILLIS( 10 ) {
diff --git a/main/drivingstatistics.h b/main/drivingstatistics.h
index 480a51e..4920e3b 100644
--- a/main/drivingstatistics.h
+++ b/main/drivingstatistics.h
@@ -16,6 +16,7 @@ struct DrivingStatistics
 
 extern DrivingStatistics drivingStatistics;
 
+void initStatistics();
 void calculateStatistics();
 float getAvgWhPerKm();
 std::string getEfficiencyClassString();
diff --git a/main/main.cpp b/main/main.cpp
index 849f7ee..57c4765 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -10,9 +10,6 @@ constexpr const char * const TAG = "BOBBY";
 // esp-idf includes
 #include <esp_log.h>
 
-// Arduino includes
-#include <Arduino.h>
-
 // 3rdparty lib includes
 #include <espchrono.h>
 using namespace std::chrono_literals;
@@ -31,10 +28,6 @@ using namespace std::chrono_literals;
 #include "displays/statusdisplay.h"
 #include "displays/lockscreen.h"
 #include "displays/calibratedisplay.h"
-#ifdef FEATURE_DNS_NS
-#include "dnsannounce.h"
-#endif
-#include "drivingstatistics.h"
 #include "newsettings.h"
 #include "taskmanager.h"
 
@@ -151,11 +144,6 @@ extern "C" void app_main()
             lastStatsPush = now;
         }
 
-#ifdef FEATURE_DNS_NS
-        handle_dns_announce();
-#endif
-        calculateStatistics();
-
         if (battery::bootBatPercentage == -1)
         {
             if(controllers.front.feedbackValid && controllers.back.feedbackValid)
diff --git a/main/taskmanager.cpp b/main/taskmanager.cpp
index fabbe83..151b380 100644
--- a/main/taskmanager.cpp
+++ b/main/taskmanager.cpp
@@ -73,6 +73,10 @@
 #include "udpcloud.h"
 #endif
 #include "modes.h"
+#include "drivingstatistics.h"
+#ifdef FEATURE_DNS_NS
+#include "dnsannounce.h"
+#endif
 
 using namespace std::chrono_literals;
 
@@ -143,6 +147,10 @@ espcpputils::SchedulerTask schedulerTasksArr[] {
     espcpputils::SchedulerTask { "udpcloud",       udpCloudInit,          udpCloudUpdate,          50ms },
 #endif
     espcpputils::SchedulerTask { "drivingmode",    initDrivingMode,       updateDrivingMode,       20ms },
+    espcpputils::SchedulerTask { "drivingstatistics", initStatistics,     calculateStatistics,     100ms },
+#ifdef FEATURE_DNS_NS
+    espcpputils::SchedulerTask { "dnsannounce",    init_dns_announce,     handle_dns_announce,     100ms },
+#endif
 };
 } // namespace