diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/BattleController.java
similarity index 66%
rename from core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java
rename to core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/BattleController.java
index 0b1860e0787e3923fb78c44ab778f05fe9e09595..1fbf19e69c9c4c28f385de6c7132d68ddfd1056e 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/BattleController.java
@@ -1,28 +1,28 @@
-package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
-
-import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
-import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
-
-public class Attack {
-
-    /** Make one ship attack another's section
-     * @param opponent - the opponent's ship
-     * @param weapon - the weapon attacking */
-    private void attack(Ship opponent, Weapon weapon){}
-
-    /** Heal a ship
-     * @param ship - the ship to heal
-     * @param healingWeapon - the healing weapon */
-    private void heal(Ship ship,Weapon healingWeapon){}
-
-    /** Flee a fight, reward the winner
-     * @param coward - the ship that wants to flee
-     * @param opponent - the opponent that wins the fight */
-    private void fleeFight(Ship coward, Ship opponent){}
-
-    /** Give winner reward and end the fight (or the game)
-     * @param loser - the ship that lost
-     * @param victor - the ship that won */
-    private void endFight(Ship loser, Ship victor){}
-
-}
+package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
+
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
+import lombok.*;
+
+@Getter
+@Setter
+@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
+public class BattleController extends Controller{
+    @NonNull
+    private Ship myself;
+
+    /** Make one ship attack another's section
+     * @param opponent - the opponent's ship
+     * @param weapon - the weapon attacking */
+    private void attack(Ship opponent, Weapon weapon){}
+
+    /** Heal a ship
+     * @param healingWeapon - the healing weapon */
+    private void heal(Weapon healingWeapon){}
+
+    /** Flee a fight, reward the winner
+     * @param coward - the ship that wants to flee
+     * @param opponent - the opponent that wins the fight */
+    private void fleeFight(Ship coward, Ship opponent){}
+
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Controller.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Controller.java
index 01005dcee17a7cd38ad9ac13580a9a55aac31688..000026039294216075410e32b8aac0e4cd41d713 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Controller.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Controller.java
@@ -1,9 +1,12 @@
 package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
 
+import lombok.NonNull;
+
 public abstract class Controller {
 
     /** ClientControllerCommunicator */
+    @NonNull
     private ClientControllerCommunicator clientControllerCommunicator;
 
-    // Extend me
+
 }