diff --git a/com/Acrobot/Breeze/Database/Database.java b/com/Acrobot/Breeze/Database/Database.java
index 57a6dd8..cf5dc5e 100644
--- a/com/Acrobot/Breeze/Database/Database.java
+++ b/com/Acrobot/Breeze/Database/Database.java
@@ -33,6 +33,8 @@ public class Database {
     }
 
     /**
+     * @Deprecated - Not ready yet
+     *
      * Creates a table from a given class
      *
      * @param clazz Class with fields
diff --git a/com/Acrobot/Breeze/Database/EntityParser.java b/com/Acrobot/Breeze/Database/EntityParser.java
index bc05ae7..a0289c6 100644
--- a/com/Acrobot/Breeze/Database/EntityParser.java
+++ b/com/Acrobot/Breeze/Database/EntityParser.java
@@ -3,6 +3,7 @@ package com.Acrobot.Breeze.Database;
 import com.google.common.base.Joiner;
 
 import javax.persistence.Entity;
+import javax.persistence.Id;
 import java.lang.annotation.AnnotationFormatError;
 import java.lang.reflect.Field;
 import java.util.LinkedList;
@@ -46,6 +47,27 @@ public class EntityParser {
      * @return SQL type
      */
     public String convertToSQL(Field field) {
+        String sqlType = "";
+        Class<?> type = field.getType();
+
+        if (type.isAssignableFrom(String.class)) {
+            sqlType += "VARCHAR(255)";
+        } else if (type.isAssignableFrom(boolean.class)) {
+            sqlType += "BOOLEAN";
+        } else if (type.isAssignableFrom(int.class)) {
+            sqlType += "INTEGER";
+        } else if (type.isAssignableFrom(double.class)) {
+            sqlType += "DOUBLE";
+        } else if (type.isAssignableFrom(float.class)) {
+            sqlType += "FLOAT";
+        } else {
+            sqlType += "TEXT";
+        }
+
+        if (field.isAnnotationPresent(Id.class)) {
+            sqlType += " AUTO INCREMENT";
+        }
+
         return null; //TODO Finish this
     }
 }