diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd0ec54
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+*.class
diff --git a/.idea/libraries/libs.xml b/.idea/libraries/libs.xml
new file mode 100644
index 0000000..8faa3ad
--- /dev/null
+++ b/.idea/libraries/libs.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="libs">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/libs" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/libs" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules/TBA-API-V3.iml b/.idea/modules/TBA-API-V3.iml
index 6e9f014..df3ef78 100644
--- a/.idea/modules/TBA-API-V3.iml
+++ b/.idea/modules/TBA-API-V3.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="TBA-API-V3" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="TBA-API-V3" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.github.wdavies973" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
@@ -8,5 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="libs" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/TBA-API-V3_main.iml b/.idea/modules/TBA-API-V3_main.iml
index cb28de3..25eab92 100644
--- a/.idea/modules/TBA-API-V3_main.iml
+++ b/.idea/modules/TBA-API-V3_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="TBA-API-V3:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="TBA-API-V3:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.github.wdavies973" external.system.module.type="sourceSet" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
@@ -9,16 +9,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../libs/json-simple-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="Gradle: com.github.fangyidong:json-simple:tag_release_1_1_1" level="project" />
     <orderEntry type="library" name="Gradle: org.projectlombok:lombok:1.16.16" level="project" />
     <orderEntry type="library" name="Gradle: javax.annotation:jsr250-api:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="libs" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/TBA-API-V3_test.iml b/.idea/modules/TBA-API-V3_test.iml
index fa8f454..9f22f7e 100644
--- a/.idea/modules/TBA-API-V3_test.iml
+++ b/.idea/modules/TBA-API-V3_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="TBA-API-V3:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="TBA-API-V3:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.github.wdavies973" external.system.module.type="sourceSet" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -10,19 +10,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="TBA-API-V3_main" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../libs/json-simple-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="Gradle: com.github.fangyidong:json-simple:tag_release_1_1_1" level="project" />
     <orderEntry type="library" name="Gradle: org.projectlombok:lombok:1.16.16" level="project" />
     <orderEntry type="library" name="Gradle: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="libs" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="TBA-API-V3_main" />
 </module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..8f2955c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="TBA-API-V3:jar" />
+    </artifacts-to-build>
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="e6f9bfc7-54e6-4460-93d1-724a04783fba" name="Default" comment="" />
+    <ignored path="$PROJECT_DIR$/.gradle/" />
+    <ignored path="$PROJECT_DIR$/build/" />
+    <ignored path="$PROJECT_DIR$/out/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="TBA.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/main/TBA.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="287">
+              <caret line="504" column="32" lean-forward="false" selection-start-line="504" selection-start-column="32" selection-end-line="504" selection-end-column="32" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TeamRequest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/requests/TeamRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="202">
+              <caret line="248" column="27" lean-forward="false" selection-start-line="248" selection-start-column="27" selection-end-line="248" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Parser.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/utils/Parser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="296">
+              <caret line="173" column="9" lean-forward="false" selection-start-line="173" selection-start-column="9" selection-end-line="173" selection-end-column="9" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TeamEventStatusAlliance.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/models/other/teams/status/TeamEventStatusAlliance.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="modificationStamps">
+      <map>
+        <entry key="$PROJECT_DIR$" value="4563693657401" />
+      </map>
+    </option>
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/java/utils/Parser.java" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="189" />
+    <option name="width" value="1147" />
+    <option name="height" value="613" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
+      <pane id="AndroidView" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="TBA-API-V3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TBA-API-V3" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="TBA-API-V3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TBA-API-V3" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TBA-API-V3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TBA-API-V3" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="TBA-API-V3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TBA-API-V3" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TBA-API-V3" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TBA-API-V3" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/libs" />
+    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="e6f9bfc7-54e6-4460-93d1-724a04783fba" name="Default" comment="" />
+      <created>1521233293351</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1521233293351</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="189" y="0" width="1147" height="613" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3015031" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/main/TBA.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="504" column="32" lean-forward="false" selection-start-line="504" selection-start-column="32" selection-end-line="504" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/requests/TeamRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="248" column="27" lean-forward="false" selection-start-line="248" selection-start-column="27" selection-end-line="248" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/models/other/teams/status/TeamEventStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/models/other/teams/status/TeamEventStatusAlliance.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/utils/Parser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="173" column="9" lean-forward="false" selection-start-line="173" selection-start-column="9" selection-end-line="173" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <last-edited>TBA-API-V3:jar</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.5" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>TBA-API-V3</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>libs</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/out/artifacts/TBA_API_V3_jar/TBA-API-V3.jar b/out/artifacts/TBA_API_V3_jar/TBA-API-V3.jar
new file mode 100644
index 0000000..3c2022e
Binary files /dev/null and b/out/artifacts/TBA_API_V3_jar/TBA-API-V3.jar differ
diff --git a/src/main/java/main/TBA.java b/src/main/java/main/TBA.java
index fe4bfd4..744a7ff 100644
--- a/src/main/java/main/TBA.java
+++ b/src/main/java/main/TBA.java
@@ -6,6 +6,7 @@
 import models.other.Media;
 import models.other.events.EventOPR;
 import models.other.teams.Robot;
