diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..4f3bae1
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,13 @@
+{
+    "files.associations": {
+        "*.tpp": "cpp",
+        "istream": "cpp",
+        "memory": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "xlocnum": "cpp",
+        "xutility": "cpp",
+        "xlocale": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/App/Inc/sta/config.hpp b/App/Inc/sta/config.hpp
index 1c00977..1c91b7a 100644
--- a/App/Inc/sta/config.hpp
+++ b/App/Inc/sta/config.hpp
@@ -29,7 +29,10 @@
 #define STA_RTOS_SYSTEM_EVENTS_ENABLE
 // #define STA_RTOS_SYSTEM_WATCHDOG_ENABLE
 // #define STA_RTOS_WATCHDOG_ENABLE
-// #define STA_CAN_BUS_ENABLE
+
+// Settings for CAN 
+#define STA_CAN_BUS_ENABLE
+#define STA_TACOS_CAN_BUS_SID 0x040
 
 // Uses the default configuration for TACOS.
 #include<sta/tacos/configs/default.hpp>
diff --git a/App/Src/startup.cpp b/App/Src/startup.cpp
index 74f6967..9cb8261 100644
--- a/App/Src/startup.cpp
+++ b/App/Src/startup.cpp
@@ -30,7 +30,7 @@ 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 SPAM", &hcan1), {0});
+			//Manager::instance()->registerThread(std::make_shared<demo::CanTask>("CAN SPAM", &hcan1), {0});
 
 			STA_DEBUG_PRINTF("The answer to everything is %d", 42);
 
diff --git a/Libs/TACOS b/Libs/TACOS
index 16b2ed5..abdddc8 160000
--- a/Libs/TACOS
+++ b/Libs/TACOS
@@ -1 +1 @@
-Subproject commit 16b2ed5a20df1c04b9bbcf5e12101d5e822e45d2
+Subproject commit abdddc87b9b5edc95424d29dd0c36577b6a4e7c4