diff --git a/baystation12.dme b/baystation12.dme
index c334963296d..9542503e124 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1529,6 +1529,7 @@
 #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"
@@ -1541,10 +1542,16 @@
 #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/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 771a7524ed1..5d07315521b 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -256,7 +256,7 @@ log transactions
 						tried_account_num = held_card.associated_account_number
 					var/tried_pin = text2num(href_list["account_pin"])
 
-					authenticated_account = linked_db.attempt_account_access(tried_account_num, tried_pin, held_card && held_card.associated_account_number == tried_account_num ? 2 : 1)
+					authenticated_account = attempt_account_access(tried_account_num, tried_pin, held_card && held_card.associated_account_number == tried_account_num ? 2 : 1)
 					if(!authenticated_account)
 						number_incorrect_tries++
 						if(previous_account_number == tried_account_num)
@@ -389,7 +389,7 @@ log transactions
 				var/obj/item/device/pda/P = human_user.wear_id
 				I = P.id
 			if(I)
-				authenticated_account = linked_db.attempt_account_access(I.associated_account_number)
+				authenticated_account = attempt_account_access(I.associated_account_number)
 				if(authenticated_account)
 					human_user << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
 
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 2f803acc9c1..91d8662227c 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -361,9 +361,7 @@ var/global/list/all_money_accounts = list()
 	return 0
 
 //this returns the first account datum that matches the supplied accnum/pin combination, it returns null if the combination did not match any account
-/obj/machinery/account_database/proc/attempt_account_access(var/attempt_account_number, var/attempt_pin_number, var/security_level_passed = 0,var/pin_needed=1)
-	if(!activated)
-		return 0
+/proc/attempt_account_access(var/attempt_account_number, var/attempt_pin_number, var/security_level_passed = 0,var/pin_needed=1)
 	for(var/datum/money_account/D in all_money_accounts)
 		if(D.account_number == attempt_account_number)
 			if( D.security_level <= security_level_passed && (!D.security_level || D.remote_access_pin == attempt_pin_number || !pin_needed) )
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index 6b9087ffb5e..a1d3fe29e15 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -143,7 +143,7 @@
 				if(linked_db)
 					var/attempt_account_num = input("Enter account number to pay EFTPOS charges into", "New account number") as num
 					var/attempt_pin = input("Enter pin code", "Account pin") as num
-					linked_account = linked_db.attempt_account_access(attempt_account_num, attempt_pin, 1)
+					linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1)
 				else
 					usr << "\icon[src]<span class='warning'>Unable to connect to accounts database.</span>"
 			if("trans_purpose")
@@ -195,7 +195,7 @@
 		if(transaction_locked && !transaction_paid)
 			if(linked_account)
 				var/attempt_pin = input("Enter pin code", "EFTPOS transaction") as num
-				var/datum/money_account/D = linked_db.attempt_account_access(C.associated_account_number, attempt_pin, 2)
+				var/datum/money_account/D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
 				if(D)
 					if(transaction_amount <= D.money)
 						playsound(src, 'sound/machines/chime.ogg', 50, 1)