diff --git a/README.md b/README.md
index 00176faaf522992aede61581038d63065339b3f8..896baf5f16f2063cb53a57614807f745dd45f969 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,15 @@ 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
+- level.cpp/hpp
+- Config.cpp/hpp
+- Weapon.cpp/hpp
+- CombatEngine.cpp/hpp
+
 David Maul:
 - Engine.cpp/hpp
 - Scene.hpp
@@ -122,3 +131,4 @@ David Maul:
 
 
 
+
diff --git a/src/game/combat/CombatEngine.cpp b/src/game/combat/CombatEngine.cpp
index 3c0b1e3aef26556eba5dcecb685b306404c7479e..579b2609004d5878c24358c95b64059c7c156011 100644
--- a/src/game/combat/CombatEngine.cpp
+++ b/src/game/combat/CombatEngine.cpp
@@ -5,6 +5,11 @@
 #include <memory>
 #include <unordered_map>
 
+/**
+ * @authors Lorenz Diel
+ */
+
+
 namespace advanced_wars
 {
 
diff --git a/src/game/combat/CombatEngine.hpp b/src/game/combat/CombatEngine.hpp
index 4e3ef02f9918356fa722e4fe714a74dd01d91c94..ba8520f9f216e8ce2afc0b5dde971a8dd7d072d8 100644
--- a/src/game/combat/CombatEngine.hpp
+++ b/src/game/combat/CombatEngine.hpp
@@ -3,6 +3,10 @@
 #include "../core/Engine.hpp"
 #include "../entities/Unit.hpp"
 
+/**
+ * @authors Lorenz Diel
+ */
+
 namespace advanced_wars
 {
 
diff --git a/src/game/combat/Weapon.cpp b/src/game/combat/Weapon.cpp
index 091c67efa5094495bed781a25a0eb3c3ca8652c4..9b8e155a796d6807c1aca8ad5022c2abed4aef6d 100644
--- a/src/game/combat/Weapon.cpp
+++ b/src/game/combat/Weapon.cpp
@@ -1,5 +1,9 @@
 #include "Weapon.hpp"
 
+/**
+ * @authors Lorenz Diel
+ */
+
 namespace advanced_wars
 {
 Weapon::Weapon() {}
diff --git a/src/game/combat/Weapon.hpp b/src/game/combat/Weapon.hpp
index 90733feedfad5fa1e1fe056a44aa0580ec0d605b..1031c041e02a02b3451af74c2cd167b0cfe1dbed 100644
--- a/src/game/combat/Weapon.hpp
+++ b/src/game/combat/Weapon.hpp
@@ -3,6 +3,10 @@
 #include <string>
 #include <unordered_map>
 
+/**
+ * @authors Lorenz Diel
+ */
+
 namespace advanced_wars
 {
 
diff --git a/src/game/core/Config.cpp b/src/game/core/Config.cpp
index 64a98fee23e73453fca9ec84c5e92dd73f38329a..cc8381e1ed7809f8dd1ac54c718c42a112eca15c 100644
--- a/src/game/core/Config.cpp
+++ b/src/game/core/Config.cpp
@@ -9,6 +9,10 @@
 #include <string>
 #include <unordered_map>
 
+/**
+ * @authors Lorenz Diel
+ */
+
 namespace advanced_wars
 {
 
diff --git a/src/game/core/Config.hpp b/src/game/core/Config.hpp
index e1743e189a880ff5173d595eb50a1caa59d13127..5574b3d7473350000e3ee797d61c4f9336f1507c 100644
--- a/src/game/core/Config.hpp
+++ b/src/game/core/Config.hpp
@@ -6,6 +6,10 @@
 #include <string>
 #include <unordered_map>
 
+/**
+ * @authors Lorenz Diel
+ */
+
 namespace advanced_wars
 {
 /* ENUMS FOR GLOBAL USE*/
diff --git a/src/game/entities/Unit.cpp b/src/game/entities/Unit.cpp
index 1f3cee0360c9022086c8eefb2705bd743129c46e..c8e338d913e1d6f7c09e6a4a711894c8d3af0e92 100644
--- a/src/game/entities/Unit.cpp
+++ b/src/game/entities/Unit.cpp
@@ -4,6 +4,7 @@
  * @authors Max Körschen
  * @author Nicolas Will
  * @author Frederik Keens
+ * @author Lorenz Diel
  */
 
 #include "Unit.hpp"
diff --git a/src/game/entities/Unit.hpp b/src/game/entities/Unit.hpp
index 2e24eb08c2b6083e1788b2efc1ed4abde7aa6d25..ec170c22d05740f08ca3dc49d5ac15b3f048e9ac 100644
--- a/src/game/entities/Unit.hpp
+++ b/src/game/entities/Unit.hpp
@@ -4,6 +4,7 @@
  * @authors Max Körschen
  * @author Nicolas Will
  * @author Frederik Keens
+ * @author Lorenz Diel
  */
 
 #pragma once
diff --git a/src/game/level/Level.cpp b/src/game/level/Level.cpp
index 0a86abc9d1e12ddbea4a3a7e8645529384e8f3a3..8cc8fbf864527cd66a1e9796932e242633083a5c 100644
--- a/src/game/level/Level.cpp
+++ b/src/game/level/Level.cpp
@@ -4,7 +4,9 @@
  * @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 ba854679cd30912cb2fc2743c756dc47df8cef92..53f0d4b662ef1abe11b45d6ce74396190d2ffc67 100644
--- a/src/game/level/Level.hpp
+++ b/src/game/level/Level.hpp
@@ -4,6 +4,7 @@
  * @authors Max Körschen
  * @author Nicolas Will
  * @author Frederik Keens
+ * @author Lorenz Diel
  * @author David Maul
  */
 
diff --git a/src/game/ui/modals/UnitInfoMenu.cpp b/src/game/ui/modals/UnitInfoMenu.cpp
index c38f9ed4c6b4f17c290d7fee5365fd7ac1de40fa..3de38226c1fd0738e32759263b6654d20a09140b 100644
--- a/src/game/ui/modals/UnitInfoMenu.cpp
+++ b/src/game/ui/modals/UnitInfoMenu.cpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Lorenz Diel
  * @author Nicolas Will
  */
 
diff --git a/src/game/ui/modals/UnitInfoMenu.hpp b/src/game/ui/modals/UnitInfoMenu.hpp
index d06f72608bb2460d4bdd9887d0769479107f2d5f..84528dbf5c5458a74547166fa5c844b65d8f6e4e 100644
--- a/src/game/ui/modals/UnitInfoMenu.hpp
+++ b/src/game/ui/modals/UnitInfoMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Lorenz Diel
  * @author Nicolas Will
  */