diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fa2023956fa..5d6863377a1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -977,7 +977,7 @@
 
 - type: entity
   id: MedicalTechFab
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: added BlueprintReceiverBase
   name: medical techfab
   description: Prints equipment for use by the medbay.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
index e6a00aaa74e..b8f0e3b3ea2 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -204,6 +204,8 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: WiresPanel
     open: false
+  - type: Physics # Frontier
+    canCollide: false # Frontier
 
 - type: entity
   id: BaseIntercomSecure
diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
index b90217a7053..ae815af058e 100644
--- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
+++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
@@ -31,16 +31,28 @@
   - type: StaticPrice # Frontier
     price: 200 # Frontier
 
+# Frontier: base stack for card stack component
 - type: entity
   parent: BaseItem
+  id: CardStackBase
+  name: stack of cards
+  abstract: true
+  components:
+  - type: Item
+    size: Small
+  - type: CardStack
+  - type: ContainerContainer # Frontier
+    containers: # Frontier
+      cardstack-container: !type:Container # Frontier
+# End Frontier
+
+- type: entity
+  parent: CardStackBase
   id: CardHandBase
   categories: [ HideSpawnMenu ]
   name: hand of cards
   components:
-  - type: Item
-    size: Small
   - type: CardHand
-  - type: CardStack
   - type: Sprite
     sprite: EstacaoPirata/Objects/Misc/cards.rsi
     state: singlecard_down_black
@@ -54,7 +66,7 @@
     price: 0.01 # Frontier
 
 - type: entity
-  parent: BaseItem
+  parent: CardStackBase
   id: CardDeckBase
   categories: [ HideSpawnMenu ]
   name: deck of cards
@@ -65,7 +77,6 @@
   - type: Item
     size: Normal
   - type: CardDeck
-  - type: CardStack
 
 
 - type: entity
@@ -184,6 +195,8 @@
   - type: StaticPrice # Frontier
     price: 0.01 # Frontier
 
+# region Black Cards
+
 - type: entity
   parent: CardBase
   categories: [ HideSpawnMenu ]
@@ -771,3 +784,5 @@
   - type: Sprite
     sprite: EstacaoPirata/Objects/Misc/cards.rsi
     state: black_joker
+
+# endregion Black Deck
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
index b81f54a7a6c..5c1c3bbabcf 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
   id: ScienceTechFab
   name: science techfab
   description: Prints equipment for use by the epistemics department.
@@ -109,7 +109,7 @@
         - Ingot
 
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
   id: ServiceTechFab
   name: service techfab
   description: Prints equipment for service staff.
@@ -268,7 +268,7 @@
         - Ingot
 
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
   id: EngineeringTechFab
   name: engineering techfab
   description: Prints equipment for engineers.
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml
index ac653e7a7bb..adb306236c3 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -3,4 +3,9 @@
   parent: 
   - ClosetWallOrange
   - BaseStructureWallmount
-  - WardrobePrisonFilled
\ No newline at end of file
+  - WardrobePrisonFilled
+  components:
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
index 2a14e10785c..4d1f5bd6206 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
@@ -37,7 +37,8 @@
     slot: head
   - type: ContainerContainer
     containers:
-      toggleable-clothing: !type:ContainerSlot {}
+      toggleable-clothing: !type:ContainerSlot
+      storagebase: !type:Container
   - type: StaticPrice
     price: 65
   - type: Construction
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
index 042cf93833e..9dc17368c4d 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
@@ -78,6 +78,8 @@
   - type: MultiHandedItem
   - type: ItemSlots
   - type: ContainerContainer
+    containers:
+      paper_label: !type:ContainerSlot
 
 - type: entity
   parent: DrinkKegBase
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
index ebd0cd34164..3029c4f2401 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
@@ -203,6 +203,7 @@
   - type: Construction
     graph: Coffee
     node: dark roasted coffee
+    defaultTarget: Null # Overwriting light target
 
 - type: reagent
   id: OilVegetable
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml
index d9161d869fe..bf10f371fbc 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml
@@ -30,8 +30,8 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
-        ents: []
-      ashes_slot: !type:ContainerSlot {}
+      ashes_slot: !type:ContainerSlot
+      paper_label: !type:ContainerSlot
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml
index 4649781f006..8f858a1371b 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml
@@ -6,9 +6,7 @@
   - type: SolutionContainerManager
     solutions:
       Welder:
