diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index b003d9ef1d6..cc93a00cb2f 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -120,7 +120,7 @@ Class Procs:
 	var/speed_process = 0 // Process as fast as possible?
 
 /obj/machinery/initialize()
-	addAtProcessing()
+//	addAtProcessing() //Testing this in new conveyors
 	. = ..()
 	power_change()
 
@@ -128,11 +128,19 @@ Class Procs:
 	if(use_power)
 		myArea = get_area_master(src)
 
+/*	machines += src
+	if(!speed_process)
+		machine_processing += src
+	else
+		fast_processing += src */ //Also testing in NEW conveyors
+
+/obj/machinery/new() //new for trying to get the conveyors working with machinery, not world
 	machines += src
 	if(!speed_process)
 		machine_processing += src
 	else
 		fast_processing += src
+	. = ..()
 
 /obj/machinery/Destroy()
 	if(myArea)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8ecd9ed9dc3..20779370974 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -211,17 +211,24 @@
 	speed_process = 1
 
 
-obj/machinery/conveyor_switch/New(newloc, newid)
+/obj/machinery/conveyor_switch/New(newloc, newid)
 	..(newloc)
 	if(!id)
 		id = newid
 	update()
 
-	spawn(5)		// allow map load
+/*	spawn(5)		// allow map load
 		conveyors = list()
-		for(var/obj/machinery/conveyor/C in machines)
+		for(var/obj/machinery/conveyor/C in machines) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it.
 			if(C.id == id)
-				conveyors += C
+				conveyors += C */ //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
+
+/obj/machinery/conveyor_switch/initialize() //This whole thing is new
+	conveyors = list()
+	for(var/obj/machinery/conveyor/C in machines)
+		if(C.id == id)
+			conveyors += C
+
 
 // update the icon depending on the position