diff --git a/Server/src/Persistence/DAO.java b/Server/src/Persistence/DAO.java
deleted file mode 100644
index c55d9b160229fa5b02d7eaaaa24146ecbd4032db..0000000000000000000000000000000000000000
--- a/Server/src/Persistence/DAO.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package Persistence;
-
-public abstract class DAO<T> {
-
-    public abstract void persist(T object);
-
-    public abstract void update(T object);
-
-    public abstract void remove(T object);
-}
diff --git a/Server/src/Persistence/Database.java b/Server/src/Persistence/Database.java
new file mode 100644
index 0000000000000000000000000000000000000000..42bfeca962a793f8b0c8b8f5cb1527dba81b6ece
--- /dev/null
+++ b/Server/src/Persistence/Database.java
@@ -0,0 +1,22 @@
+package Persistence;
+
+public class Database {
+
+    /**
+     * Load or create sqLite database
+     */
+    public void setup() {
+    }
+
+    /**
+     * Create new database
+     */
+    private void createDatabase() {
+    }
+
+    /**
+     * Backup database
+     */
+    public void backupDatabase() {
+    }
+}
diff --git a/Server/src/Server.java b/Server/src/Server.java
index 90fba1c41025e75683d04be5c648ba5334cf8f28..0a9b874effb3ffc84d82fff3ad3b5817fe238b82 100644
--- a/Server/src/Server.java
+++ b/Server/src/Server.java
@@ -1,2 +1,39 @@
+import Persistence.Database;
+
+/**
+ * This class creates the game server and handles storing the data
+ */
 public class Server {
+
+    /**
+     * Start the server
+     */
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     * Send some data
+     */
+    public void sendPackets() {
+    }
+
+    /**
+     * Receive some data
+     */
+    public void receivePackets() {
+    }
+
+    /**
+     * Validate packets
+     */
+    public void validatePackets() {
+    }
+
+    /**
+     * Current database
+     */
+    private Database currentDatabase() {
+        return null;
+    }
 }
diff --git a/build.gradle b/build.gradle
index 23efb98b1a079dfc57c72b84e51d0d445b5cde3e..e722a74f04aee9c09272aeb3a39923bbde76e776 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,8 @@ project(":desktop") {
         implementation project(":core")
         api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-        
+        // sqlite
+        compile group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2'
     }
 }
 
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java
new file mode 100644
index 0000000000000000000000000000000000000000..0575b6afe051e95422719c2e905b9ea07eee12ed
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java
@@ -0,0 +1,4 @@
+package com.galaxytrucker.galaxytruckerreloaded.IO.Screen;
+
+public class Map {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f4ddbcdf9df7f38019d192085a58c3eb69b4b92
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
@@ -0,0 +1,7 @@
+package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
+
+public abstract class Planet {
+
+    /** Planet name */
+    private String name;
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index 5e443dcdfd343549180759df7ed6bf4013a79d85..c042567c5d4a9cc47aa89419147065ecd5b24366 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -1,4 +1,33 @@
 package com.galaxytrucker.galaxytruckerreloaded.Model;
 
 public class Ship {
+
+    /**
+     * HP
+     */
+    private int hp;
+
+    /**
+     * Shields
+     */
+    private int shields;
+
+    /**
+     * 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/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
index 836b2e5a88bed6239b8a63018c96e1301e048217..641b418c74127cb9c78763414854baabf382d917 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
@@ -2,7 +2,9 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
 
 public abstract class Weapon {
 
+    /** Weapon damage */
     private int damage;
 
+    /** Weapon coolDown */
     private int cooldown;
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java
index 773d8a39cb616de5cab06ce47df06049feba81d7..1c3a7a213cae43e9f80fc3ae2d5d8072085219f1 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java
@@ -2,7 +2,9 @@ package com.galaxytrucker.galaxytruckerreloaded.View;
 
 public interface BaseRenderer {
 
+    /** Setup */
     public void setup();
 
+    /** Render */
     public void render();
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java
new file mode 100644
index 0000000000000000000000000000000000000000..c7ae4ced58a63f951c276fcab8a2df7419324ca2
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java
@@ -0,0 +1,6 @@
+package com.galaxytrucker.galaxytruckerreloaded.View.Ship;
+
+import com.galaxytrucker.galaxytruckerreloaded.View.BaseRenderer;
+
+public abstract class ShipView implements BaseRenderer {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6b6dff376b73136ef67c30b0c5f835d498d53fb
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java
@@ -0,0 +1,7 @@
+package com.galaxytrucker.galaxytruckerreloaded.View.Weapons;
+
+import com.galaxytrucker.galaxytruckerreloaded.View.BaseRenderer;
+
+public abstract class WeaponView implements BaseRenderer {
+
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf616f7674854ff527df47b371b72472da..a4368dd358b88a12ae95398fe656acf8ffd67ac2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed May 13 18:41:23 IDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip