diff --git a/README.md b/README.md
index 51ae32e7721e19b4f93c8641162fccb075395c33..896baf5f16f2063cb53a57614807f745dd45f969 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@
 4. Visual Studio erkennt automatisch das CMake-Projekt
 5. Build über "Build All" ausführen
 
+
 #### Falls Syntax errors
 
 1. Erstelle .vscode/c_cpp_properties.json Datei
@@ -107,6 +108,7 @@ Max Körschen:
 - level.cpp/hpp (eventhandling for units and buildings, movement, attack etc)
 - debugging in CombatEngine.cpp/hpp, Bullets.cpp/hpp
 
+
 Lorenz Diel:
 - Units.cpp/hpp
 - UnitInfoMenu.cpp/hpp
@@ -114,3 +116,19 @@ Lorenz Diel:
 - Config.cpp/hpp
 - Weapon.cpp/hpp
 - CombatEngine.cpp/hpp
+
+David Maul:
+- Engine.cpp/hpp
+- Scene.hpp
+- Spritesheet.cpp/hpp
+- Tile.cpp/hpp
+- Window.cpp/hpp
+- Effect.cpp/hpp
+- Level.cpp/hpp
+- main.cpp
+
+
+
+
+
+
diff --git a/src/game/core/Engine.cpp b/src/game/core/Engine.cpp
index 936e47459ad8dc9f7ccc3c527bbfeef6c9f16407..e8d49015897f13506d480fe3c26a88a1c1f2b278 100644
--- a/src/game/core/Engine.cpp
+++ b/src/game/core/Engine.cpp
@@ -1,6 +1,7 @@
 /**
  * Engine.cpp
  *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/core/Engine.hpp b/src/game/core/Engine.hpp
index 431bf0160d7b09bb099e271508570d46950a6c59..baf33eb7a3a6bd5bde1b5be08f7cb5bbe59df257 100644
--- a/src/game/core/Engine.hpp
+++ b/src/game/core/Engine.hpp
@@ -1,6 +1,7 @@
 /**
  * Engine.hpp
  *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/core/Scene.hpp b/src/game/core/Scene.hpp
index 35d528ec19c5943bece0221d9db311f16402fdae..ef0617ed91919dd4de6d828c7e451daa3ddec781 100644
--- a/src/game/core/Scene.hpp
+++ b/src/game/core/Scene.hpp
@@ -1,6 +1,7 @@
 /**
  * Scene.hpp
  *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/core/Spritesheet.cpp b/src/game/core/Spritesheet.cpp
index 65e927bb25f4c46e04c1c5e6962162ab5af49ea1..f0c49cc6ae32d06692062028fa6132792e34aeae 100644
--- a/src/game/core/Spritesheet.cpp
+++ b/src/game/core/Spritesheet.cpp
@@ -2,8 +2,8 @@
  * Spritesheet.hpp
  *
  * @date 30.1.2025
- * @author Frederik Keens
  * @author David Maul
+ * @author Frederik Keens
  */
 
 #include "Spritesheet.hpp"
diff --git a/src/game/core/Spritesheet.hpp b/src/game/core/Spritesheet.hpp
index e3c5e870f1067371bb3019ee8bf0afe1d2d9d6f4..f7d337d3c4336b18dee14dafa1132e816eb818df 100644
--- a/src/game/core/Spritesheet.hpp
+++ b/src/game/core/Spritesheet.hpp
@@ -2,8 +2,8 @@
  * Spritesheet.hpp
  *
  * @date 30.1.2025
- * @author Frederik Keens
  * @author David Maul
+ * @author Frederik Keens
  */
 
 #pragma once
diff --git a/src/game/core/Tile.cpp b/src/game/core/Tile.cpp
index 1ab6b115b032a1dbda807d1cdc1772ca5edb41c8..ff7877cb71ad1878e3211fafea3b81ff5cf52d3b 100644
--- a/src/game/core/Tile.cpp
+++ b/src/game/core/Tile.cpp
@@ -1,6 +1,7 @@
 /**
  * Tile.cpp
  *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/core/Tile.hpp b/src/game/core/Tile.hpp
index ad00852278dd15d7a1c016c11eec469e862e2f89..662f52c5580d81c8f7dfcec306c5ef94e33cb4c3 100644
--- a/src/game/core/Tile.hpp
+++ b/src/game/core/Tile.hpp
@@ -1,6 +1,7 @@
 /**
  * Tile.hpp
  *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/core/Window.cpp b/src/game/core/Window.cpp
index f48c378ff5295b2c653b5aae244fb577e9ace00f..04a0d087df9b0048f7d43ecf9fb54d59ce5aabc9 100644
--- a/src/game/core/Window.cpp
+++ b/src/game/core/Window.cpp
@@ -1,3 +1,9 @@
+/**
+ * Window.cpp
+ *
+ * @author David Maul
+ */
+
 #include "Window.hpp"
 
 #include <stdexcept>