-        reagents:
-        - ReagentId: WeldingFuel
-          Quantity: 0
+        reagents: []
         maxVol: 100
 
 - type: entity
@@ -19,9 +17,7 @@
   - type: SolutionContainerManager
     solutions:
       Welder:
-        reagents:
-        - ReagentId: WeldingFuel
-          Quantity: 0
+        reagents: []
         maxVol: 250
 
 - type: entity
@@ -32,9 +28,7 @@
   - type: SolutionContainerManager
     solutions:
       Welder:
-        reagents:
-        - ReagentId: WeldingFuel
-          Quantity: 0
+        reagents: []
         maxVol: 250
 
 - type: entity
@@ -45,7 +39,5 @@
   - type: SolutionContainerManager
     solutions:
       Welder:
-        reagents:
-        - ReagentId: WeldingFuel
-          Quantity: 0
+        reagents: []
         maxVol: 1000
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml
index 67b0cd910bd..09ab2851862 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml
@@ -7,8 +7,12 @@
   components:
     - type: ItemPlacer
       whitelist:
+        # Should match crates.
+        requireAll: true
         components:
-          - CrateGenericSteel
+          - EntityStorage
+          - PaperLabel
+          - ContainerContainer
     - type: CrateMachine
     - type: Sprite
       sprite: _NF/Structures/Machines/crate_machine.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index fa2bcb7566b..65e48c615be 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -154,7 +154,7 @@
         - PrizeTicket
 
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ]
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
   id: SalvageTechfabNF
   name: salvage techfab
   description: Prints equipment for salvagers.
@@ -310,7 +310,7 @@
 
 - type: entity
   id: MercenaryTechFab
-  parent: [ BaseLatheLube, BlueprintReceiverBase ]
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
   name: mercenary techfab
   description: Prints the bare minimum of tools of the trade that any budget mercenary or private security could need. Nothing fancy.
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
index 0c51fbfa167..0f9cf3ce900 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
@@ -262,6 +262,11 @@
     interfaces:
       enum.MicrowaveUiKey.MedicalAssemblerKey:
         type: AssemblerBoundUserInterface
+  - type: ContainerContainer # Redefined due to inheritance order
+    containers:
+      microwave_entity_container: !type:Container
+      machine_board: !type:Container
+      machine_parts: !type:Container
 
 # POI versions of microwave machines
 
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
index 080cd261fb0..9d1a2e35d9b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
@@ -35,6 +35,10 @@
           acts: ["Destruction"]
   - type: Machine
     board: ThrusterSecurityMachineCircuitboard
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container # FIXME: Why do these need to be defined here?  What's missing?
+      machine_parts: !type:Container
 
 - type: entity
   id: GyroscopeSecurity
@@ -56,6 +60,10 @@
     sprite: _NF/Structures/Shuttles/gyroscope.rsi
   - type: Machine
     board: GyroscopeSecurityMachineCircuitboard
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container # FIXME: Why do these need to be defined here?  What's missing?
+      machine_parts: !type:Container
 
 - type: entity
   id: SmallGyroscopeSecurity
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
index 93f4d05808f..1a4fc2f4700 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -22,6 +22,10 @@
         decal2:
           True: { visible: false }
           False: { visible: true }
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot # Defined for any locker inheriting a physical one.
 
 # Fuel / materials storage
 - type: entity
@@ -181,7 +185,7 @@
 # Other: Chemistry wall locker
 - type: entity
   id: LockerWallChemistry
-  parent: [LockerWallMedical, BaseStructureWallmount]
+  parent: [BaseStructureWallmount, LockerWallMedical]
   name: chemistry wall locker
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/_NF/Entities/Structures/atm.yml b/Resources/Prototypes/_NF/Entities/Structures/atm.yml
index b8101bf19dc..f1cb74ccdcb 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/atm.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/atm.yml
@@ -8,6 +8,11 @@
     singleUser: true
   - type: Computer
     board: Null
+  - type: ItemSlots # TODO: move ItemSlot to be nullable, withdraw shouldn't have one at all
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+      bank-ATM-cashSlot: !type:ContainerSlot
 
 - type: entity
   name: bank ATM
@@ -32,11 +37,6 @@
     interfaces:
       enum.BankATMMenuUiKey.ATM:
         type: BankATMMenuBoundUserInterface
-  - type: ItemSlots
-  - type: ContainerContainer
-    containers:
-      board: !type:Container
-      bank-ATM-cashSlot: !type:ContainerSlot
 
 - type: entity
   name: withdraw-only bank ATM