diff --git a/.idea/artifacts/LoginServer.xml b/.idea/artifacts/LoginServer.xml
new file mode 100644
index 0000000..2234cde
--- /dev/null
+++ b/.idea/artifacts/LoginServer.xml
@@ -0,0 +1,21 @@
+<component name="ArtifactManager">
+  <artifact type="jar" build-on-make="true" name="LoginServer">
+    <output-path>$PROJECT_DIR$/out/artifacts/LoginServer</output-path>
+    <root id="archive" name="AOTSK-Login-Delegation-Server.jar">
+      <element id="module-output" name="AOTSK-Login-Delegation-Server" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/bson/4.3.2/bson-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/4.3.2/mongodb-driver-core-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/jfoenix/jfoenix/8.0.10/jfoenix-8.0.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.14.2/jsoup-1.14.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.3.2/mongodb-driver-sync-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/controlsfx/controlsfx/11.1.1/controlsfx-11.1.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/lingala/zip4j/zip4j/2.6.1/zip4j-2.6.1.jar" path-in-jar="/" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Server.xml b/.idea/runConfigurations/Server_Client_.xml
similarity index 70%
rename from .idea/runConfigurations/Server.xml
rename to .idea/runConfigurations/Server_Client_.xml
index 042cd12..6d2336a 100644
--- a/.idea/runConfigurations/Server.xml
+++ b/.idea/runConfigurations/Server_Client_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server" type="Application" factoryName="Application">
+  <configuration default="false" name="Server Client " type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="com.jamesquinley.startup" />
     <module name="AOTSK-Login-Delegation-Server" />
     <method v="2">
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dd8b904
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.jamesquinley.startup
+
diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index bc60cda..dd5f720 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -40,100 +40,110 @@ public class delegationServices {
     public static void delegationProcesser() {
         Document Lrequest = dCollection.find(eq("status", false)).first();
         int ClientID = 0;
-        try {
-           ClientID = (int) Lrequest.get("clientid");
-       } catch (Exception exrp) {
-       }
 
-        //TODO ADD BAN CHECK TO PREVENT BAN CIRCUMNAVIGATION, THIS WILL BE ADDED LATER (This is being tested, already implemented)
-        String username = (String) Lrequest.get("User");
-        String password = (String) Lrequest.get("Password");
-        int CTOKEN = (int) Lrequest.get("Token");
         int requesttype = (int) Lrequest.get("type");
-        if (requesttype == 0) {
-            System.out.println("Sync Request (Read" +
-                    ")");
-            Document accountServer;
-            String Password;
-           int Token;
-            String Fname;
-            String Path;
-            String UserName;
-            String Email;
+        System.out.println("Got Type, Getting Doc ID");
+
+        //TODO Get this working, it broke and it wont get OBJ id
+
+        System.out.println("Delegation Has Started");
+        if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12) {
+         if (requesttype == 7) {
+             System.out.println("An Excluded Request (7MAL) Has Been Detected, Ignoring");
+         }
+            String username = (String) Lrequest.get("User");
+            String password = (String) Lrequest.get("Password");
             try {
-                accountServer = accountS.find(eq("Token", CTOKEN)).first();
-             Token = (int) accountServer.get("Token");
-                if (accountServer.get("Status").equals("Active")) {
-                    if (Token == CTOKEN) {
-                        Token = (int) accountServer.get("Token");
-                        Password = (String) accountServer.get("Password");
-                        Fname = (String) accountServer.get("FName");
-                        Path = (String) accountServer.get("Path");
-                        Email = (String) accountServer.get("Email");
-                        UserName = (String) accountServer.get("User");
-                        BasicDBObject searchQuery = new BasicDBObject();
-                        searchQuery.append("clientid", ClientID);
-                        BasicDBObject updateQuery = new BasicDBObject();
-                        BasicDBObject updateQuery1 = new BasicDBObject();
-                        BasicDBObject updateQuery2 = new BasicDBObject();
-                        BasicDBObject updateQuery3 = new BasicDBObject();
-                        BasicDBObject updateQuery4 = new BasicDBObject();
-                        BasicDBObject updateQuery5 = new BasicDBObject();
-                        BasicDBObject updateQuery6 = new BasicDBObject();
-                        BasicDBObject updateQuery7 = new BasicDBObject();
-                        updateQuery.append("$set",
-                                new BasicDBObject().append("type", 12));
-                        updateQuery1.append("$set",
-                                new BasicDBObject().append("Token", Token));
-                        updateQuery2.append("$set",
-                                new BasicDBObject().append("Fname", Fname));
-                        updateQuery3.append("$set",
-                                new BasicDBObject().append("Path", Path));
-                        updateQuery4.append("$set",
-                                new BasicDBObject().append("User", UserName));
-                        updateQuery5.append("$set",
-                                new BasicDBObject().append("Password", Password));
-                        updateQuery7.append("$set",
-                                new BasicDBObject().append("Email", Email));
-                        updateQuery6.append("$set",
-                                new BasicDBObject().append("status", true));
-                        dCollection.updateOne(searchQuery, updateQuery);
-                        dCollection.updateOne(searchQuery, updateQuery1);
-                        dCollection.updateOne(searchQuery, updateQuery2);
-                        dCollection.updateOne(searchQuery, updateQuery3);
-                        dCollection.updateOne(searchQuery, updateQuery4);
-                        dCollection.updateOne(searchQuery, updateQuery5);
-                        dCollection.updateOne(searchQuery, updateQuery6);
-                        dCollection.updateOne(searchQuery, updateQuery7);
+                ClientID = (int) Lrequest.get("clientid");
+            } catch (Exception exrp) {
+                System.out.println("Failed To Get Client ID");
+            }
+            int CTOKEN = (int) Lrequest.get("Token");
+
+
+            if (requesttype == 0) {
+                System.out.println("Sync Request (Read)");
+                Document accountServer;
+                String Password;
+                int Token;
+                String Fname;
+                String Path;
+                String UserName;
+                String Email;
+                try {
+                    accountServer = accountS.find(eq("Token", CTOKEN)).first();
+                    Token = (int) accountServer.get("Token");
+                    if (accountServer.get("Status").equals(true)) {
+                        if (Token == CTOKEN) {
+                            Token = (int) accountServer.get("Token");
+                            Password = (String) accountServer.get("Password");
+                            Fname = (String) accountServer.get("FName");
+                            Path = (String) accountServer.get("Path");
+                            Email = (String) accountServer.get("Email");
+                            UserName = (String) accountServer.get("User");
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            BasicDBObject updateQuery2 = new BasicDBObject();
+                            BasicDBObject updateQuery3 = new BasicDBObject();
+                            BasicDBObject updateQuery4 = new BasicDBObject();
+                            BasicDBObject updateQuery5 = new BasicDBObject();
+                            BasicDBObject updateQuery6 = new BasicDBObject();
+                            BasicDBObject updateQuery7 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 12));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("Token", Token));
+                            updateQuery2.append("$set",
+                                    new BasicDBObject().append("Fname", Fname));
+                            updateQuery3.append("$set",
+                                    new BasicDBObject().append("Path", Path));
+                            updateQuery4.append("$set",
+                                    new BasicDBObject().append("User", UserName));
+                            updateQuery5.append("$set",
+                                    new BasicDBObject().append("Password", Password));
+                            updateQuery7.append("$set",
+                                    new BasicDBObject().append("Email", Email));
+                            updateQuery6.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery1);
+                            dCollection.updateOne(searchQuery, updateQuery2);
+                            dCollection.updateOne(searchQuery, updateQuery3);
+                            dCollection.updateOne(searchQuery, updateQuery4);
+                            dCollection.updateOne(searchQuery, updateQuery5);
+                            dCollection.updateOne(searchQuery, updateQuery6);
+                            dCollection.updateOne(searchQuery, updateQuery7);
+                        } else {
+                            System.out.println("Sync Failure");
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
+
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 9));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery1);
+                            //delegationTimer.trigger();
+                        }
                     } else {
-                        System.out.println("Sync Failure");
+                        System.out.println("Banned Account");
                         BasicDBObject searchQuery = new BasicDBObject();
                         searchQuery.append("clientid", ClientID);
 
                         BasicDBObject updateQuery = new BasicDBObject();
                         BasicDBObject updateQuery1 = new BasicDBObject();
                         updateQuery.append("$set",
-                                new BasicDBObject().append("type", 9));
+                                new BasicDBObject().append("type", 11));
                         updateQuery1.append("$set",
                                 new BasicDBObject().append("status", true));
                         dCollection.updateOne(searchQuery, updateQuery);
                         dCollection.updateOne(searchQuery, updateQuery1);
