diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7625c6..6df4aab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,8 @@ target_sources(infinisim PUBLIC
   ${InfiniTime_DIR}/src/components/ble/NotificationManager.cpp
   ${InfiniTime_DIR}/src/components/ble/SimpleWeatherService.h
   ${InfiniTime_DIR}/src/components/ble/SimpleWeatherService.cpp
+  ${InfiniTime_DIR}/src/components/sleeptracking/SleepTrackingController.h
+  ${InfiniTime_DIR}/src/components/sleeptracking/SleepTrackingController.cpp
   ${InfiniTime_DIR}/src/components/fs/FS.h
   ${InfiniTime_DIR}/src/components/fs/FS.cpp
   ${InfiniTime_DIR}/src/components/motion/MotionController.h
diff --git a/main.cpp b/main.cpp
index 4b7bbda..f90c29e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,6 +38,7 @@
 #include "components/motor/MotorController.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/heartrate/HeartRateController.h"
+#include "components/sleeptracking/SleepTrackingController.h"
 #include "components/fs/FS.h"
 #include "drivers/Spi.h"
 #include "drivers/SpiMaster.h"
@@ -370,6 +371,11 @@ Pinetime::Controllers::AlarmController alarmController {dateTimeController};
 Pinetime::Controllers::TouchHandler touchHandler;
 Pinetime::Controllers::ButtonHandler buttonHandler;
 Pinetime::Controllers::BrightnessController brightnessController {};
+Pinetime::Controllers::SleepTrackingController sleeptrackingController {fs,
+                                                                        dateTimeController,
+                                                                        motionSensor,
+                                                                        heartRateController,
+                                                                        motorController};
 
 Pinetime::Applications::DisplayApp displayApp(lcd,
                                               touchPanel,
@@ -387,6 +393,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               #endif
                                               alarmController,
                                               brightnessController,
+                                              sleeptrackingController,
                                               touchHandler,
                                               fs,
                                               spiNorFlash);
@@ -402,6 +409,7 @@ Pinetime::System::SystemTask systemTask(spi,
                                         timerController,
                                         #endif
                                         alarmController,
+                                        sleeptrackingController,
                                         watchdog,
                                         notificationManager,
                                         heartRateSensor,