diff --git a/.idea/cmake.xml b/.idea/cmake.xml
new file mode 100644
index 00000000..8986ec94
--- /dev/null
+++ b/.idea/cmake.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSharedSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug Test" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_OSAL=host -DFSFW_BUILD_TESTS=ON" NO_GENERATOR="true" />
+    </configurations>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/fsfw/cfdp/handler/DestHandler.h b/src/fsfw/cfdp/handler/DestHandler.h
index 9057b3f5..ba4e27f4 100644
--- a/src/fsfw/cfdp/handler/DestHandler.h
+++ b/src/fsfw/cfdp/handler/DestHandler.h
@@ -61,8 +61,8 @@ struct DestHandlerParams {
   size_t maxFilenameLen = 255;
 };
 
-struct FsfwParams {
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
+struct FsfwDestParams {
+  FsfwDestParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
              EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore,
              StorageManagerIF& tmStore)
       : FsfwParams(packetDest, msgQueue, eventReporter) {
@@ -70,7 +70,7 @@ struct FsfwParams {
     this->tmStore = &tmStore;
   }
 
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
+  FsfwDestParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
              EventReportingProxyIF* eventReporter)
       : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
   AcceptsTelemetryIF& packetDest;
diff --git a/src/fsfw/cfdp/handler/SourceHandler.cpp b/src/fsfw/cfdp/handler/SourceHandler.cpp
index 7fac0f81..37be1844 100644
--- a/src/fsfw/cfdp/handler/SourceHandler.cpp
+++ b/src/fsfw/cfdp/handler/SourceHandler.cpp
@@ -1,4 +1,3 @@
 #include "SourceHandler.h"
 
-SourceHandler::SourceHandler(SourceHandlerParams params) {
-}
+SourceHandler::SourceHandler(SourceHandlerParams params) {}
diff --git a/src/fsfw/cfdp/handler/SourceHandler.h b/src/fsfw/cfdp/handler/SourceHandler.h
index 5db71d36..1295f348 100644
--- a/src/fsfw/cfdp/handler/SourceHandler.h
+++ b/src/fsfw/cfdp/handler/SourceHandler.h
@@ -1,14 +1,24 @@
 #ifndef FSFW_CFDP_CFDPSOURCEHANDLER_H
 #define FSFW_CFDP_CFDPSOURCEHANDLER_H
 
-struct SourceHandlerParams {
-
-};
+struct SourceHandlerParams {};
 
 class SourceHandler {
-public:
+ public:
   SourceHandler(SourceHandlerParams params);
-private:
+
+ private:
+  enum class TransactionStep : uint8_t {
+    IDLE = 0,
+    TRANSACTION_START = 1,
+    CRC_PROCEDURE = 2,
+    SENDING_METADATA = 3,
+    SENDING_FILE_DATA = 4,
+    SENDING_EOF = 5,
+    WAIT_FOR_ACK = 6,
+    WAIT_FOR_FINISH = 7,
+    NOTICE_OF_COMPLETION = 8
+  };
 };
 
 #endif  // FSFW_CFDP_CFDPSOURCEHANDLER_H