diff --git a/CMakeLists.txt b/CMakeLists.txt
index b43354e..149370a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,10 @@
 include(mbed-os/tools/cmake/app.cmake)
 add_subdirectory(mbed-os)
 
+# Load TardisLang
+set(BUILD_TARDISLANG_APP OFF CACHE INTERNAL "")
+add_subdirectory(lang)
+
 # Create SNTP project
 project(sntp)
 file(GLOB SNTP_FILES "${PROJECT_SOURCE_DIR}/third_party/sntp/*.cpp")
@@ -31,7 +35,7 @@
 file(GLOB SRC_FILES "${PROJECT_SOURCE_DIR}/src/*.cpp")
 add_executable(Tardis ${SRC_FILES})
 target_include_directories(Tardis PRIVATE "${PROJECT_SOURCE_DIR}/include")
-target_link_libraries(Tardis PRIVATE mbed-netsocket mbed-os mbed-storage-qspif mbed-usb-msd mbed-storage-littlefs-v2 sntp)
+target_link_libraries(Tardis PRIVATE mbed-netsocket mbed-os mbed-storage-qspif mbed-usb-msd mbed-storage-littlefs-v2 sntp TardisLang)
 target_compile_options(Tardis PRIVATE -Wall -Wextra -Wpedantic -Werror)
 mbed_set_post_build(Tardis)
 
diff --git a/src/main.cpp b/src/main.cpp
index 985c200..eac2227 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -43,6 +43,8 @@
 }
 #endif
 
+extern "C" int lang_main(void);
+
 int main() {
 	setup_tracing();
 
@@ -59,6 +61,8 @@
 	network_init();
 	network_connect();
 
+	lang_main();
+
 	while (true) {
 		int presses = waitForPresses(600s);