diff --git a/API/.idea/workspace.xml b/API/.idea/workspace.xml
index 10c07231..1c0b217a 100644
--- a/API/.idea/workspace.xml
+++ b/API/.idea/workspace.xml
@@ -10,14 +10,7 @@
     <bookmark url="file://$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java" line="21" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="103113f6-8a1c-45a3-9b02-5a992cc6cbb2" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cc/funkemunky/api/database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cc/funkemunky/api/database/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cc/funkemunky/api/utils/FunkeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cc/funkemunky/api/utils/FunkeFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cc/funkemunky/api/utils/MiscUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cc/funkemunky/api/utils/MiscUtils.java" afterDir="false" />
-    </list>
+    <list default="true" id="103113f6-8a1c-45a3-9b02-5a992cc6cbb2" name="Default Changelist" comment="" />
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -85,24 +78,24 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="java" value="21" />
-          <entry key="yml" value="1" />
+          <entry key="yml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="JAVA" value="21" />
-          <entry key="YAML" value="1" />
+          <entry key="YAML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="4349" />
+          <entry key="java" value="4405" />
           <entry key="yml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="4349" />
+          <entry key="JAVA" value="4405" />
           <entry key="YAML" value="1" />
         </counts>
       </usages-collector>
@@ -110,11 +103,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="721">
-              <caret line="57" column="15" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="15" />
+            <state relative-caret-position="272">
+              <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
               <folding>
                 <element signature="e#1654#1655#0" expanded="true" />
                 <element signature="e#1709#1710#0" expanded="true" />
@@ -145,7 +138,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="544">
+            <state relative-caret-position="-272">
               <caret line="71" column="48" selection-start-line="71" selection-start-column="48" selection-end-line="71" selection-end-column="48" />
             </state>
           </provider>
@@ -172,8 +165,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
+            <state relative-caret-position="204">
+              <caret line="12" column="26" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#905#906#0" expanded="true" />
@@ -194,10 +187,10 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/mongo/MongoDatabase.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="568">
+            <state relative-caret-position="789">
               <caret line="52" column="11" selection-start-line="52" selection-start-column="11" selection-end-line="52" selection-end-column="11" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -210,6 +203,15 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/resources/plugin.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/utils/MiscUtils.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -323,12 +325,12 @@
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/utils/MiscUtils.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/utils/FunkeFile.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/DatabaseType.java" />
-        <option value="$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseType.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/mongo/Mongo.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java" />
         <option value="$PROJECT_DIR$/src/cc/funkemunky/api/database/mongo/MongoDatabase.java" />
+        <option value="$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java" />
       </list>
     </option>
   </component>
@@ -562,7 +564,7 @@
     <property name="Repository.Attach.JavaDocs" value="false" />
     <property name="Repository.Attach.Sources" value="false" />
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://C:/Users/suckm/Documents/GitHub/Atlas/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java&#10;EntityLiving&#9;FILE&#9;jar:///Users/dawson/Documents/GitHub/Atlas/compiled-depends/spigot-1.7.10-SNAPSHOT-b1657.jar!/net/minecraft/server/v1_7_R4/EntityLiving.class&#10;EntityPlayer&#9;PSI&#9;JAVA://net.minecraft.server.v1_7_R4.EntityPlayer&#10;net.minecraft.server.Entity&#9;PSI&#9;JAVA://net.minecraft.server.v1_7_R4.Entity&#10;MinecraftServer&#9;PSI&#9;JAVA://net.minecraft.server.v1_8_R3.MinecraftServer&#10;DedicatedServer&#9;PSI&#9;JAVA://net.minecraft.server.v1_8_R3.DedicatedServer&#10;Minecraft&#9;FILE&#9;jar:///Users/dawson/Documents/GitHub/Atlas/compiled-depends/spigot-1.11.1.jar!/net/minecraft/server/v1_11_R1/MinecraftServer.class&#10;JavaPLugin&#9;PSI&#9;JAVA://org.bukkit.plugin.java.JavaPlugin" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548609321026" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548612258327" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Libraries" />
     <property name="project.structure.proportion" value="0.15917969" />
@@ -627,7 +629,7 @@
       <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Messages" order="10" visible="true" weight="0.32379517" />
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.32379517" />
       <window_info anchor="bottom" id="Thumbnails" order="11" weight="0.3286119" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -814,13 +816,6 @@
     <entry file="file://$PROJECT_DIR$/Atlas.iml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/plugin.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/commands/FunkeCommand.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2175">
@@ -978,13 +973,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="71" column="48" selection-start-line="71" selection-start-column="48" selection-end-line="71" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
@@ -1007,17 +995,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java">
+    <entry file="file://$PROJECT_DIR$/resources/plugin.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#905#906#0" expanded="true" />
-            <element signature="e#942#943#0" expanded="true" />
-            <element signature="e#998#999#0" expanded="true" />
-            <element signature="e#1021#1022#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="34">
+          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/Atlas.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-272">
+          <caret line="71" column="48" selection-start-line="71" selection-start-column="48" selection-end-line="71" selection-end-column="48" />
         </state>
       </provider>
     </entry>
@@ -1028,22 +1016,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java">
+    <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/DatabaseManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="721">
-          <caret line="57" column="15" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="15" />
+        <state relative-caret-position="204">
+          <caret line="12" column="26" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
           <folding>
