diff --git a/App/Src/startup.cpp b/App/Src/startup.cpp
index dcb1425..22c86cb 100644
--- a/App/Src/startup.cpp
+++ b/App/Src/startup.cpp
@@ -8,6 +8,7 @@
 #include <sta/debug/debug.hpp>
 #include <tasks/can_task.hpp>
 #include <tasks/thermo.hpp>
+#include <tasks/relay.hpp>
 #include <sta/devices/stm32/gpio_pin.hpp>
 #include <sta/rtos/debug/heap_stats.hpp>
 
@@ -31,8 +32,9 @@ namespace sta
 		{
 			// ###### Register different threads for different states here. ######
 
-			// The dummy task runs for state 0.
-			Manager::instance()->registerThread(std::make_shared<demo::CanTask>("CAN test", 0x123), {ALL_STATES});
+			Manager::instance()->registerThread(std::make_shared<tasks::CanTask>(SYSTEM_CAN_MSG_HANDLER), {ALL_STATES});
+			Manager::instance()->registerThread(std::make_shared<tasks::ThermoTask>(SYSTEM_CAN_THERMO), {ALL_STATES});
+			Manager::instance()->registerThread(std::make_shared<tasks::RelayTask>(SYSTEM_CAN_RELAY), {ALL_STATES});
 
 			STA_DEBUG_PRINTF("The answer to everything is %d", 42);