diff --git a/.gitmodules b/.gitmodules
index 8ddf22b..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "exploitdb"]
-	path = exploitdb
-	url = https://github.com/mattoufoutu/exploitdb.git
diff --git a/exploitdb b/exploitdb
deleted file mode 160000
index 52f8986..0000000
--- a/exploitdb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52f898600a05025f8fd02d28936a5b9c1a5e45a1
diff --git a/privcheckerserver.py b/privcheckerserver.py
index fd6e004..47f6fc4 100755
--- a/privcheckerserver.py
+++ b/privcheckerserver.py
@@ -2,48 +2,56 @@
 # server for hosting exploit search
 
 try:
-    from exploitdb import exploitdb
-except:
-    import os
-    print("-"*80)
-    print('Submodule not found. Setting up...')
-    os.system('cd exploitdb; git submodule init; git submodule update')
-    print("-"*80)
-    print("Please run again for full functionality.")
-    exit()
-import socketserver
+    import socketserver
+    from os.path import isfile
+    import argparse
+    import multiprocessing
+    from csv import DictReader
+except Exception as e:
+    print("Caught exception: {}\nAre you running with python3?".format(e))
+    exit(1)
+
 
 _PORT_ = 4521
 _IP_ = '0.0.0.0'
+_SEARCHSPLOIT_ = "/usr/share/exploitdb/files_exploits.csv"
 
 class SearchHandler(socketserver.StreamRequestHandler):
     def handle(self):
-        print('[+] Connection from '+ self.client_address[0])
-        data = self.rfile.readline().decode().strip()
-        while not data == '':
-            print('[ ] Searching for: ' + data)
-            output = [ ]
-            results = self.server.search(data)
-            for exploits in results:
-                output.append(exploits[0]['description'] + ' id: ' + exploits[0]['id'])
-            if len(output) > 0:
-                print(''.join(output))
-                self.wfile.write('\n'.join(output).encode() + b'\n')
-            data = self.rfile.readline().decode().strip()
-        print('[-] Closing connection from ' + self.client_address[0])
-        
-
-
-class ExploitServer(exploitdb.ExploitSearch, socketserver.ThreadingMixIn, socketserver.TCPServer):
-    def __init__(self, connectionInfo, handler):
-        exploitdb.ExploitSearch.__init__(self)
-        socketserver.TCPServer.__init__(self, connectionInfo, handler)
-        socketserver.ThreadingMixIn.__init__(self)
-    
+        try:
+            print('[+] Connection from '+ self.client_address[0])
+            self.pool = multiprocessing.Pool(10)
+            for output in self.pool.imap(SearchHandler.search, iter(self.rfile.readline, b'\n')):
+                if output:
+                    print(output)
+                    self.wfile.write(output.encode() + b'\n')
+                
+            self.pool.close()
+            print('[$] Closing connection from {}\n'.format(self.client_address[0]))
+            self.pool.join()
+        except Exception as e:
+            self.pool.terminate()
+            self.wfile.write('[-] Exception Caught: {}'.format(e).encode())
+            print("[-] Exception Caught: {}".format(e))
+            self.pool.join()
+
+    @classmethod
+    def search(cls, data):
+        query = data.decode().strip().split(" ")
+        query[-1] = query[-1][:3] #cut down on the last item which should be the version number
+        output = []
+        for rows in ExploitServer.exploitDatabase:
+            if all([term in rows["description"] for term in query]):
+                output.append('\t'.join((rows["description"], rows["file"])))
+        if output:
+            return "[ ] " + "\n".join([' '.join(query), *output])
 
-        
 
 
+class ExploitServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
+   exploitDatabase = []
+    
+
 def main():
     exploit = ExploitServer((_IP_, _PORT_), SearchHandler)
     print('[ ] Starting server on port ' + str(_PORT_))
@@ -55,4 +63,33 @@ def main():
         exploit.server_close()
     
 if __name__ == "__main__":
+    #parse the args
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-i", "--ip", help="Ip to listen on")
+    parser.add_argument("-p", "--port", help="Port to listen on")
+    parser.add_argument("-f", "--file", help="The exploit csv to use")
+    args = parser.parse_args()
+    if args.ip:
+        _IP_ = args.ip
+    if args.port:
+        _PORT_ = args.port
+    if args.file:
+        _SEARCHSPLOIT_ = args.file
+
+    if not isfile(_SEARCHSPLOIT_):
+        print("[-] Cannot find csv databse: {}\nFor more details visit: https://github.com/offensive-security/exploit-database".format(_SEARCHSPLOIT_))
+        exit(2)
+
+       #parse the exploit database and collect all the results
+    try:
+        with open(_SEARCHSPLOIT_) as Fin:
+            reader = DictReader(Fin)
+            for lines in reader:
+                #add the database to the exploit server for non global persistance... or maybe it is technically still global?
+                ExploitServer.exploitDatabase.append(lines)
+    except Exception as e:
+        print("[-] Exception caught while attempting to parse database file. {}".format(e))
+        exit(3)
+
+    print("[ ] Starting up")
     main()
\ No newline at end of file