diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
index 21d62eeeb52..d6c6d05fc59 100644
--- a/Resources/Locale/en-US/_NF/research/technologies.ftl
+++ b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -15,3 +15,4 @@ research-technology-industrial-medicine = Industrial Medicine
 research-technology-magnets-tech-advanced = Advanced Localized Magnetism
 research-technology-magnets-tech-combat = Localized Magnetism Combat Application
 research-technology-mobile-sanitation = Mobile Sanitation
+research-technology-chemical-dispensary = Chemical Dispensary
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index e20e52d0e11..1e28becea9f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -502,6 +502,8 @@
     - OreProcessorMachineCircuitboard
     - ElectrolysisUnitMachineCircuitboard
     - CentrifugeMachineCircuitboard
+    # - ChemDispenserMachineCircuitboard # Frontier
+    # - ChemMasterMachineCircuitboard # Frontier
     - CondenserMachineCircuitBoard
     - HotplateMachineCircuitboard
     - UniformPrinterMachineCircuitboard
@@ -530,8 +532,6 @@
       - CryoPodMachineCircuitboard
       - VaccinatorMachineCircuitboard
       - DiagnoserMachineCircuitboard
-      - ChemMasterMachineCircuitboard
-      - ChemDispenserMachineCircuitboard
       - BiomassReclaimerMachineCircuitboard
       - BiogeneratorMachineCircuitboard # Frontier BiofabricatorMachineCircuitboard<BiogeneratorMachineCircuitboard
       - SurveillanceCameraRouterCircuitboard
@@ -547,17 +547,13 @@
       - TurboItemRechargerCircuitboard
       - AutolatheHyperConvectionMachineCircuitboard
       - ProtolatheHyperConvectionMachineCircuitboard
-      - ReagentGrinderMachineCircuitboard
-      - HotplateMachineCircuitboard
-      - MicrowaveMachineCircuitboard
-      - ElectricGrillMachineCircuitboard
       - CircuitImprinterHyperConvectionMachineCircuitboard
       - FatExtractorMachineCircuitboard
       - FlatpackerMachineCircuitboard
       - SheetifierMachineCircuitboard
       - ShuttleConsoleCircuitboard
       - RadarConsoleCircuitboard
-      # - TechDiskComputerCircuitboard # Frontier: no tech disks
+      # - TechDiskComputerCircuitboard # Frontier
       - DawInstrumentMachineCircuitboard
       - CloningConsoleComputerCircuitboard
       - StasisBedMachineCircuitboard
@@ -579,7 +575,6 @@
       - ThrusterMachineCircuitboard
       - GyroscopeMachineCircuitboard
       - MiniGravityGeneratorCircuitboard
-      - MiniStationAnchorCircuitboard # Frontier
       - ShuttleGunKineticCircuitboard
       - GasRecyclerMachineCircuitboard
       - SeedExtractorMachineCircuitboard
@@ -591,8 +586,6 @@
       - APECircuitboard
       - ArtifactAnalyzerMachineCircuitboard
       - ArtifactCrusherMachineCircuitboard
-      - BoozeDispenserMachineCircuitboard
-      - SodaDispenserMachineCircuitboard
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
       - ReagentGrinderIndustrialMachineCircuitboard
@@ -603,7 +596,6 @@
       - FireAlarmElectronics # Nyano
       - FirelockElectronics # Nyano
       - IntercomElectronics # Nyano
-      - MailingUnitElectronics # Nyano
       - StationMapElectronics # Nyano
       - DeepFryerMachineCircuitboard # Nyano
       - SmallThrusterMachineCircuitboard # Frontier
@@ -611,12 +603,22 @@
       - MedicalAssemblerMachineCircuitboard # Frontier
       - KitchenAssemblerMachineCircuitboard # Frontier
       - ElectricRangeMachineCircuitboard # Frontier