-                        //delegationTimer.trigger();
                     }
-                } else {
-                    System.out.println("Banned Account");
-                    BasicDBObject searchQuery = new BasicDBObject();
-                    searchQuery.append("clientid", ClientID);
-
-                    BasicDBObject updateQuery = new BasicDBObject();
-                    BasicDBObject updateQuery1 = new BasicDBObject();
-                    updateQuery.append("$set",
-                            new BasicDBObject().append("type", 11));
-                    updateQuery1.append("$set",
-                            new BasicDBObject().append("status", true));
-                    dCollection.updateOne(searchQuery, updateQuery);
-                    dCollection.updateOne(searchQuery, updateQuery1);
-                }
                 }  catch(MongoCommandException ERC){
                     System.out.println("Malformed Request");
                     BasicDBObject searchQuery = new BasicDBObject();
@@ -152,171 +162,99 @@ public class delegationServices {
             }
 
             //sync read request
-        //TODO This has issues, and won't get past line 171. Working on a fix for that.
-        if (requesttype == 1) {
-            System.out.println("Sync Request (Write)");
-            Document accountServer;
-            String Password;
-            int Token;
-            String Fname;
-            String Path;
-            String UserName;
-            String Email;
-            try {
-                accountServer = accountS.find(eq("Token", CTOKEN)).first();
-                Token = (int) accountServer.get("Token");
-                if (accountServer.get("Status").equals("Active")) {
-                    System.out.println("Account is OK");
-                    if (Token == CTOKEN) {
-                        System.out.println("Logged In");
-                        Token = (int) Lrequest.get("Token");
-                        Password = (String) Lrequest.get("Password");
-                        Fname = (String) Lrequest.get("FName");
-                        Path = (String) Lrequest.get("path");
-                        Email = (String) Lrequest.get("Email");
-                        UserName = (String) Lrequest.get("User");
+            //TODO This has issues, and won't get past line 171. Working on a fix for that.
+            if (requesttype == 1) {
+                System.out.println("Sync Request (Write)");
+                Document accountServer;
+                String Password;
+                int Token;
+                String Fname;
+                String Path;
+                String UserName;
+                String Email;
+                try {
+                    accountServer = accountS.find(eq("Token", CTOKEN)).first();
+                    Token = (int) accountServer.get("Token");
+                    if (accountServer.get("Status").equals(true)) {
+                        System.out.println("Account is OK");
+                        if (Token == CTOKEN) {
+                            System.out.println("Logged In");
+                            Token = (int) Lrequest.get("Token");
+                            Password = (String) Lrequest.get("Password");
+                            Fname = (String) Lrequest.get("FName");
+                            Path = (String) Lrequest.get("path");
+                            Email = (String) Lrequest.get("Email");
+                            UserName = (String) Lrequest.get("User");
 
-                        BasicDBObject searchQuery = new BasicDBObject();
-                        searchQuery.append("Token", Token);
-                        BasicDBObject SqS = new BasicDBObject();
-                       SqS.append("clientid", ClientID);
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("Token", Token);
+                            BasicDBObject SqS = new BasicDBObject();
+                            SqS.append("clientid", ClientID);
 
-                        BasicDBObject updateQuery = new BasicDBObject();
-                        BasicDBObject updateQuery1 = new BasicDBObject();
-                        BasicDBObject updateQuery2 = new BasicDBObject();
-                        BasicDBObject updateQuery3 = new BasicDBObject();
-                        BasicDBObject updateQuery4 = new BasicDBObject();
-                        BasicDBObject updateQuery5 = new BasicDBObject();
-                        BasicDBObject updateQuery6 = new BasicDBObject();
-                        BasicDBObject updateQuery7 = new BasicDBObject();
-                        updateQuery.append("$set",
-                                new BasicDBObject().append("type", 12));
-                        updateQuery1.append("$set",
-                                new BasicDBObject().append("Token", Token));
-                        updateQuery2.append("$set",
-                                new BasicDBObject().append("FName", Fname));
-                        updateQuery3.append("$set",
-                                new BasicDBObject().append("Path", Path));
-                        updateQuery4.append("$set",
-                                new BasicDBObject().append("User", UserName));
-                        updateQuery7.append("$set",
-                                new BasicDBObject().append("Email", Email));
-                        updateQuery6.append("$set",
-                                new BasicDBObject().append("status", true));
-                        //    System.out.println("Sending Info To Forwarding Server");
-                        dCollection.updateOne(SqS, updateQuery);
-                        dCollection.updateOne(SqS, updateQuery6);
-                        accountS.updateOne(searchQuery, updateQuery1);
-                        accountS.updateOne(searchQuery, updateQuery2);
-                        accountS.updateOne(searchQuery, updateQuery3);
-                        accountS.updateOne(searchQuery, updateQuery4);
-                        accountS.updateOne(searchQuery, updateQuery5);
-                        accountS.updateOne(searchQuery, updateQuery7);
-                        System.out.println("Updated Account");
-                        //delegationTimer.trigger();
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            BasicDBObject updateQuery2 = new BasicDBObject();
+                            BasicDBObject updateQuery3 = new BasicDBObject();
+                            BasicDBObject updateQuery4 = new BasicDBObject();
+                            BasicDBObject updateQuery5 = new BasicDBObject();
+                            BasicDBObject updateQuery6 = new BasicDBObject();
+                            BasicDBObject updateQuery7 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 12));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("Token", Token));
+                            updateQuery2.append("$set",
+                                    new BasicDBObject().append("FName", Fname));
+                            updateQuery3.append("$set",
+                                    new BasicDBObject().append("Path", Path));
+                            updateQuery4.append("$set",
+                                    new BasicDBObject().append("User", UserName));
+                            updateQuery7.append("$set",
+                                    new BasicDBObject().append("Email", Email));
+                            updateQuery6.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            //    System.out.println("Sending Info To Forwarding Server");
+                            dCollection.updateOne(SqS, updateQuery);
+                            dCollection.updateOne(SqS, updateQuery6);
+                            accountS.updateOne(searchQuery, updateQuery1);
+                            accountS.updateOne(searchQuery, updateQuery2);
+                            accountS.updateOne(searchQuery, updateQuery3);
+                            accountS.updateOne(searchQuery, updateQuery4);
+                            accountS.updateOne(searchQuery, updateQuery5);
+                            accountS.updateOne(searchQuery, updateQuery7);
+                            System.out.println("Updated Account");
+                            //delegationTimer.trigger();
+                        } else {
+                            System.out.println("Sync Failure");
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
+
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 9));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery1);
+                            //delegationTimer.trigger();
+                        }
                     } else {
-                        System.out.println("Sync Failure");
+                        System.out.println("Banned Account");
                         BasicDBObject searchQuery = new BasicDBObject();
                         searchQuery.append("clientid", ClientID);
 
                         BasicDBObject updateQuery = new BasicDBObject();
                         BasicDBObject updateQuery1 = new BasicDBObject();
                         updateQuery.append("$set",
-                                new BasicDBObject().append("type", 9));
+                                new BasicDBObject().append("type", 11));
                         updateQuery1.append("$set",
                                 new BasicDBObject().append("status", true));
                         dCollection.updateOne(searchQuery, updateQuery);
                         dCollection.updateOne(searchQuery, updateQuery1);
-                        //delegationTimer.trigger();
                     }