+import models.other.teams.status.TeamEventStatus;
 import models.simple.SEvent;
 import models.simple.SMatch;
 import models.simple.STeam;
@@ -492,6 +493,18 @@ public String[] getTeamEventKeys(int number) {
         return tr.getTeamEventKeys(number);
     }
 
+    /**
+     * Mirror of: /team/{team_key}/event/{event_key}/status
+     *
+     * Gets a list of the event keys for all events this team has competed at.
+     * @param number the team's frc number
+     * @param eventKey TBA Event Key, eg 2016nytr
+     * @return TeamEventStatus[] that gets the competition rank and status of the team at the given event.
+     */
+    public TeamEventStatus getTeamEventStatus(int number, String eventKey){
+        return tr.getTeamEventStatus(number, eventKey);
+    }
+
     /**
      * Mirror of: /team/{team_key}/events/{year}
      *
diff --git a/src/main/java/models/other/Media.java b/src/main/java/models/other/Media.java
index f96bad4..1da0b98 100644
--- a/src/main/java/models/other/Media.java
+++ b/src/main/java/models/other/Media.java
@@ -17,7 +17,7 @@ public class Media implements Serializable {
     /**
      * String type of the media element.
      */
-    private String type;
+    private String[] type;
     /**
      * The key used to identify this media on the media site.
      */