diff --git a/src/game/core/Window.hpp b/src/game/core/Window.hpp
index 55d69ce77c5a5c01308478cf039a8f92538f762a..36ac6ae8a5ac81bc67b6db46d6570c00f0bcb0a9 100644
--- a/src/game/core/Window.hpp
+++ b/src/game/core/Window.hpp
@@ -1,3 +1,9 @@
+/**
+ * Window.hpp
+ *
+ * @author David Maul
+ */
+
 #pragma once
 
 #include <SDL.h>
diff --git a/src/game/effect/Effect.cpp b/src/game/effect/Effect.cpp
index f5f86e35c47c647c2c43fbdd8bf48b2b0cb10dcc..1407e94788fdbb1b96687d4be0d6ce5aeb93a889 100644
--- a/src/game/effect/Effect.cpp
+++ b/src/game/effect/Effect.cpp
@@ -1,6 +1,6 @@
 /**
  * Effect.cpp
- *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/effect/Effect.hpp b/src/game/effect/Effect.hpp
index a8e4fbaff61fc0203739765cfbb62ae647f7a81b..72d4abf9e27113ee677388475c5fb7b750d4504a 100644
--- a/src/game/effect/Effect.hpp
+++ b/src/game/effect/Effect.hpp
@@ -1,6 +1,7 @@
 /**
  * Effect.hpp
  *
+ * @author David Maul
  * @author Frederik Keens
  */
 
diff --git a/src/game/entities/Building.cpp b/src/game/entities/Building.cpp
index bf7ff17eb36a84a99375207c83eef86412fe6548..73d607ba5c1f4d00a93238b720df70973e4764ee 100644
--- a/src/game/entities/Building.cpp
+++ b/src/game/entities/Building.cpp
@@ -2,6 +2,7 @@
  * Building.cpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  */
 
diff --git a/src/game/entities/Building.hpp b/src/game/entities/Building.hpp
index 22b202c840e5e6e468d8082e8fabacf28c29e29b..07fd0f3d2cf9a31fab2123a28eab0fdc4a4c14c0 100644
--- a/src/game/entities/Building.hpp
+++ b/src/game/entities/Building.hpp
@@ -2,6 +2,7 @@
  * Building.hpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  */
 
diff --git a/src/game/entities/Unit.cpp b/src/game/entities/Unit.cpp
index fd7d5e21863134a60c5f3a72a0920c11fa3f9c07..c8e338d913e1d6f7c09e6a4a711894c8d3af0e92 100644
--- a/src/game/entities/Unit.cpp
+++ b/src/game/entities/Unit.cpp
@@ -2,6 +2,7 @@
  * Unit.cpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  * @author Lorenz Diel
  */
diff --git a/src/game/entities/Unit.hpp b/src/game/entities/Unit.hpp
index 61c17b9180dfb73e6723b5e2ebc49696d9dd9d1c..ec170c22d05740f08ca3dc49d5ac15b3f048e9ac 100644
--- a/src/game/entities/Unit.hpp
+++ b/src/game/entities/Unit.hpp
@@ -2,6 +2,7 @@
  * Unit.hpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  * @author Lorenz Diel
  */
diff --git a/src/game/level/Level.cpp b/src/game/level/Level.cpp
index f6888089b1b087010d7e76d4f52f2db3dfecdc03..8cc8fbf864527cd66a1e9796932e242633083a5c 100644
--- a/src/game/level/Level.cpp
+++ b/src/game/level/Level.cpp
@@ -2,8 +2,11 @@
  * Level.cpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  * @author Lorenz Diel
+ * @author David Maul
+
  */
 
 #include "Level.hpp"
diff --git a/src/game/level/Level.hpp b/src/game/level/Level.hpp
index c6aa81fbd3fb32877232ebd28045753ed4698050..53f0d4b662ef1abe11b45d6ce74396190d2ffc67 100644
--- a/src/game/level/Level.hpp
+++ b/src/game/level/Level.hpp
@@ -2,8 +2,10 @@
  * Level.hpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  * @author Lorenz Diel
+ * @author David Maul
  */
 
 #pragma once
diff --git a/src/game/main.cpp b/src/game/main.cpp
index 6ac86bf33c0f558c52be57114b422525ec1d4a38..b78c653f3f4a9d558242384b55ecaba15e164a6c 100644
--- a/src/game/main.cpp
+++ b/src/game/main.cpp
@@ -2,6 +2,7 @@
  * main.cpp
  *
  * @author Frederik Keens
+ * @author David Maul
  */
 
 #include "core/Engine.hpp"
