diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java
index eab7240..7853082 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@@ -1,6 +1,7 @@
 package com.bbn.hadder;
 
 import com.rethinkdb.RethinkDB;
+import com.rethinkdb.gen.exc.ReqlOpFailedError;
 import com.rethinkdb.net.Connection;
 import com.rethinkdb.net.Cursor;
 import com.google.gson.JsonParser;
@@ -70,4 +71,23 @@ public class Rethink {
         } catch (ClassCastException ignored) {}
         return out;
     }
+
+    public static void setup() {
+        try {
+            r.dbCreate("Hadder").run(conn);
+        } catch (ReqlOpFailedError e) {
+            System.out.println(e.getMessage());
+        }
+        try {
+            r.tableCreate("server").run(conn);
+        } catch (ReqlOpFailedError e) {
+           System.out.println(e.getMessage());
+        }
+        try {
+            r.tableCreate("user").run(conn);
+        } catch (ReqlOpFailedError e) {
+            System.out.println(e.getMessage());
+        }
+
+    }
 }
diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
index 3c39a44..3072f77 100644
--- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java
+++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
@@ -11,6 +11,7 @@ public class ReadyListener extends ListenerAdapter {
 
     @Override
     public void onReady(@Nonnull ReadyEvent event) {
+        Rethink.setup();
         for (Guild g : event.getJDA().getGuilds()) {
             Rethink.insertServer(g.getId());
         }