diff --git a/src/main/java/models/other/Ranking.java b/src/main/java/models/other/Ranking.java
index 0fd1c45..37543b8 100644
--- a/src/main/java/models/other/Ranking.java
+++ b/src/main/java/models/other/Ranking.java
@@ -20,7 +20,7 @@ public class Ranking implements Serializable {
     /**
      * The average match score during qualifications. Year specific. May be null if not relevant for a given year.
      */
-    private long qualAverage;
+    private double qualAverage;
     /**
      * The team’s rank at the event as provided by FIRST.
      */
@@ -38,7 +38,7 @@ public class Ranking implements Serializable {
     /**
      * Additional year-specific information, may be null. See parent `sort_order_info` for details.
      */
-    private long[] sortOrders;
+    private double[] sortOrders;
     /**
      * The team with this rank.
      */
diff --git a/src/main/java/models/other/teams/status/TeamEventStatusAlliance.java b/src/main/java/models/other/teams/status/TeamEventStatusAlliance.java
index 5f3a546..e385149 100644
--- a/src/main/java/models/other/teams/status/TeamEventStatusAlliance.java
+++ b/src/main/java/models/other/teams/status/TeamEventStatusAlliance.java
@@ -15,7 +15,7 @@ public class TeamEventStatusAlliance {
     /**
      * Alliance number.
      */
-    private int number;
+    private long number;
     /**
      * Backup status, may be null.
      */
@@ -23,5 +23,5 @@ public class TeamEventStatusAlliance {
     /**
      * Order the team was picked in the alliance from 0-2, with 0 being alliance captain.
      */
-    private int pick;
+    private long pick;
 }
diff --git a/src/main/java/models/other/teams/status/TeamEventStatusPlayoff.java b/src/main/java/models/other/teams/status/TeamEventStatusPlayoff.java
index c09c7f1..522f759 100644
--- a/src/main/java/models/other/teams/status/TeamEventStatusPlayoff.java
+++ b/src/main/java/models/other/teams/status/TeamEventStatusPlayoff.java
@@ -1,6 +1,7 @@
 package models.other.teams.status;
 
 import lombok.Data;
+import models.other.WLTRecord;
 
 /**
  * @since 1.0.0
@@ -15,9 +16,17 @@ public class TeamEventStatusPlayoff {
     /**
      * Record in playoffs as a string in the format WINS-LOSSES-TIES.
      */
-    private String record;
+    private WLTRecord record;
+    /**
+     * Record in current level of competition (e.g. QF, SF, F) as a string in the format WINS-LOSSES-TIES.
+     */
+    private WLTRecord currentLevelRecord;
     /**
      * Current competition status for the playoffs.
      */
-    private String[] status;
+    private String status;
+    /**
+     * The average match score during playoffs. Year specific. May be null if not relevant for a given year.
+     */
+    private Long playoffAverage;
 }
diff --git a/src/main/java/models/other/teams/status/TeamEventStatusRank.java b/src/main/java/models/other/teams/status/TeamEventStatusRank.java
index 8645300..68d5104 100644
--- a/src/main/java/models/other/teams/status/TeamEventStatusRank.java
+++ b/src/main/java/models/other/teams/status/TeamEventStatusRank.java
@@ -12,8 +12,8 @@ public class TeamEventStatusRank {
     /**
      * Number of teams ranked.
      */
-    private int numTeams;
-    private Ranking[] ranking;
+    private Long numTeams;
+    private Ranking ranking;
     /**
      * Ordered list of names corresponding to the elements of the `sort_orders` array.
      */
diff --git a/src/main/java/requests/TeamRequest.java b/src/main/java/requests/TeamRequest.java
index a1af702..c0075e2 100644
--- a/src/main/java/requests/TeamRequest.java
+++ b/src/main/java/requests/TeamRequest.java
@@ -4,6 +4,7 @@
 import models.other.Media;
 import models.other.District;
 import models.other.teams.Robot;
+import models.other.teams.status.TeamEventStatus;
 import models.simple.SEvent;
 import models.simple.SMatch;
 import models.simple.STeam;
@@ -11,6 +12,7 @@
 import models.standard.Match;
 import models.standard.Team;
 import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
 import utils.IO;
 import utils.Parser;
 import utils.Utils;
@@ -233,6 +235,20 @@ public String[] getTeamEventKeys(int number) {
         return Utils.jsonArrayToStringArray(keys);
     }
 
+    /**
+     * Mirror of: /team/{team_key}/event/{event_key}/status
+     *
+     * Gets a list of the event keys for all events this team has competed at.
+     * @param number the team's frc number
+     * @param eventKey TBA Event Key, eg 2016nytr
+     * @return TeamEventStatus[] that gets the competition rank and status of the team at the given event.
+     */
+    public TeamEventStatus getTeamEventStatus(int number, String eventKey){
+        JSONObject status = (JSONObject) IO.doRequest("team/frc"+number+"/event/"+eventKey+"/status");
+        if(status == null) throw new DataNotFoundException("Couldn't find any event status for team with number: frc"+number+" at event "+eventKey);
+        return parseTeamEventStatus(status);
+    }
+
     /**
      * Mirror of: /team/{team_key}/events/{year}
      *
diff --git a/src/main/java/utils/Parser.java b/src/main/java/utils/Parser.java
index caadcfd..53f33a7 100644
--- a/src/main/java/utils/Parser.java
+++ b/src/main/java/utils/Parser.java
@@ -1,14 +1,11 @@
 package utils;
 
-import models.other.APIStatus;
-import models.other.Award;
-import models.other.AwardRecipient;
-import models.other.Media;
+import models.other.*;
 import models.other.events.EventOPR;
 import models.other.events.Webcast;
 import models.other.matches.MatchAlliance;
-import models.other.District;
 import models.other.teams.Robot;
+import models.other.teams.status.*;
 import models.simple.SEvent;
 import models.simple.SMatch;
 import models.simple.STeam;
@@ -167,11 +164,104 @@ protected SEvent parseSEvent(Object object) {
         return e;
     }
 
+    protected TeamEventStatus parseTeamEventStatus(Object object){
+        TeamEventStatus t = new TeamEventStatus();
+        HashMap hash = (HashMap) object;
+        t.setQual(parseTeamEventStatusRank(hash.get("qual")));
+        t.setAlliance(new TeamEventStatusAlliance());
+        if(hash.get("alliance") != null){
+            t.setAlliance(parseTeamEventStatusAlliance(hash.get("alliance")));
+        }
+
+        t.setPlayoff(parseTeamEventStatusPlayoff(hash.get("playoff")));
+        t.setAllianceStatus((String)hash.get("alliance_status_str"));
+        t.setPlayoffStatus((String)hash.get("playoff_status_str"));
+        t.setOverallStatus((String)hash.get("overall_status_str"));
+        return t;
+    }
+
+    protected TeamEventStatusRank parseTeamEventStatusRank(Object object){
+        TeamEventStatusRank t = new TeamEventStatusRank();
+        HashMap hash = (HashMap) object;
+        t.setNumTeams(Utils.cleanLong(hash.get("num_teams")));
+        t.setRanking(parseRanking(hash.get("ranking")));
+        JSONArray sortOrderList = (JSONArray)hash.get("sort_order_info");
+        SortInfo[] si = new SortInfo[sortOrderList.size()];
+        for(int i = 0; i < sortOrderList.size(); i++) {
+            si[i] = parseSortInfo(sortOrderList.get(i));
+        }
+        t.setSortOrderInfo(si);
+        return t;
+    }
+
+    protected Ranking parseRanking(Object object){
+        Ranking r = new Ranking();
+        HashMap hash = (HashMap) object;
+        r.setDq(Utils.cleanLong(hash.get("dq")));
+        r.setMatchesPlayed(Utils.cleanLong(hash.get("matches_played")));
+        r.setQualAverage(Utils.cleanDouble(hash.get("qual_average")));
+        r.setRank(Utils.cleanLong(hash.get("rank")));
+        r.setQualificationsRecord(parseWLTRecord(hash.get("record")));
+        r.setOverallRecord(null);
+        JSONArray sortOrders = (JSONArray)hash.get("sort_orders");
+        r.setSortOrders(Utils.jsonArrayToDoublesArray(sortOrders));
+        r.setTeamKey((String)hash.get("team_key"));
+        return r;
+    }
+
+    protected WLTRecord parseWLTRecord(Object object){
+        WLTRecord w = new WLTRecord();
+        HashMap hash = (HashMap) object;
+        w.setLosses(Utils.cleanLong(hash.get("losses")));
+        w.setWins(Utils.cleanLong(hash.get("wins")));
+        w.setTies(Utils.cleanLong(hash.get("ties")));
+        return w;
+    }
+
+    protected SortInfo parseSortInfo(Object object){
+        SortInfo s = new SortInfo();
+        HashMap hash = (HashMap) object;
+        s.setName((String)hash.get("name"));
+        s.setPrecision(Utils.cleanLong(hash.get("precision")));
+        return s;
+    }
+
+    protected TeamEventStatusAlliance parseTeamEventStatusAlliance(Object object){
+        TeamEventStatusAlliance t = new TeamEventStatusAlliance();
+        HashMap hash = (HashMap) object;
+        t.setName((String)hash.get("name"));
+        t.setNumber(Utils.cleanLong(hash.get("number")));
+        t.setBackup(parseTeamEventStatusAllianceBackup(hash.get("backup")));
+        t.setPick(Utils.cleanLong(hash.get("pick")));
+        return t;
+    }
+
+    protected TeamEventStatusAllianceBackup parseTeamEventStatusAllianceBackup(Object object){
+        TeamEventStatusAllianceBackup t = new TeamEventStatusAllianceBackup();
+        HashMap hash = (HashMap) object;
+        if(hash == null)return null;
+        t.setOut((String)hash.get("out"));
+        t.setIn((String)hash.get("in"));
+        return t;
+    }
+
+    protected TeamEventStatusPlayoff parseTeamEventStatusPlayoff(Object object){
+        TeamEventStatusPlayoff t = new TeamEventStatusPlayoff();
+        HashMap hash = (HashMap) object;
+        if(hash == null) return null;
+        t.setLevel((String)hash.get("level"));
+        t.setCurrentLevelRecord(parseWLTRecord(hash.get("current_level_record")));
+        t.setRecord(parseWLTRecord(hash.get("record")));
+        t.setStatus((String)hash.get("status"));
+        t.setPlayoffAverage(Utils.cleanLong(hash.get("playoff_average")));
+        return t;
+    }
+
     protected Media parseMedia(Object object) {
         Media media = new Media();
         HashMap hash = (HashMap)object;
         media.setKey((String)hash.get("key"));
-        media.setType((String)hash.get("type"));
+        media.setType(Utils.jsonArrayToStringArray((JSONArray)hash.get("type")));
         media.setForeignKey((String)hash.get("foreign_key"));
         media.setDetails((String)hash.get("details"));
         media.setPreferred(Utils.cleanBoolean(hash.get("preferred")));
diff --git a/src/main/java/utils/Utils.java b/src/main/java/utils/Utils.java
index ae17661..5ea831b 100644
--- a/src/main/java/utils/Utils.java
+++ b/src/main/java/utils/Utils.java
@@ -29,4 +29,18 @@ public static String[] jsonArrayToStringArray(JSONArray jsonArray) {
         return toReturn;
     }
 
+    public static long[] jsonArrayToLongArray(JSONArray jsonArray){
+        if(jsonArray == null) return null;
+        long[] toReturn = new long[jsonArray.size()];
+        for(int i = 0; i < jsonArray.size(); i++) toReturn[i] = cleanLong(jsonArray.get(i));
+        return toReturn;
+    }
+
+    public static double[] jsonArrayToDoublesArray(JSONArray jsonArray){
+        if(jsonArray == null) return null;
+        double[] toReturn = new double[jsonArray.size()];
+        for(int i = 0; i < jsonArray.size(); i++) toReturn[i] = cleanDouble(jsonArray.get(i));
+        return toReturn;
+    }
+
 }