diff --git a/serial_link.mk b/serial_link.mk
index e8915a33f..434966a22 100644
--- a/serial_link.mk
+++ b/serial_link.mk
@@ -21,4 +21,5 @@
 # SOFTWARE.
 
 INC += $(SERIAL_DIR)
-SRC += $(wildcard $(SERIAL_DIR)/serial_link/protocol/*.c)
\ No newline at end of file
+SRC += $(wildcard $(SERIAL_DIR)/serial_link/protocol/*.c)
+SRC += $(wildcard $(SERIAL_DIR)/serial_link/system/*.c)
\ No newline at end of file
diff --git a/serial_link/system/system.c b/serial_link/system/system.c
new file mode 100644
index 000000000..2001f4d5c
--- /dev/null
+++ b/serial_link/system/system.c
@@ -0,0 +1,40 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2016 Fred Sundvik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+#include "serial_link/system/system.h"
+
+// TODO: Optimize the stack size, this is probably way too big
+static THD_WORKING_AREA(serialThreadStack, 1024);
+static THD_FUNCTION(serialThread, arg) {
+    (void)arg;
+}
+
+
+void init_serial_link(void) {
+    (void)chThdCreateStatic(serialThreadStack, sizeof(serialThreadStack),
+                              LOWPRIO, serialThread, NULL);
+}
+
+void signal_data_written(void) {
+
+}
diff --git a/serial_link/system/system.h b/serial_link/system/system.h
index 1e4c610b1..e8c1caec0 100644
--- a/serial_link/system/system.h
+++ b/serial_link/system/system.h
@@ -25,18 +25,32 @@ SOFTWARE.
 #ifndef SERIAL_LINK_SYSTEM_H
 #define SERIAL_LINK_SYSTEM_H
 
+
+void init_serial_link(void);
+
+#if defined(PROTOCOL_CHIBIOS)
+#include "ch.h"
+
+static inline void serial_link_lock(void) {
+    chSysLock();
+}
+
+static inline void serial_link_unlock(void) {
+    chSysUnlock();
+}
+
+void signal_data_written(void);
+
+#else
+
 inline void serial_link_lock(void) {
 }
 
 inline void serial_link_unlock(void) {
 }
 
-void singal_data_written(void);
+void signal_data_written(void);
 
-#if defined(PROTOCOL_CHIBIOS)
-
-inline void signal_data_written(void) {
-}
 #endif
 
 #endif