-                } else {
-                    System.out.println("Banned Account");
-                    BasicDBObject searchQuery = new BasicDBObject();
-                    searchQuery.append("clientid", ClientID);
-
-                    BasicDBObject updateQuery = new BasicDBObject();
-                    BasicDBObject updateQuery1 = new BasicDBObject();
-                    updateQuery.append("$set",
-                            new BasicDBObject().append("type", 11));
-                    updateQuery1.append("$set",
-                            new BasicDBObject().append("status", true));
-                    dCollection.updateOne(searchQuery, updateQuery);
-                    dCollection.updateOne(searchQuery, updateQuery1);
-                }
-            }  catch(MongoCommandException ERC){
-                System.out.println("Malformed Request");
-                BasicDBObject searchQuery = new BasicDBObject();
-                searchQuery.append("clientid", ClientID);
-
-                BasicDBObject updateQuery = new BasicDBObject();
-                BasicDBObject updateQuery1 = new BasicDBObject();
-                updateQuery.append("$set",
-                        new BasicDBObject().append("type", 7));
-                updateQuery1.append("$set",
-                        new BasicDBObject().append("status", true));
-                dCollection.updateOne(searchQuery, updateQuery);
-                dCollection.updateOne(searchQuery, updateQuery1);
-                //delegationTimer.trigger();
-            }
-        }
-        if (requesttype == 2) {
-            System.out.println("Login Request (USR&PASS)");
-            Document accountServer;
-            String Password;
-            int Token;
-            String Fname;
-            String Path;
-            String UserName;
-            String Email;
-        try {
-            accountServer = accountS.find(eq("User", username)).first();
-           Password = (String) accountServer.get("Password");
-            if (accountServer.get("Status").equals("Active")) {
-                if (Password.equals(password)) {
-                    Token = (int) accountServer.get("Token");
-                    Fname = (String) accountServer.get("FName");
-                    Path = (String) accountServer.get("Path");
-                    Email = (String) accountServer.get("Email");
-                    UserName = (String) accountServer.get("User");
-
-                    BasicDBObject searchQuery = new BasicDBObject();
-                    searchQuery.append("clientid", ClientID);
-
-                    BasicDBObject updateQuery = new BasicDBObject();
-                    BasicDBObject updateQuery1 = new BasicDBObject();
-                    BasicDBObject updateQuery2 = new BasicDBObject();
-                    BasicDBObject updateQuery3 = new BasicDBObject();
-                    BasicDBObject updateQuery4 = new BasicDBObject();
-                    BasicDBObject updateQuery5 = new BasicDBObject();
-                    BasicDBObject updateQuery6 = new BasicDBObject();
-                    BasicDBObject updateQuery7 = new BasicDBObject();
-                    updateQuery.append("$set",
-                            new BasicDBObject().append("type", 8));
-                    updateQuery1.append("$set",
-                            new BasicDBObject().append("Token", Token));
-                    updateQuery2.append("$set",
-                            new BasicDBObject().append("Fname", Fname));
-                    updateQuery3.append("$set",
-                            new BasicDBObject().append("Path", Path));
-                    updateQuery4.append("$set",
-                            new BasicDBObject().append("User", UserName));
-                    updateQuery5.append("$set",
-                            new BasicDBObject().append("Password", Password));
-                    updateQuery7.append("$set",
-                            new BasicDBObject().append("Email", Email));
-                    updateQuery6.append("$set",
-                            new BasicDBObject().append("status", true));
-                    //    System.out.println("Sending Info To Forwarding Server");
-                    dCollection.updateOne(searchQuery, updateQuery);
-                    dCollection.updateOne(searchQuery, updateQuery1);
-                    dCollection.updateOne(searchQuery, updateQuery2);
-                    dCollection.updateOne(searchQuery, updateQuery3);
-                    dCollection.updateOne(searchQuery, updateQuery4);
-                    dCollection.updateOne(searchQuery, updateQuery5);
-                    dCollection.updateOne(searchQuery, updateQuery6);
-                    dCollection.updateOne(searchQuery, updateQuery7);
-                    //delegationTimer.trigger();
-                } else {
+                }  catch(MongoCommandException ERC){
+                    System.out.println("Malformed Request");
                     BasicDBObject searchQuery = new BasicDBObject();
                     searchQuery.append("clientid", ClientID);
 
@@ -330,124 +268,196 @@ public class delegationServices {
                     dCollection.updateOne(searchQuery, updateQuery1);
                     //delegationTimer.trigger();
                 }
-            } else {
-                System.out.println("Banned Account");
-                BasicDBObject searchQuery = new BasicDBObject();
-                searchQuery.append("clientid", ClientID);
-
-                BasicDBObject updateQuery = new BasicDBObject();
-                BasicDBObject updateQuery1 = new BasicDBObject();
-                updateQuery.append("$set",
-                        new BasicDBObject().append("type", 11));
-                updateQuery1.append("$set",
-                        new BasicDBObject().append("status", true));
-                dCollection.updateOne(searchQuery, updateQuery);
-                dCollection.updateOne(searchQuery, updateQuery1);
             }
-            }  catch (Exception ERC) {
-                BasicDBObject searchQuery = new BasicDBObject();
-                searchQuery.append("clientid", ClientID);
+            if (requesttype == 2) {
+                System.out.println("Login Request (USR&PASS)");
+                Document accountServer;
+                String Password;
+                int Token;
+                String Fname;
+                String Path;
+                String UserName;
+                String Email;
+                try {
+                    accountServer = accountS.find(eq("User", username)).first();
+                    Password = (String) accountServer.get("Password");
+                    if (accountServer.get("Status").equals(true)) {
+                        if (Password.equals(password)) {
+                            Token = (int) accountServer.get("Token");
+                            Fname = (String) accountServer.get("FName");
+                            Path = (String) accountServer.get("Path");
+                            Email = (String) accountServer.get("Email");
+                            UserName = (String) accountServer.get("User");
 
-                BasicDBObject updateQuery = new BasicDBObject();
-                BasicDBObject updateQuery1 = new BasicDBObject();
-                updateQuery.append("$set",
-                        new BasicDBObject().append("type", 9));
-                updateQuery1.append("$set",
-                        new BasicDBObject().append("status", true));
-                dCollection.updateOne(searchQuery, updateQuery);
-                dCollection.updateOne(searchQuery, updateQuery1);
-                //delegationTimer.trigger();
-            }
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
 
-            }
-        if (requesttype == 3) {
-            System.out.println("Login Request (TKN)");
-           // Document TResolve = dCollection.find(eq("type", 3)).first();
-            Document accountServer;
-           int TKN;
-            String Password;
-            String Fname;
-            String Path;
-            String UserName;
-            String Email;
-            try {
-                accountServer = accountS.find(eq("Token", CTOKEN)).first();
-               TKN = (int) accountServer.get("Token");
-                if (accountServer.get("Status").equals("Active")) {
-                    if (TKN == CTOKEN) {
-                        TKN = (int) accountServer.get("Token");
-                        Password = (String) accountServer.get("Password");
-                        Fname = (String) accountServer.get("FName");
-                        Path = (String) accountServer.get("Path");
-                        Email = (String) accountServer.get("Email");
-                        UserName = (String) accountServer.get("User");
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            BasicDBObject updateQuery2 = new BasicDBObject();
+                            BasicDBObject updateQuery3 = new BasicDBObject();
+                            BasicDBObject updateQuery4 = new BasicDBObject();
+                            BasicDBObject updateQuery5 = new BasicDBObject();
+                            BasicDBObject updateQuery6 = new BasicDBObject();
+                            BasicDBObject updateQuery7 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 8));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("Token", Token));
+                            updateQuery2.append("$set",
+                                    new BasicDBObject().append("Fname", Fname));
+                            updateQuery3.append("$set",
+                                    new BasicDBObject().append("Path", Path));
+                            updateQuery4.append("$set",
+                                    new BasicDBObject().append("User", UserName));
+                            updateQuery5.append("$set",
+                                    new BasicDBObject().append("Password", Password));
+                            updateQuery7.append("$set",
+                                    new BasicDBObject().append("Email", Email));
+                            updateQuery6.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            //    System.out.println("Sending Info To Forwarding Server");
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery1);
+                            dCollection.updateOne(searchQuery, updateQuery2);
+                            dCollection.updateOne(searchQuery, updateQuery3);
+                            dCollection.updateOne(searchQuery, updateQuery4);
+                            dCollection.updateOne(searchQuery, updateQuery5);
+                            dCollection.updateOne(searchQuery, updateQuery6);
+                            dCollection.updateOne(searchQuery, updateQuery7);
+                            //delegationTimer.trigger();
+                        } else {
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
 
-                        BasicDBObject searchQuery = new BasicDBObject();
-                        searchQuery.append("clientid", ClientID);
-
-                        BasicDBObject updateQuery = new BasicDBObject();
-                        BasicDBObject updateQuery2 = new BasicDBObject();
-                        BasicDBObject updateQuery3 = new BasicDBObject();
-                        BasicDBObject updateQuery4 = new BasicDBObject();
-                        BasicDBObject updateQuery5 = new BasicDBObject();
-                        BasicDBObject updateQuery6 = new BasicDBObject();
-                        BasicDBObject updateQuery7 = new BasicDBObject();
-                        BasicDBObject updateQuery8 = new BasicDBObject();
-                        updateQuery.append("$set",
-                                new BasicDBObject().append("type", 8));
-                        updateQuery2.append("$set",
-                                new BasicDBObject().append("Fname", Fname));
-                        updateQuery3.append("$set",
-                                new BasicDBObject().append("Path", Path));
-                        updateQuery4.append("$set",
-                                new BasicDBObject().append("User", UserName));
-                        updateQuery5.append("$set",
-                                new BasicDBObject().append("Password", Password));
-                        updateQuery7.append("$set",
-                                new BasicDBObject().append("Email", Email));
-                        updateQuery6.append("$set",
-                                new BasicDBObject().append("status", true));
-                        updateQuery8.append("$set",
-                                new BasicDBObject().append("Token", TKN));
-                            System.out.println("Sending Info To Forwarding Server");
-                        dCollection.updateOne(searchQuery, updateQuery);
-                        dCollection.updateOne(searchQuery, updateQuery2);
-                        dCollection.updateOne(searchQuery, updateQuery3);
-                        dCollection.updateOne(searchQuery, updateQuery4);
-                        dCollection.updateOne(searchQuery, updateQuery5);
-                        dCollection.updateOne(searchQuery, updateQuery6);
-                        dCollection.updateOne(searchQuery, updateQuery8);
-                        dCollection.updateOne(searchQuery, updateQuery7);
-                        //delegationTimer.trigger();
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 7));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery1);
+                            //delegationTimer.trigger();
+                        }
                     } else {
-                        System.out.println("Login Failure");
+                        System.out.println("Banned Account");
                         BasicDBObject searchQuery = new BasicDBObject();
                         searchQuery.append("clientid", ClientID);
 
                         BasicDBObject updateQuery = new BasicDBObject();
                         BasicDBObject updateQuery1 = new BasicDBObject();
                         updateQuery.append("$set",
-                                new BasicDBObject().append("type", 9));
+                                new BasicDBObject().append("type", 11));
                         updateQuery1.append("$set",
                                 new BasicDBObject().append("status", true));
                         dCollection.updateOne(searchQuery, updateQuery);
                         dCollection.updateOne(searchQuery, updateQuery1);
