diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 4e6c9c3f2ef..aaf8493cd35 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -282,32 +282,14 @@
 
 
 	/*		Power Monitor (Mode: 43 / 433)			*/
-	if(mode==43 || mode==433)
-		var/pMonData[0]
-		var/apcData[0]
-		for(var/obj/machinery/computer/monitor/pMon in world)
-			if(!(pMon.stat & (NOPOWER|BROKEN)) )
-				pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]")
-				if(isnull(powmonitor)) powmonitor = pMon 
-						
-		values["powermonitors"] = pMonData
+	if(mode==43 || mode==433)						
+		values["powermonitors"] = powermonitor_repository.powermonitor_data()
 
 		if (!isnull(powmonitor.powernet))
 			values["powerconnected"] = 1
 			values["poweravail"] = powmonitor.powernet.avail
 			values["powerload"] = num2text(powmonitor.powernet.viewload,10)
-			var/list/L = list()
-			for(var/obj/machinery/power/terminal/term in powmonitor.powernet.nodes)
-				if(istype(term.master, /obj/machinery/power/apc))
-					var/obj/machinery/power/apc/A = term.master
-					L += A
-
-			var/list/Status = list(0,0,1,1) // Status:  off, auto-off, on, auto-on
-			var/list/chg = list(0,1,1)	// Charging: nope, charging, full
-			for(var/obj/machinery/power/apc/A in L)
-				apcData[++apcData.len] = list("Name" = html_encode(A.area.name), "Equipment" = Status[A.equipment+1], "Lights" = Status[A.lighting+1], "Environment" = Status[A.environ+1], "CellPct" = A.cell ? round(A.cell.percent(),1) : -1, "CellStatus" = A.cell ? chg[A.charging+1] : 0)
-	
-			values["apcs"] = apcData
+			values["apcs"] = apc_repository.apc_data(powermonitor)
 		else
 			values["powerconnected"] = 0