diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 75ee59ef73..76b342dd8c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -512,6 +512,9 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
   - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeCap
     capacity: 6
     autoCycle: true
     soundInsert:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 924732f84b..448baad9df 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -101,7 +101,7 @@
   components:
   - type: Tag
     tags:
-      - MagazinePistolTopMounted
+      - MagazinePistolSubMachineGunTopMounted
   - type: BallisticAmmoProvider
     proto: CartridgePistol
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
index 20eebdbe64..cc64214f1e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
@@ -1,33 +1,34 @@
-#- type: entity
-#  id: CapAmmoBase
-#  name: "cap gun loader"
-#  parent: BaseItem
-#  abstract: true
-#  components:
-#  - type: SpeedLoader
-#    caliber: Cap
-#    capacity: 6
-#  - type: Sprite
-#    netsync: false
-#    layers:
-#    - state: base
-#      map: ["enum.GunVisualLayers.Base"]
-#    - state: mag-6
-#      map: ["enum.GunVisualLayers.Mag"]
-#  - type: Appearance
-#    visuals:
-#    - type: MagVisualizer
-#      magState: mag
-#      steps: 7
-#      zeroVisible: false
-#
-#- type: entity
-#  id: CapLoader
-#  name: "cap gun loader"
-#  parent: CapAmmoBase
-#  components:
-#  - type: SpeedLoader
-#    proto: CartridgeCap
-#  - type: Sprite
-#    sprite: Objects/Fun/caps.rsi
-#
+- type: entity
+  id: BaseSpeedLoaderCap
+  name: "cap gun loader"
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeCap
+    capacity: 6
+  - type: Sprite
+    netsync: false
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-6
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 7
+      zeroVisible: false
+
+- type: entity
+  id: SpeedLoaderCap
+  name: "cap gun loader"
+  parent: BaseSpeedLoaderCap
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCap
+  - type: Sprite
+    sprite: Objects/Fun/caps.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 707b35321c..07cf524cd8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -166,6 +166,22 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolSubMachineGunTopMounted
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        whitelist:
+          tags:
+            - MagazinePistolSubMachineGunTopMounted
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        whitelist:
+          tags:
+            - CartridgePistol
   - type: Appearance
     visuals:
       - type: MagVisualizer
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 176cd39620..b301e591c1 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -273,7 +273,7 @@
   id: MagazinePistolHighCapacity
 
 - type: Tag
-  id: MagazinePistolTopMounted
+  id: MagazinePistolSubMachineGunTopMounted
 
 - type: Tag
   id: MagazineRifle