diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index f2090666..80f5fc9e 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -133,6 +133,11 @@ void initmission::initTasks() {
   }
 #endif /* OBSW_ADD_ACS_HANDLERS */
 
+  acsTask->addComponent(objects::ACS_CONTROLLER);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    initmission::printAddObjectError("ACS_CTRL", objects::ACS_CONTROLLER);
+  }
+
   PeriodicTaskIF* sysTask = factory->createPeriodicTask(
       "SYS_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
   static_cast<void>(sysTask);
diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index 56c0a62a..acce5dfb 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -63,4 +63,5 @@ void ObjectFactory::produce(void* args) {
 
   createMiscComponents();
   createThermalController();
+  createAcsController();
 }
diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp
index e8ba7947..494b0baa 100644
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@@ -8,6 +8,7 @@
 #include <fsfw_hal/linux/spi/SpiCookie.h>
 #include <linux/callbacks/gpioCallbacks.h>
 #include <linux/devices/Max31865RtdLowlevelHandler.h>
+#include <mission/controller/AcsController.h>
 #include <mission/controller/ThermalController.h>
 #include <mission/devices/Max31865EiveHandler.h>
 #include <mission/devices/Max31865PT1000Handler.h>
@@ -324,6 +325,8 @@ void ObjectFactory::createThermalController() {
   new ThermalController(objects::THERMAL_CONTROLLER, objects::NO_OBJECT);
 }
 
+void ObjectFactory::createAcsController() { new AcsController(objects::ACS_CONTROLLER); }
+
 void ObjectFactory::gpioChecker(ReturnValue_t result, std::string output) {
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::error << "ObjectFactory: Adding GPIOs failed for " << output << std::endl;
diff --git a/linux/ObjectFactory.h b/linux/ObjectFactory.h
index a592e818..c88a9eb4 100644
--- a/linux/ObjectFactory.h
+++ b/linux/ObjectFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 
 #include <string>
 
@@ -19,5 +19,6 @@ void createRtdComponents(std::string spiDev, GpioIF* gpioComIF, PowerSwitchIF* p
 void gpioChecker(ReturnValue_t result, std::string output);
 
 void createThermalController();
+void createAcsController();
 
 }  // namespace ObjectFactory
diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
index d6ca9fdd..427263d7 100644
--- a/mission/controller/AcsController.cpp
+++ b/mission/controller/AcsController.cpp
@@ -1,10 +1,22 @@
-/*
- * AcsController.cpp
- *
- *  Created on: Aug 12, 2022
- *      Author: rmueller
- */
+#include "AcsController.h"
 
+AcsController::AcsController(object_id_t objectId)
+    : ExtendedControllerBase(objectId, objects::NO_OBJECT) {}
 
+ReturnValue_t AcsController::handleCommandMessage(CommandMessage *message) {
+  return HasReturnvaluesIF::RETURN_OK;
+}
 
+void AcsController::performControlOperation() {}
 
+ReturnValue_t AcsController::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
+                                                     LocalDataPoolManager &poolManager) {
+  return HasReturnvaluesIF::RETURN_OK;
+}
+
+LocalPoolDataSetBase *AcsController::getDataSetHandle(sid_t sid) { return nullptr; }
+
+ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,
+                                              uint32_t *msToReachTheMode) {
+  return HasReturnvaluesIF::RETURN_OK;
+}
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
index e4e46334..25b9e39a 100644
--- a/mission/controller/AcsController.h
+++ b/mission/controller/AcsController.h
@@ -3,29 +3,25 @@
 
 #include <fsfw/controller/ExtendedControllerBase.h>
 
-class AcsController: public ExtendedControllerBase {
-public:
-private:
+class AcsController : public ExtendedControllerBase {
+ public:
+  AcsController(object_id_t objectId);
 
+ private:
   ReturnValue_t handleCommandMessage(CommandMessage* message) override;
   void performControlOperation() override;
 
-
   ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
-                                                LocalDataPoolManager& poolManager) override;
+                                        LocalDataPoolManager& poolManager) override;
   LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
 
   // Mode abstract functions
   ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
-                                         uint32_t* msToReachTheMode) override;
+                                 uint32_t* msToReachTheMode) override;
 
   // MGMs
 
   // Sun Sensors
-
-
 };
 
-
-
 #endif /* MISSION_CONTROLLER_ACSCONTROLLER_H_ */
diff --git a/mission/controller/CMakeLists.txt b/mission/controller/CMakeLists.txt
index 816a560a..84ff7f9e 100644
--- a/mission/controller/CMakeLists.txt
+++ b/mission/controller/CMakeLists.txt
@@ -1,3 +1,4 @@
 if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "")
-	target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp)
+  target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp
+                                             AcsController.cpp)
 endif()
diff --git a/mission/tmtc/CMakeLists.txt b/mission/tmtc/CMakeLists.txt
index a952629a..0a931d0f 100644
--- a/mission/tmtc/CMakeLists.txt
+++ b/mission/tmtc/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	CCSDSHandler.cpp
- 	VirtualChannel.cpp
- 	TmFunnel.cpp
-)
+target_sources(${LIB_EIVE_MISSION} PRIVATE CCSDSHandler.cpp VirtualChannel.cpp
+                                           TmFunnel.cpp)
diff --git a/mission/utility/CMakeLists.txt b/mission/utility/CMakeLists.txt
index e1162ef2..128356bf 100644
--- a/mission/utility/CMakeLists.txt
+++ b/mission/utility/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	Timestamp.cpp
-	ProgressPrinter.cpp
-	Filenaming.cpp
-)
+target_sources(${LIB_EIVE_MISSION} PRIVATE Timestamp.cpp ProgressPrinter.cpp
+                                           Filenaming.cpp)