diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index dcba718..bdf0814 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -45,7 +45,6 @@ public class delegationServices {
         try {
            ClientID = (int) Lrequest.get("clientid");
        } catch (Exception exrp) {
-
        }
 
         //TODO ADD BAN CHECK TO PREVENT BAN CIRCUMNAVIGATION, THIS WILL BE ADDED LATER
@@ -54,7 +53,7 @@ public class delegationServices {
         int requesttype = (int) Lrequest.get("type");
         if (requesttype == 0) {
             System.out.println("Sync Request (TKN)");
-            Document TResolve = dCollection.find(eq("status", false)).first();
+            Document TResolve = dCollection.find(eq("type", 0)).first();
             String CTOKEN = (String) TResolve.get("Token");
             Document accountServer;
             String Password;
@@ -235,20 +234,19 @@ public class delegationServices {
         }
         if (requesttype == 3) {
             System.out.println("Login Request (TKN)");
-            Document TResolve = dCollection.find(eq("status", false)).first();
-            String CTOKEN = (String) TResolve.get("Token");
+           // Document TResolve = dCollection.find(eq("type", 3)).first();
+            String CTOKEN = (String) Lrequest.get("Token");
             Document accountServer;
+            String TKN;
             String Password;
-            String Token;
             String Fname;
             String Path;
             String UserName;
             String Email;
             try {
                 accountServer = accountS.find(eq("Token", CTOKEN)).first();
-                Password = (String) accountServer.get("Token");
-                if (Password.equals(CTOKEN)) {
-                    Token = (String) accountServer.get("Token");
+               TKN = (String) accountServer.get("Token");
+                if (TKN.equals(CTOKEN)) {
                     Password = (String) accountServer.get("Password");
                     Fname = (String) accountServer.get("FName");
                     Path = (String) accountServer.get("Path");
@@ -259,7 +257,6 @@ public class delegationServices {
                     searchQuery.append("clientid", ClientID);
 
                     BasicDBObject updateQuery = new BasicDBObject();
-                    BasicDBObject updateQuery1 = new BasicDBObject();
                     BasicDBObject updateQuery2 = new BasicDBObject();
                     BasicDBObject updateQuery3 = new BasicDBObject();
                     BasicDBObject updateQuery4 = new BasicDBObject();
@@ -268,8 +265,6 @@ public class delegationServices {
                     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",
@@ -284,7 +279,6 @@ public class delegationServices {
                             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);
@@ -293,27 +287,29 @@ public class delegationServices {
                     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", 7));
+                            new BasicDBObject().append("type", 9));
                     updateQuery1.append("$set",
                             new BasicDBObject().append("status", true));
                     dCollection.updateOne(searchQuery, updateQuery);
                     dCollection.updateOne(searchQuery, updateQuery1);
                     //delegationTimer.trigger();
                 }
-            }  catch (Exception ERC) {
+            }  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", 9));
+                        new BasicDBObject().append("type", 7));
                 updateQuery1.append("$set",
                         new BasicDBObject().append("status", true));
                 dCollection.updateOne(searchQuery, updateQuery);
@@ -330,8 +326,8 @@ 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);
 
 
         }