diff --git a/GT_Modulsicht/GalaxyTrucker.vpp b/GT_Modulsicht/GalaxyTrucker.vpp
index 26c7bc03931d6b1fb9e2f4b903781bb97f625f61..6de938d3c59c9609f96c754c73bf9504e6c489ca 100644
Binary files a/GT_Modulsicht/GalaxyTrucker.vpp and b/GT_Modulsicht/GalaxyTrucker.vpp differ
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d
new file mode 100644
index 0000000000000000000000000000000000000000..556d186b4a376ef22ba5716002778d441fd093dc
Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d differ
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d
new file mode 100644
index 0000000000000000000000000000000000000000..c65918c439041efc2a6a2a27cfa980bac9219372
Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d differ
diff --git a/GT_Modulsicht/Gt Model.png b/GT_Modulsicht/Gt Model.png
index 930515f2559b183b5f487697e9ef926acbd7fcb4..43961e58e07e2b7f1997710e943e80d67eb0ccbd 100644
Binary files a/GT_Modulsicht/Gt Model.png and b/GT_Modulsicht/Gt Model.png differ
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java
similarity index 94%
rename from core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
rename to core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java
index 94c8d5117743e5d4c83109e4859a0d42b84145b1..dc006fcd7fef6c7a29dc05de5908c68e623a0148 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java
@@ -1,6 +1,6 @@
 package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 
-public abstract class Room {
+public abstract class Section {
     /**
      * Höhe des Raumes. Räume sind immer rechteckig.
      */
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
index 5646eea88580175b11b70c371a966d621a0c11dd..b82701b4db337bc260249c62b335d549dff66883 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
@@ -1,6 +1,6 @@
 package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 
-public abstract class System extends Room {
+public abstract class System extends Section {
     private int energy;
     private int maxEnergy;
     private int damage;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
index 32c66c11feed0027aa96a0fc67e05ddb917c767a..99e30301eb9105b6a55ca0df450a1eed21fd75d0 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
@@ -1,22 +1,55 @@
 package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
 
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+
 public abstract class Weapon {
 
     /** Weapon damage */
     private int damage;
 
-    /** Weapon coolDown */
+    /** Amount of rounds for the weapon to be used again */
     private int cooldown;
 
     /** Weapon energy */
     private int energy;
 
+    /** Amount of missiles spent per attack */
     private int missileCost;
-    private float dropchance;
-    private int crewdamage;
-    /**
-     * How many projectiles are fired per burst
-     */
-    private int burst;
     private float precision;
+    /** probability of randomly finding this weapon */
+    private float dropChance;
+    /** Amount of shield bars this Weapon can ignore */
+    private int shieldPiercing;
+    /** Probability of causing a breach in the section on hit */
+    private float breachChance;
+    /** Damage taken by crew in the hit section */
+    private int crewDamage;
+    /** How many projectiles are fired per burst */
+    private int burst;
+
+    public int getCooldown() {
+        return cooldown;
+    }
+
+    public void setCooldown(int cooldown) {
+        this.cooldown = cooldown;
+    }
+
+    public int getEnergy() {
+        return energy;
+    }
+
+    public void setEnergy(int energy) {
+        this.energy = energy;
+    }
+
+    public float getDropChance() {
+        return dropChance;
+    }
+
+    public void setDropChance(float dropChance) {
+        this.dropChance = dropChance;
+    }
+
+    public void attack(Ship target){}
 }