diff --git a/maloja b/maloja
index 742a562..83874a6 100755
--- a/maloja
+++ b/maloja
@@ -1,22 +1,113 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+import subprocess
+import sys
+import signal
+import os
+
 
 neededmodules = [
 	"bottle",
 	"waitress"
 ]
-toinstall = []
 
-for m in neededmodules:
+SOURCE_URL = "https://github.com/krateng/maloja/archive/master.zip"
+
+
+
+def install():
+	toinstall = []
+	for m in neededmodules:
+		try:
+			exec("import " + m) #I'm sorry
+		except:
+			toinstall.append(m)
+			
+	if toinstall != []:
+		print("The following python modules need to be installed:")
+		for m in toinstall:
+			print("\t" + m)
+	else:
+		return
+	
+def getInstance():
 	try:
-		exec("import " + m) #I'm sorry
+		output = subprocess.check_output(["pidof","Maloja"])
+		pid = int(output)
+		return pid
 	except:
-		toinstall.append(m)
+		return None
+	
+	
+
+
+def start():
+	install()
+	
+	try:
+		p = subprocess.Popen(["python3","server.py"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
+		print("Maloja started! PID: " + str(p.pid))
+		return True
+	except:
+		print("Error while starting Maloja. Are you sure it's not already running?")
+		return False
 		
-if toinstall != []:
-	print("The following python modules need to be installed:")
-	for m in toinstall:
-		print("\t" + m)
-else:
-	import subprocess
-	subprocess.Popen(["python","server.py"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
-	print("Maloja started!")
+
+def restart():
+	#pid = getInstance()
+	#if pid == None:
+	#	print("Server is not running.")
+	#else:
+	#	stop()
+	#start()
+	
+	wasrunning = stop()
+	start()
+	return wasrunning
+	
+def stop():
+	pid = getInstance()
+	if pid == None:
+		print("Server is not running")
+		return False
+	else:
+		print("Stopping " + str(pid))
+		os.kill(pid,signal.SIGTERM)
+		return True
+
+def update():
+
+	import urllib.request
+	import shutil
+	import tempfile
+	import zipfile
+	import distutils.dir_util
+
+	print("Updating Maloja...")
+	with urllib.request.urlopen(SOURCE_URL) as response:
+		with tempfile.NamedTemporaryFile(delete=True) as tmpfile:
+			shutil.copyfileobj(response,tmpfile)
+			
+			with zipfile.ZipFile(tmpfile.name,"r") as z:
+				
+				for f in z.namelist():
+					print("extracting " + f)
+					z.extract(f)
+			
+			
+	
+	distutils.dir_util.copy_tree("./maloja-master/","./",verbose=2)
+	shutil.rmtree("./maloja-master")
+	print("Done!")
+	
+	os.chmod("maloja",stat.S_IXUSR)
+	
+	if stop(): start() #stop returns whether it was running before, in which case we restart it
+
+
+if __name__ == "__main__":
+	if sys.argv[1] == "start": start()
+	elif sys.argv[1] == "restart": restart()
+	elif sys.argv[1] == "stop": stop()
+	elif sys.argv[1] == "update": update()
+
diff --git a/restarter.py b/restarter.py
deleted file mode 100644
index 57b28ed..0000000
--- a/restarter.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import subprocess
-import time
-
-def startserver():
-	time.sleep(5)
-	print("Starting the Maloja server...")
-	
-	p = subprocess.Popen(["python3","server.py"])
-	exit("Restarter has done his job and is exiting!")
-
-
-def restart():
-	#args = sys.argv[:]
-	print("Starting the restarter...")
-	
-	#args.insert(0, sys.executable)
-	#print(' '.join(args))
-	
-	p = subprocess.Popen(["python3","restarter.py"])
-	#exit("Exiting!")
-
-
-
-if __name__ == "__main__":
-	startserver()
diff --git a/server.py b/server.py
index 690032c..0ca0b3d 100755
--- a/server.py
+++ b/server.py
@@ -12,7 +12,6 @@ from urllib.error import *
 import sys
 import signal
 import os
-import restarter
 
 
 MAIN_PORT = 42010
@@ -64,15 +63,6 @@ def database_post(pth):
 	
 	return
 
-@webserver.route("/exit")
-def shutdown():
-	graceful_exit()
-	
-@webserver.route("/restart")
-def restart():
-	urllib.request.urlopen("http://[::1]:" + str(DATABASE_PORT) + "/sync")
-	restarter.restart()
-	os._exit(42)
 	
 def graceful_exit(sig=None,frame=None):
 	urllib.request.urlopen("http://[::1]:" + str(DATABASE_PORT) + "/sync")
diff --git a/updater.py b/updater.py
deleted file mode 100644
index d273317..0000000
--- a/updater.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import urllib.request
-import shutil
-import tempfile
-import zipfile
-import distutils.dir_util
-#import os
-import sys
-
-SOURCE_URL = "https://github.com/krateng/maloja/archive/master.zip"
-
-
-def update():
-	print("Updating Maloja...")
-	with urllib.request.urlopen(SOURCE_URL) as response:
-		with tempfile.NamedTemporaryFile(delete=True) as tmpfile:
-			shutil.copyfileobj(response,tmpfile)
-			
-			with zipfile.ZipFile(tmpfile.name,"r") as z:
-				
-				for f in z.namelist():
-					print("extracting " + f)
-					z.extract(f)
-			
-			
-	
-	distutils.dir_util.copy_tree("./maloja-master/","./",verbose=2)
-	shutil.rmtree("./maloja-master")
-	print("Done!")
-	
-	
-
-	
-	
-	
-if __name__ == "__main__":
-	update()