diff --git a/baystation12.dme b/baystation12.dme
index 9542503e124..c334963296d 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1529,7 +1529,6 @@
 #include "code\WorkInProgress\computer3\computer3_notes.dm"
 #include "code\WorkInProgress\computer3\file.dm"
 #include "code\WorkInProgress\computer3\laptop.dm"
-#include "code\WorkInProgress\computer3\lapvend.dm"
 #include "code\WorkInProgress\computer3\networking.dm"
 #include "code\WorkInProgress\computer3\NTOS.dm"
 #include "code\WorkInProgress\computer3\program.dm"
@@ -1542,16 +1541,10 @@
 #include "code\WorkInProgress\computer3\computers\card.dm"
 #include "code\WorkInProgress\computer3\computers\communications.dm"
 #include "code\WorkInProgress\computer3\computers\crew.dm"
-#include "code\WorkInProgress\computer3\computers\customs.dm"
 #include "code\WorkInProgress\computer3\computers\HolodeckControl.dm"
 #include "code\WorkInProgress\computer3\computers\law.dm"
 #include "code\WorkInProgress\computer3\computers\medical.dm"
-#include "code\WorkInProgress\computer3\computers\Operating.dm"
-#include "code\WorkInProgress\computer3\computers\power.dm"
-#include "code\WorkInProgress\computer3\computers\prisoner.dm"
-#include "code\WorkInProgress\computer3\computers\robot.dm"
 #include "code\WorkInProgress\computer3\computers\security.dm"
-#include "code\WorkInProgress\computer3\computers\welcome.dm"
 #include "code\WorkInProgress\kilakk\fax.dm"
 #include "code\WorkInProgress\Mini\atmos_control.dm"
 #include "code\WorkInProgress\pomf\spacepods\construction.dm"
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 1c04020ef2b..58ec61ba719 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -13,7 +13,7 @@
 /obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob)
 	if(istype(user,/mob/living/silicon))
 		return
-	if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton))
+	if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop))
 		if(charging)
 			return
 
@@ -29,6 +29,11 @@
 		if (istype(G, /obj/item/weapon/gun/energy/gun/nuclear) || istype(G, /obj/item/weapon/gun/energy/crossbow))
 			user << "<span class='notice'>Your gun's recharge port was removed to make room for a miniaturized reactor.</span>"
 			return
+		if(istype(G, /obj/item/device/laptop))
+			var/obj/item/device/laptop/L = G
+			if(!L.stored_computer.battery)
+				user << "There's no battery in it!"
+				return
 		user.drop_item()
 		G.loc = src
 		charging = G
@@ -78,6 +83,15 @@
 			else
 				icon_state = "recharger2"
 			return
+		if(istype(charging, /obj/item/device/laptop))
+			var/obj/item/device/laptop/L = charging
+			if(L.stored_computer.battery.charge < L.stored_computer.battery.maxcharge)
+				L.stored_computer.battery.give(100)
+				icon_state = "recharger1"
+				use_power(250)
+			else
+				icon_state = "recharger2"
+			return
 
 
 /obj/machinery/recharger/emp_act(severity)