diff --git a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class
index cbc20eabd1bc46accbdcad9ea91fd6783f279c9a..f47eb2ad368f564e0482721c7eb253a40d695df2 100644
Binary files a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class and b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class differ
diff --git a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class
index e4c42c9ddd1f9696e1b7d30f74a07da0f32181a0..b9ea88cc32fa156a464573f18492f323c706d859 100644
Binary files a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class and b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class differ
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index 596f790c117edbc42a844ab1cc149a90367fb4fc..bc031b9cb2194e11229af510d30f850101b5b7d4 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -115,22 +115,4 @@ public class Ship implements Serializable {
     @DatabaseField(foreign = true, columnName = "inventory")
     private List<Weapon> inventory;
 
-    /**
-     * Take damage
-     */
-    private void takeDamage(int amount) {
-    }
-
-    /**
-     * Add hp
-     */
-    private void heal(int hp) {
-    }
-
-    /**
-     * Add shields
-     */
-    private void applyShields(int shields) {
-    }
-
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/User.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/User.java
index 4e1c6adde125eda6e06d5a5a5d4cd4573ecde2bf..aa7bfea7fb63b2fbd1156e0ec80020f1e06e8ae2 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/User.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/User.java
@@ -25,4 +25,9 @@ public class User implements Serializable {
      */
     @DatabaseField(columnName = "userShip", foreign = true)
     private Ship userShip;
+
+    /** Whether or not the user is logged in */
+    @NonNull
+    @DatabaseField(columnName = "loggedIn")
+    private boolean loggedIn = false;
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java
index 2a27c02edb6a385a94eba376f7c36c526627e7ad..39ce5443d2ed1bde5673d78267bf40344e749454 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java
@@ -54,4 +54,18 @@ public class UserService {
 
     }
 
+    /**
+     * Save game
+     *
+     * @param username - the username of the user
+     */
+    public void saveGame(String username) {
+    }
+
+    /** Login
+     * @param username - the username of the user
+     * @return true - if the login was successful else return false */
+    public boolean login(String username){
+        return false;
+    }
 }