diff --git a/code/controllers/Processes/bot.dm b/code/controllers/Processes/bot.dm
new file mode 100644
index 00000000000..a3cc23ce392
--- /dev/null
+++ b/code/controllers/Processes/bot.dm
@@ -0,0 +1,11 @@
+/datum/controller/process/bot/setup()
+	name = "bot controller"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/bot/doWork()
+	for(var/obj/machinery/bot/Bot in aibots)
+		if(!Bot.gc_destroyed)
+			spawn(0)
+				Bot.bot_process()
+			continue
+		aibots -= Bot
\ No newline at end of file
diff --git a/code/controllers/Processes/event.dm b/code/controllers/Processes/event.dm
index 8faaca1f1ef..72bc01613d2 100644
--- a/code/controllers/Processes/event.dm
+++ b/code/controllers/Processes/event.dm
@@ -1,14 +1,6 @@
-/datum/controller/process/event
-	var/tmp/datum/updateQueue/updateQueueInstance
-
 /datum/controller/process/event/setup()
-	name = "event"
+	name = "event controller"
 	schedule_interval = 20 // every 2 seconds
-	updateQueueInstance = new
 
 /datum/controller/process/event/doWork()
-	updateQueueInstance.init(event_manager, "process")
-	updateQueueInstance.Run()
-
-/datum/controller/process/event/onFinish()
-	checkEvent()
+	event_manager.process()
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 0e4e59677be..a60078bd76c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -177,8 +177,10 @@
 #include "code\controllers\verbs.dm"
 #include "code\controllers\voting.dm"
 #include "code\controllers\Processes\air.dm"
+#include "code\controllers\Processes\bot.dm"
 #include "code\controllers\Processes\disease.dm"
 #include "code\controllers\Processes\emergencyShuttle.dm"
+#include "code\controllers\Processes\event.dm"
 #include "code\controllers\Processes\inactivity.dm"
 #include "code\controllers\Processes\lighting.dm"
 #include "code\controllers\Processes\machinery.dm"