+      - ChemDispenserMachineCircuitboard # Frontier
+      - ChemMasterMachineCircuitboard # Frontier
+      - ReagentGrinderMachineCircuitboard # Frontier
+      - HotplateMachineCircuitboard # Frontier
+      - MicrowaveMachineCircuitboard # Frontier
+      - ElectricGrillMachineCircuitboard # Frontier
+      - BoozeDispenserMachineCircuitboard # Frontier
+      - SodaDispenserMachineCircuitboard # Frontier
+      - MiniStationAnchorCircuitboard # Frontier
   - type: EmagLatheRecipes
     emagDynamicRecipes:
-      - ShuttleGunDusterCircuitboard
-      - ShuttleGunFriendshipCircuitboard
-      - ShuttleGunPerforatorCircuitboard
-      - ShuttleGunSvalinnMachineGunCircuitboard
+      # - ShuttleGunDusterCircuitboard # Frontier
+      # - ShuttleGunFriendshipCircuitboard # Frontier
+      # - ShuttleGunPerforatorCircuitboard # Frontier
+      # - ShuttleGunSvalinnMachineGunCircuitboard # Frontier
+      - ShuttleGunKineticCircuitboard # Frontier
   - type: MaterialStorage
     whitelist:
       tags:
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index cff1faf6cd8..1c5237e4516 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -40,22 +40,6 @@
   - MechEquipmentGrabberSmall
   - VimHarness
 
-- type: technology
-  id: FoodService
-  name: research-technology-food-service
-  icon:
-    sprite: Structures/Machines/juicer.rsi
-    state: juicer1
-  discipline: CivilianServices
-  tier: 1
-  cost: 7500
-  recipeUnlocks: #remove all of these once we have more kitchen equipment
-  - MicrowaveMachineCircuitboard
-  - ReagentGrinderMachineCircuitboard
-  - ElectricGrillMachineCircuitboard
-  - BoozeDispenserMachineCircuitboard
-  - SodaDispenserMachineCircuitboard
-
 - type: technology
   id: AudioVisualCommunication
   name: research-technology-audio-visual-communication
diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml
index c0c1830c70c..f8de216c1ff 100644
--- a/Resources/Prototypes/_NF/Research/civilianservices.yml
+++ b/Resources/Prototypes/_NF/Research/civilianservices.yml
@@ -1,16 +1,35 @@
-# Tier 3
+# Tier 1
 
 - type: technology
-  id: AdvancedPersonalPropulsion
-  name: research-technology-advanced-personal-propulsion
+  id: FoodService
+  name: research-technology-food-service
   icon:
-    sprite: Objects/Tanks/Jetpacks/void.rsi
-    state: icon
+    sprite: Structures/Machines/juicer.rsi
+    state: juicer1
   discipline: CivilianServices
-  tier: 3
-  cost: 15000
+  tier: 1
+  cost: 7500
   recipeUnlocks:
-  - JetpackVoid
+  - MicrowaveMachineCircuitboard
+  - ReagentGrinderMachineCircuitboard
+  - ElectricGrillMachineCircuitboard
+  - BoozeDispenserMachineCircuitboard
+  - SodaDispenserMachineCircuitboard
+
+# Tier 2
+
+- type: technology
+  id: ChemicalDispensary
+  name: research-technology-chemical-dispensary
+  icon:
+    sprite: Structures/dispensers.rsi
+    state: industrial-working
+  discipline: CivilianServices
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - ChemMasterMachineCircuitboard
+  - ChemDispenserMachineCircuitboard
 
 - type: technology
   id: IndustrialMedicine
@@ -23,6 +42,21 @@
   cost: 5000
   recipeUnlocks:
   - MedicalAssemblerMachineCircuitboard
+  - HotplateMachineCircuitboard
+
+# Tier 3
+
+- type: technology
+  id: AdvancedPersonalPropulsion
+  name: research-technology-advanced-personal-propulsion
+  icon:
+    sprite: Objects/Tanks/Jetpacks/void.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - JetpackVoid
 
 - type: technology
   id: AdvancedFoodService