diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index 6903f60820d..c2f1b90f741 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -40,6 +40,27 @@
 
 - type: entity
   parent: BasePDA
+  id: BaseJusticePDA
+  abstract: true
+  components:
+  - type: Pda
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: CartridgeLoader
+    diskSpace: 7
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - CrimeAssistCartridge
+    - SecWatchCartridge
+
+- type: entity
+  parent: BaseJusticePDA
   id: ChiefJusticePDA
   name: chief justice PDA
   description: Whosoever bears this PDA is the law.
@@ -59,26 +80,14 @@
   - type: Pda
     id: ChiefJusticeIDCard
     state: pda-chiefjustice
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
   - type: PdaBorderColor
     borderColor: "#470823"
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-chiefjustice
-  - type: CartridgeLoader
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
 
 - type: entity
-  parent: BasePDA
+  parent: BaseJusticePDA
   id: ClerkPDA
   name: clerk PDA
   description: It has the stamp to prove it's been officially notarized!
@@ -98,26 +107,14 @@
   - type: Pda
     id: ClerkIDCard
     state: pda-clerk
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
   - type: PdaBorderColor
     borderColor: "#611528"
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-clerk
-  - type: CartridgeLoader
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
-      
+
 - type: entity
-  parent: BasePDA
+  parent: BaseJusticePDA
   id: ProsecutorPDA
   name: prosecutor PDA
   description: Sharp. Looks like it could prosecute you all on its own.
@@ -137,23 +134,11 @@
   - type: Pda
     id: ProsecutorIDCard
     state: pda-prosecutor
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
   - type: PdaBorderColor
     borderColor: "#6f6192"
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-prosecutor
-  - type: CartridgeLoader # DeltaV - Crime Assist
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
 
 - type: entity
   parent: SyndiPDA
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 545359006ac..0ecb71cf586 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -479,7 +479,7 @@
     state: pda-library
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: BaseJusticePDA # DeltaV - Added secwatch to justice. Was BaseSecurityPDA.
   id: LawyerPDA
   name: lawyer PDA
   description: For lawyers to poach dubious clients.
@@ -487,12 +487,13 @@
   - type: Pda
     id: LawyerIDCard
     state: pda-lawyer
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
+  # DeltaV - Moved to BaseJusticePDA
+  #  penSlot:
+  #    startingItem: LuxuryPen
+  #    priority: -1
+  #    whitelist:
+  #      tags:
+  #      - Write
   - type: PdaBorderColor
     borderColor: "#6f6192"
   - type: Icon