diff --git a/Resources/Prototypes/Cargo/products.yml b/Resources/Prototypes/Cargo/products.yml
index 9c71c056f6..7157deda42 100644
--- a/Resources/Prototypes/Cargo/products.yml
+++ b/Resources/Prototypes/Cargo/products.yml
@@ -23,11 +23,115 @@
 - type: cargoProduct
   name: "Flashlight"
   id: cargo.flashlight
-  description: Shine a light in the dark
+  description: Shine a light in the dark.
   icon:
     sprite: Objects/Tools/flashlight.rsi
     state: lantern_off
-  product: FlashlightLantern
+  product: crate_flashlight
   cost: 3000
   category: Engineering
-  group: market
\ No newline at end of file
+  group: market
+
+- type: cargoProduct
+  name: "Light Bulb"
+  id: cargo.lightbulb
+  description: Light up a room, anywhere, anytime. Electricity not included.
+  icon:
+    sprite: Objects/Lighting/light_tube.rsi
+    state: normal
+  product: crate_light_bulb
+  cost: 200
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  name: "Fire Extinguisher"
+  id: cargo.fireextinguisher
+  description: Puts out fires. Or propels you in space.
+  icon:
+    sprite: Objects/Misc/fire_extinguisher.png
+  product: crate_fire_extinguisher
+  cost: 300
+  category: Other
+  group: market
+
+- type: cargoProduct
+  name: "Pen"
+  id: cargo.pen
+  description: Expels ink. Use it to write, or stab someone.
+  icon:
+    sprite: Objects/Misc/bureaucracy.rsi
+    state: pen
+  product: crate_pen
+  cost: 10
+  category: Other
+  group: market
+
+- type: cargoProduct
+  name: "Bike Horn"
+  id: cargo.bikehorn
+  description: HONK!
+  icon:
+    sprite: Objects/Fun/bikehorn.rsi
+  product: crate_bikehorn
+  cost: 300
+  category: Other
+  group: market
+
+- type: cargoProduct
+  name: "Cleaver"
+  id: cargo.cleaver
+  description: That's not a knife, THAT'S a knife.
+  icon:
+    sprite: Objects/Melee/cleaver.rsi
+    state: butch
+  product: crate_cleaver
+  cost: 300
+  category: Other
+  group: blackmarket
+
+- type: cargoProduct
+  name: "Fuel Tank"
+  id: cargo.fueltank
+  description: Movable fuel tank for welders. No boom boom.
+  icon:
+    sprite: Buildings/weldtank.png
+  product: crate_fueltank
+  cost: 200
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  name: "Medical Scanner"
+  id: cargo.medscanner
+  description: Scans patients. First we stick this probe...
+  icon:
+    sprite: Buildings/medical_scanner.rsi
+  product: crate_medscanner
+  cost: 400
+  category: Medical
+  group: market
+
+- type: cargoProduct
+  name: "Glass Crate"
+  id: cargo.glass
+  description: 50 sheets of glass.
+  icon:
+    sprite: Objects/Materials/sheet_glass.png
+  product: crate_glass
+  cost: 50
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  name: "Cable Crate"
+  id: cargo.cable
+  description: 50 coils of cable.
+  icon:
+    sprite: Objects/Tools/cable_coil.png
+    color: yellow
+  product: crate_cable
+  cost: 50
+  category: Engineering
+  group: market
+
diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml b/Resources/Prototypes/Entities/buildings/storage/crate_types.yml
index 6f4238d1fa..6e571c5e11 100644
--- a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml
+++ b/Resources/Prototypes/Entities/buildings/storage/crate_types.yml
@@ -118,3 +118,125 @@
 
   - type: Icon
     state: o2crate
+
+- type: entity
+  id: crate_flashlight
+  name: Flashlight Crate (x5)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Flashlight
+        - Flashlight
+        - Flashlight
+        - Flashlight
+        - Flashlight
+
+- type: entity
+  id: crate_light_bulb
+  name: Light Bulb Crate (x10)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+        - Light Bulb
+
+- type: entity
+  id: crate_fire_extinguisher
+  name: Fire Extinguisher Crate (x3)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Fire Extinguisher
+        - Fire Extinguisher
+        - Fire Extinguisher
+
+- type: entity
+  id: crate_pen
+  name: Pen Crate (x10)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+        - Pen
+
+- type: entity
+  id: crate_bikehorn
+  name: Bike Horn Crate (x5)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Bike Horn
+        - Bike Horn
+        - Bike Horn
+        - Bike Horn
+        - Bike Horn
+
+- type: entity
+  id: crate_cleaver
+  name: Cleaver Crate (x5)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Cleaver
+        - Cleaver
+        - Cleaver
+        - Cleaver
+        - Cleaver
+
+- type: entity
+  id: crate_fueltank
+  name: Fuel Tank
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Fuel Tank
+
+- type: entity
+  id: crate_medscanner
+  name: Medical Scanner
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - Medical Scanner
+
+- type: entity
+  id: crate_glass
+  name: Glass Sheet Crate (x50)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - GlassStack
+
+- type: entity
+  id: crate_cable
+  name: Cable Coil Crate (x50)
+  parent: crate_generic
+  components:
+    - type: StorageFill
+      contents:
+        - CableStack