-                        //delegationTimer.trigger();
                     }
-                } else {
-                    System.out.println("Banned Account");
+                }  catch (Exception ERC) {
                     BasicDBObject searchQuery = new BasicDBObject();
                     searchQuery.append("clientid", ClientID);
 
                     BasicDBObject updateQuery = new BasicDBObject();
                     BasicDBObject updateQuery1 = new BasicDBObject();
                     updateQuery.append("$set",
-                            new BasicDBObject().append("type", 11));
+                            new BasicDBObject().append("type", 9));
                     updateQuery1.append("$set",
                             new BasicDBObject().append("status", true));
                     dCollection.updateOne(searchQuery, updateQuery);
                     dCollection.updateOne(searchQuery, updateQuery1);
+                    //delegationTimer.trigger();
                 }
+
+            }
+            if (requesttype == 3) {
+                System.out.println("Login Request (TKN)");
+                // Document TResolve = dCollection.find(eq("type", 3)).first();
+                Document accountServer;
+                int TKN;
+                String Password;
+                String Fname;
+                String Path;
+                String UserName;
+                String Email;
+                try {
+                    accountServer = accountS.find(eq("Token", CTOKEN)).first();
+                    TKN = (int) accountServer.get("Token");
+                    if (accountServer.get("Status").equals(true)) {
+                        if (TKN == CTOKEN) {
+                            TKN = (int) accountServer.get("Token");
+                            Password = (String) accountServer.get("Password");
+                            Fname = (String) accountServer.get("FName");
+                            Path = (String) accountServer.get("Path");
+                            Email = (String) accountServer.get("Email");
+                            UserName = (String) accountServer.get("User");
+
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
+
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery2 = new BasicDBObject();
+                            BasicDBObject updateQuery3 = new BasicDBObject();
+                            BasicDBObject updateQuery4 = new BasicDBObject();
+                            BasicDBObject updateQuery5 = new BasicDBObject();
+                            BasicDBObject updateQuery6 = new BasicDBObject();
+                            BasicDBObject updateQuery7 = new BasicDBObject();
+                            BasicDBObject updateQuery8 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 8));
+                            updateQuery2.append("$set",
+                                    new BasicDBObject().append("Fname", Fname));
+                            updateQuery3.append("$set",
+                                    new BasicDBObject().append("Path", Path));
+                            updateQuery4.append("$set",
+                                    new BasicDBObject().append("User", UserName));
+                            updateQuery5.append("$set",
+                                    new BasicDBObject().append("Password", Password));
+                            updateQuery7.append("$set",
+                                    new BasicDBObject().append("Email", Email));
+                            updateQuery6.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            updateQuery8.append("$set",
+                                    new BasicDBObject().append("Token", TKN));
+                            System.out.println("Sending Info To Forwarding Server");
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery2);
+                            dCollection.updateOne(searchQuery, updateQuery3);
+                            dCollection.updateOne(searchQuery, updateQuery4);
+                            dCollection.updateOne(searchQuery, updateQuery5);
+                            dCollection.updateOne(searchQuery, updateQuery6);
+                            dCollection.updateOne(searchQuery, updateQuery8);
+                            dCollection.updateOne(searchQuery, updateQuery7);
+                            //delegationTimer.trigger();
+                        } else {
+                            System.out.println("Login Failure");
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            searchQuery.append("clientid", ClientID);
+
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery1 = new BasicDBObject();
+                            updateQuery.append("$set",
+                                    new BasicDBObject().append("type", 9));
+                            updateQuery1.append("$set",
+                                    new BasicDBObject().append("status", true));
+                            dCollection.updateOne(searchQuery, updateQuery);
+                            dCollection.updateOne(searchQuery, updateQuery1);
+                            //delegationTimer.trigger();
+                        }
+                    } else {
+                        System.out.println("Banned Account");
+                        BasicDBObject searchQuery = new BasicDBObject();
+                        searchQuery.append("clientid", ClientID);
+
+                        BasicDBObject updateQuery = new BasicDBObject();
+                        BasicDBObject updateQuery1 = new BasicDBObject();
+                        updateQuery.append("$set",
+                                new BasicDBObject().append("type", 11));
+                        updateQuery1.append("$set",
+                                new BasicDBObject().append("status", true));
+                        dCollection.updateOne(searchQuery, updateQuery);
+                        dCollection.updateOne(searchQuery, updateQuery1);
+                    }
                 }  catch (MongoCommandException ERC) {
                     System.out.println("Malformed Request");
                     BasicDBObject searchQuery = new BasicDBObject();
@@ -463,7 +473,28 @@ public class delegationServices {
                     dCollection.updateOne(searchQuery, updateQuery1);
                     //delegationTimer.trigger();
                 }
-                }
+            }
+
+
+
+
+        } else {
+            System.out.println("Malformed Request, Non Recoverable");
+            BasicDBObject searchQuery = new BasicDBObject();
+            searchQuery.append("type", requesttype);
+
+            BasicDBObject updateQuery = new BasicDBObject();
+            BasicDBObject updateQuery1 = new BasicDBObject();
+            updateQuery.append("$set",
+                    new BasicDBObject().append("type", 7));
+            updateQuery1.append("$set",
+                    new BasicDBObject().append("status", true));
+            Lrequest.append("status",true);
+            dCollection.updateOne(searchQuery, updateQuery1);
+            dCollection.updateOne(searchQuery, updateQuery);
+
+        }
+
         //above is finding one request and starting wheels
         //delegationTimer.trigger();
         delegate();
@@ -473,26 +504,21 @@ public class delegationServices {
             searchQuery.append("status", true);
             BasicDBObject searchQuery1 = new BasicDBObject();
             searchQuery1.append("status", false);
-     //   dCollection.deleteMany(searchQuery);
-          //  dCollection.deleteMany(searchQuery1);
+       dCollection.deleteMany(searchQuery);
+       dCollection.deleteMany(searchQuery1);
+       System.out.println("Flushed Server");
 
 
         }
         public static void delegate ()
         {
-            Document userLookMutedLookUp = dCollection.find(eq("status", false)).first();
-            try {
-                userAuthetication(userLookMutedLookUp);
-            } catch (NullPointerException NPE) {
-                System.out.println("No Pending Authentication Requests");
-               delegationTimer.trigger();
-            }
+                userAuthetication();
         }
-        public static void userAuthetication (Document doc){
+        public static void userAuthetication (){
             try {
                 delegationProcesser();
             } catch (Exception exr) {
-                System.out.println("No Pending Authentication");
+                System.out.println("No Pending Authentication: ");
                delegationTimer.trigger();
             }
         }