diff --git a/src/game/ui/context/ContextMenu.cpp b/src/game/ui/context/ContextMenu.cpp
index f59241b4f100b2e7249390ca827d66ff7ea84187..1324409817654cb8f943b29593c309989c015e1b 100644
--- a/src/game/ui/context/ContextMenu.cpp
+++ b/src/game/ui/context/ContextMenu.cpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #include "ContextMenu.hpp"
diff --git a/src/game/ui/context/ContextMenu.hpp b/src/game/ui/context/ContextMenu.hpp
index 871147aec86d9e84f3d04caeb99f2232ca399ad7..082fd1461da2f4770e4a4e3d51eaab73b8d9dcec 100644
--- a/src/game/ui/context/ContextMenu.hpp
+++ b/src/game/ui/context/ContextMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once
diff --git a/src/game/ui/context/RecruitingMenu.cpp b/src/game/ui/context/RecruitingMenu.cpp
index 1b334eb3064d62bb07b83433a1857dbbe8f1f0d7..a0bd4210bcd8dacd40008a0557db92912ac1a080 100644
--- a/src/game/ui/context/RecruitingMenu.cpp
+++ b/src/game/ui/context/RecruitingMenu.cpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #include "RecruitingMenu.hpp"
diff --git a/src/game/ui/context/RecruitingMenu.hpp b/src/game/ui/context/RecruitingMenu.hpp
index 8ff1321cfce83120b4c8156e22371f19abf90e8a..e5bcbba28a01489760bbd5bd3b2ed83632da2a43 100644
--- a/src/game/ui/context/RecruitingMenu.hpp
+++ b/src/game/ui/context/RecruitingMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once
diff --git a/src/game/ui/menu/EndScreen.cpp b/src/game/ui/menu/EndScreen.cpp
index ad33b22394cbca09522aa69ff75c8114c2eb76eb..7044b68f2efddf71968aaa0b7b477665b7588d61 100644
--- a/src/game/ui/menu/EndScreen.cpp
+++ b/src/game/ui/menu/EndScreen.cpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #include "EndScreen.hpp"
 
 #include <SDL_image.h>
diff --git a/src/game/ui/menu/EndScreen.hpp b/src/game/ui/menu/EndScreen.hpp
index 8fc428a4b8c0b33593ddf63c1338b734925530ae..865405471e52b7e0d324e9e3b0dbed70e974883d 100644
--- a/src/game/ui/menu/EndScreen.hpp
+++ b/src/game/ui/menu/EndScreen.hpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #pragma once
 
 #include "../../core/Scene.hpp"
diff --git a/src/game/ui/menu/PauseMenu.cpp b/src/game/ui/menu/PauseMenu.cpp
index c2d152b33eb1cb60adee9784230938c66e7b62ce..31b2b17357ed459110c2c8eb8ac30a06b8289c0e 100644
--- a/src/game/ui/menu/PauseMenu.cpp
+++ b/src/game/ui/menu/PauseMenu.cpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #include "PauseMenu.hpp"
 #include "../../core/Engine.hpp"
 
diff --git a/src/game/ui/menu/PauseMenu.hpp b/src/game/ui/menu/PauseMenu.hpp
index e97308b1eaf13c977c89f3357eae50686dc8bbab..fb93ac5464b007d638ecdbc64551a14d26871236 100644
--- a/src/game/ui/menu/PauseMenu.hpp
+++ b/src/game/ui/menu/PauseMenu.hpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #pragma once
 
 #include "../../core/Scene.hpp"
diff --git a/src/game/ui/modals/HelpMenu.cpp b/src/game/ui/modals/HelpMenu.cpp
index cc424e729e398231dc479ab785a193d994bfd553..a9c72b490e779bee4fc77254841b7a177fdd6dd9 100644
--- a/src/game/ui/modals/HelpMenu.cpp
+++ b/src/game/ui/modals/HelpMenu.cpp
@@ -1,7 +1,9 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
+
 #include "HelpMenu.hpp"
 
 #include <SDL_ttf.h>
diff --git a/src/game/ui/modals/HelpMenu.hpp b/src/game/ui/modals/HelpMenu.hpp
index c1e9aae192b807b07d812706be68c30560d304d7..97490391b286e1266544bacb40a08d5506e15672 100644
--- a/src/game/ui/modals/HelpMenu.hpp
+++ b/src/game/ui/modals/HelpMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once
diff --git a/src/game/ui/modals/UnitInfoMenu.cpp b/src/game/ui/modals/UnitInfoMenu.cpp
index c187e519ed38e02980e6b4621b8fb7beceac5de0..3de38226c1fd0738e32759263b6654d20a09140b 100644
--- a/src/game/ui/modals/UnitInfoMenu.cpp
+++ b/src/game/ui/modals/UnitInfoMenu.cpp
@@ -1,6 +1,7 @@
 /**
  * @authors Max Körschen
  * @author Lorenz Diel
+ * @author Nicolas Will
  */
 
 #include "UnitInfoMenu.hpp"
diff --git a/src/game/ui/modals/UnitInfoMenu.hpp b/src/game/ui/modals/UnitInfoMenu.hpp
index 80fc850898d721e6856ff2818fcc9ecaba139ce6..84528dbf5c5458a74547166fa5c844b65d8f6e4e 100644
--- a/src/game/ui/modals/UnitInfoMenu.hpp
+++ b/src/game/ui/modals/UnitInfoMenu.hpp
@@ -1,6 +1,7 @@
 /**
  * @authors Max Körschen
  * @author Lorenz Diel
+ * @author Nicolas Will
  */
 
 #pragma once