-            <element signature="e#1654#1655#0" expanded="true" />
-            <element signature="e#1709#1710#0" expanded="true" />
-            <element signature="e#1741#1742#0" expanded="true" />
-            <element signature="e#1781#1782#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#905#906#0" expanded="true" />
+            <element signature="e#942#943#0" expanded="true" />
+            <element signature="e#998#999#0" expanded="true" />
+            <element signature="e#1021#1022#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/mongo/MongoDatabase.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="568">
+        <state relative-caret-position="789">
           <caret line="52" column="11" selection-start-line="52" selection-start-column="11" selection-end-line="52" selection-end-column="11" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1055,6 +1044,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
+          <folding>
+            <element signature="e#1654#1655#0" expanded="true" />
+            <element signature="e#1709#1710#0" expanded="true" />
+            <element signature="e#1741#1742#0" expanded="true" />
+            <element signature="e#1781#1782#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/API/out/artifacts/Atlas_jar/Atlas.jar b/API/out/artifacts/Atlas_jar/Atlas.jar
index af1ae319..9efbcdb7 100644
Binary files a/API/out/artifacts/Atlas_jar/Atlas.jar and b/API/out/artifacts/Atlas_jar/Atlas.jar differ
diff --git a/API/out/production/Atlas/cc/funkemunky/api/database/Database.class b/API/out/production/Atlas/cc/funkemunky/api/database/Database.class
index b1a0ba0b..65372ea9 100644
Binary files a/API/out/production/Atlas/cc/funkemunky/api/database/Database.class and b/API/out/production/Atlas/cc/funkemunky/api/database/Database.class differ
diff --git a/API/out/production/Atlas/cc/funkemunky/api/database/flatfile/FlatfileDatabase.class b/API/out/production/Atlas/cc/funkemunky/api/database/flatfile/FlatfileDatabase.class
index 420d178b..bc5a3bb9 100644
Binary files a/API/out/production/Atlas/cc/funkemunky/api/database/flatfile/FlatfileDatabase.class and b/API/out/production/Atlas/cc/funkemunky/api/database/flatfile/FlatfileDatabase.class differ
diff --git a/API/out/production/Atlas/cc/funkemunky/api/database/mongo/MongoDatabase.class b/API/out/production/Atlas/cc/funkemunky/api/database/mongo/MongoDatabase.class
index 167eb8d9..af651a12 100644
Binary files a/API/out/production/Atlas/cc/funkemunky/api/database/mongo/MongoDatabase.class and b/API/out/production/Atlas/cc/funkemunky/api/database/mongo/MongoDatabase.class differ
diff --git a/API/src/cc/funkemunky/api/database/Database.java b/API/src/cc/funkemunky/api/database/Database.java
index b7ef3520..7781e3d4 100644
--- a/API/src/cc/funkemunky/api/database/Database.java
+++ b/API/src/cc/funkemunky/api/database/Database.java
@@ -12,11 +12,14 @@
 public abstract class Database {
     private String name;
     private Plugin plugin;
+    private DatabaseType type;
     private Map<String, Object> databaseValues;
 
-    public Database(String name, Plugin plugin) {
+    public Database(String name, Plugin plugin, DatabaseType type) {
         this.name = name;
         this.plugin = plugin;
+        this.type = type;
+
         databaseValues = new ConcurrentHashMap<>();
     }
 
diff --git a/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java b/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java
index d8af47d0..1edf6f72 100644
--- a/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java
+++ b/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java
@@ -1,6 +1,7 @@
 package cc.funkemunky.api.database.flatfile;
 
 import cc.funkemunky.api.database.Database;
+import cc.funkemunky.api.database.DatabaseType;
 import cc.funkemunky.api.utils.FunkeFile;
 import cc.funkemunky.api.utils.MiscUtils;
 import lombok.Getter;
@@ -12,7 +13,7 @@
 public class FlatfileDatabase extends Database {
     private FunkeFile file;
     public FlatfileDatabase(String name, Plugin plugin) {
-        super(name, plugin);
+        super(name, plugin, DatabaseType.FLATFILE);
 
         file = new FunkeFile(plugin, "databases", name + ".txt");
     }
diff --git a/API/src/cc/funkemunky/api/database/mongo/MongoDatabase.java b/API/src/cc/funkemunky/api/database/mongo/MongoDatabase.java
index ccd0fca0..699813c1 100644
--- a/API/src/cc/funkemunky/api/database/mongo/MongoDatabase.java
+++ b/API/src/cc/funkemunky/api/database/mongo/MongoDatabase.java
@@ -2,6 +2,7 @@
 
 import cc.funkemunky.api.Atlas;
 import cc.funkemunky.api.database.Database;
+import cc.funkemunky.api.database.DatabaseType;
 import cc.funkemunky.api.mongo.Mongo;
 import com.mongodb.Block;
 import com.mongodb.client.MongoCollection;
@@ -15,7 +16,7 @@
 public class MongoDatabase extends Database {
     private MongoCollection<Document> collection;
     public MongoDatabase(String name, Plugin plugin) {
-        super(name, plugin);
+        super(name, plugin, DatabaseType.MONGO);
 
         collection = Atlas.getInstance().getMongo().getMongoDatabase().getCollection(name);
     }
@@ -31,7 +32,7 @@ public void loadDatabase() {
     public void saveDatabase() {
         Map<String, Map<String, Object>> toSort = new HashMap<>();
         getDatabaseValues().keySet().forEach(key -> {
-            String[] toFormat = key.split(".");
+            String[] toFormat = key.split(";");
 
             Map<String, Object> objects = toSort.getOrDefault(toFormat[0], new HashMap<>());