diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index df55f302516..d892823d4f3 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -19,7 +19,6 @@ public sealed class EntityTest
         private static readonly ProtoId<EntityCategoryPrototype> SpawnerCategory = "Spawner";
 
         [Test]
-        [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - unsure which entities are currently failing
         public async Task SpawnAndDeleteAllEntitiesOnDifferentMaps()
         {
             // This test dirties the pair as it simply deletes ALL entities when done. Overhead of restarting the round
@@ -82,7 +81,6 @@ await server.WaitPost(() =>
         }
 
         [Test]
-        [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - unsure which entities are currently failing
         public async Task SpawnAndDeleteAllEntitiesInTheSameSpot()
         {
             // This test dirties the pair as it simply deletes ALL entities when done. Overhead of restarting the round
@@ -141,7 +139,7 @@ await server.WaitPost(() =>
         ///     all components on every entity.
         /// </summary>
         [Test]
-        [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - unsure which entities are currently failing
+        [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - these take forever to run and fail.
         public async Task SpawnAndDirtyAllEntities()
         {
             // This test dirties the pair as it simply deletes ALL entities when done. Overhead of restarting the round
@@ -227,7 +225,6 @@ await server.WaitPost(() =>
         /// crude test to try catch issues like this, and possibly should just be disabled.
         /// </remarks>
         [Test]
-        [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - unsure which entities are currently failing
         public async Task SpawnAndDeleteEntityCountTest()
         {
             var settings = new PoolSettings { Connected = true, Dirty = true };
@@ -241,6 +238,8 @@ public async Task SpawnAndDeleteEntityCountTest()
                 "MapGrid",
                 "StationEvent",
                 "TimedDespawn",
+                "TransferMindOnDespawn", // Frontier
+                "BluespaceErrorRule", // Frontier
 
                 // makes an announcement on mapInit.
                 "AnnounceOnSpawn",
@@ -360,6 +359,7 @@ public async Task AllComponentsOneToOneDeleteTest()
                 "BiomeSelection", // Whaddya know, requires config.
                 "ActivatableUI", // Frontier: Requires enum key
                 "AlertLevel", // Frontier: requires alert set
+                "BluespaceErrorRule", // Frontier
             };
 
             // TODO TESTS
diff --git a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
index 9ae56eba690..639928121f6 100644
--- a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
+++ b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
@@ -9,7 +9,8 @@ namespace Content.IntegrationTests.Tests.Internals;
 [TestOf(typeof(InternalsSystem))]
 public sealed class AutoInternalsTests
 {
-    [Ignore("Not relevant for Frontier")] // Frontier
+    [Test]
+    [Ignore("Frontier: Changes to StationSpawningSystem breaks this")] // Frontier
     public async Task TestInternalsAutoActivateInSpaceForStationSpawn()
     {
         await using var pair = await PoolManager.GetServerClient();
@@ -35,7 +36,7 @@ await server.WaitAssertion(() =>
         await pair.CleanReturnAsync();
     }
 
-    [Ignore("Not relevant for Frontier")] // Frontier
+    [Test]
     public async Task TestInternalsAutoActivateInSpaceForEntitySpawn()
     {
         await using var pair = await PoolManager.GetServerClient();
diff --git a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
index e1a8c7ba58b..8d0de707f3b 100644
--- a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
@@ -17,7 +17,6 @@ public sealed class StorageInteractionTest : InteractionTest
     /// Check that players can interact with items in storage if the storage UI is open
     /// </summary>
     [Test]
-    [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - no idea what's actually causing a failure here.
     public async Task UiInteractTest()
     {
         var sys = Server.System<SharedContainerSystem>();
diff --git a/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs b/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs
index a0c70222840..9990adfae68 100644
--- a/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs
+++ b/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs
@@ -5,6 +5,7 @@
 using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;
+using Content.Client._NF.CryoSleep; // Frontier
 
 namespace Content.IntegrationTests.Tests.UserInterface;
 
@@ -16,13 +17,13 @@ public sealed class UiControlTest
     {
         typeof(EmotesMenu),
         typeof(LateJoinGui),
+        typeof(CryosleepWakeupWindow), // Frontier: FIXME - refactor this window into EUI(?) pattern, this thing subscribes to events
     };
 
     /// <summary>
     /// Tests that all windows can be instantiated successfully.
     /// </summary>
     [Test]
-    [Ignore("Preventing CI tests from failing")] // Frontier: FIXME - bad Cryosleep UI registration
     public async Task TestWindows()
     {
         var pair = await PoolManager.GetServerClient(new PoolSettings()
diff --git a/Content.Server/_NF/Explosion/Components/TriggerOnProjectileHitComponent.cs b/Content.Server/_NF/Explosion/Components/TriggerOnProjectileHitComponent.cs
index 86e53c1b299..cdadf6452da 100644
--- a/Content.Server/_NF/Explosion/Components/TriggerOnProjectileHitComponent.cs
+++ b/Content.Server/_NF/Explosion/Components/TriggerOnProjectileHitComponent.cs
@@ -4,4 +4,6 @@ namespace Content.Server.Explosion.Components;
 /// Frontier: Triggers on the entity hitting something else as a projectile.
 /// </summary>
 [RegisterComponent]
-public sealed partial class TriggerOnProjectileHitComponent : Component;
+public sealed partial class TriggerOnProjectileHitComponent : Component
+{
+}
diff --git a/Content.Shared/CCVar/CCVars.Interactions.cs b/Content.Shared/CCVar/CCVars.Interactions.cs
index 7c3b40a8dfd..0239c170988 100644
--- a/Content.Shared/CCVar/CCVars.Interactions.cs
+++ b/Content.Shared/CCVar/CCVars.Interactions.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
@@ -44,7 +44,7 @@ public sealed partial class CCVars
     ///     Whether or not the storage UI is static and bound to the hotbar, or unbound and allowed to be dragged anywhere.
     /// </summary>
     public static readonly CVarDef<bool> StaticStorageUI =
-        CVarDef.Create("control.static_storage_ui", false, CVar.CLIENTONLY | CVar.ARCHIVE); // Frontier: false
+        CVarDef.Create("control.static_storage_ui", true, CVar.CLIENTONLY | CVar.ARCHIVE); // Frontier: FIXME, setting this to false actully breaks StorageInteractionTest, since its client settings we can let it be.
 
     /// <summary>
     ///     Whether or not the storage window uses a transparent or opaque sprite.
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index 078ad115bbc..93b0abfd820 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -23,7 +23,6 @@ public sealed class LoadoutSystem : EntitySystem
     [Dependency] private readonly SharedStationSpawningSystem _station = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IDependencyCollection _dependencies = default!; // Frontier
 
     public override void Initialize()
     {
@@ -164,12 +163,7 @@ public void Equip(EntityUid uid, List<ProtoId<StartingGearPrototype>>? startingG
         var id = _random.Pick(loadoutGroups);
         var proto = _protoMan.Index(id);
         var loadout = new RoleLoadout(id);
-        // Frontier: cache, ensure valid loadouts.
-        var profile = GetProfile(uid);
-        var session = _actors.GetSession(uid);
-        loadout.SetDefault(profile, session, _protoMan, true);
-        loadout.EnsureValid(profile, session, _dependencies);
-        // End Frontier
+        loadout.SetDefault(GetProfile(uid), _actors.GetSession(uid), _protoMan, true);
         _station.EquipRoleLoadout(uid, loadout, proto);
 
         GearEquipped(uid);
diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index eeaecc24d80..59f61a48071 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -168,7 +168,7 @@ public bool TryGetIncapThreshold(EntityUid target, [NotNullWhen(true)] out Fixed
         MobThresholdsComponent? thresholdComponent = null)
     {
         threshold = null;
-        if (!Resolve(target, ref thresholdComponent))
+        if (!Resolve(target, ref thresholdComponent, logMissing: false)) // Frontier: set logMissing to false
             return false;
 
         return TryGetThresholdForState(target, MobState.Critical, out threshold, thresholdComponent)
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 953a0c6a4bc..02678f5f8fa 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -194,7 +194,7 @@
 
 #ERT
 - type: entity
-  parent: [ NFClothingBackpack, BaseCentcommContraband ] # Frontier: ClothingBackpack<NFClothingBackpack
+  parent: [ ClothingBackpack, BaseCentcommContraband ] # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackERTLeader
   name: ERT leader backpack
   description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.
@@ -206,7 +206,7 @@
     - 0,0,10,3
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
+  parent: ClothingBackpackERTLeader
   id: ClothingBackpackERTSecurity
   name: ERT security backpack
   description: A spacious backpack with lots of pockets, worn by Security Officers of an Emergency Response Team.
@@ -215,7 +215,7 @@
     sprite: Clothing/Back/Backpacks/ertsec.rsi
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
+  parent: ClothingBackpackERTLeader
   id: ClothingBackpackERTMedical
   name: ERT medical backpack
   description: A spacious backpack with lots of pockets, worn by Medical Officers of an Emergency Response Team.
@@ -224,7 +224,7 @@
     sprite: Clothing/Back/Backpacks/ertmed.rsi
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
+  parent: ClothingBackpackERTLeader
   id: ClothingBackpackERTEngineer
   name: ERT engineer backpack
   description: A spacious backpack with lots of pockets, worn by Engineers of an Emergency Response Team.
@@ -233,7 +233,7 @@
     sprite: Clothing/Back/Backpacks/erteng.rsi
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
+  parent: ClothingBackpackERTLeader
   id: ClothingBackpackERTJanitor
   name: ERT janitor backpack
   description: A spacious backpack with lots of pockets, worn by Janitors of an Emergency Response Team.
@@ -242,7 +242,7 @@
     sprite: Clothing/Back/Backpacks/ertjanitor.rsi
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
+  parent: ClothingBackpackERTLeader
   id: ClothingBackpackERTClown
   name: ERT clown backpack
   description: A spacious backpack with lots of pockets, worn by Clowns of an Emergency Response Team.
@@ -251,7 +251,7 @@
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
+  parent: ClothingBackpackERTLeader
   id: ClothingBackpackERTChaplain
   name: ERT chaplain backpack
   description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
@@ -260,7 +260,7 @@
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
 - type: entity
-  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTSecurity
+  parent: ClothingBackpackERTSecurity
   id: ClothingBackpackDeathSquad
   name: death squad backpack
   description: Holds the kit of CentComm's most feared agents.
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
index 4ffd934c086..1806f88c97e 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -4,7 +4,6 @@
   name: job-name-ertleader
   description: job-description-ertleader
   playTimeTracker: JobERTLeader
-  whitelisted: false
   setPreference: false
   startingGear: ERTLeaderGearEVA
   icon: "JobIconNanotrasen"
@@ -14,6 +13,7 @@
   - AllAccess
   access:
   - CentralCommand
+  whitelisted: true # Frontier
 
 - type: startingGear
   id: ERTLeaderGear
@@ -108,6 +108,7 @@
   - !type:AddComponentSpecial
     components:
     - type: BibleUser #Lets them heal with bibles
+  whitelisted: true # Frontier
 
 - type: startingGear
   id: ERTChaplainGear
@@ -177,7 +178,6 @@
   name: job-name-ertengineer
   description: job-description-ertengineer
   playTimeTracker: JobERTEngineer
-  whitelisted: true
   setPreference: false
   startingGear: ERTEngineerGearEVA
   icon: "JobIconNanotrasen"
@@ -187,6 +187,7 @@
   - AllAccess
   access:
   - CentralCommand
+  whitelisted: true # Frontier
 
 - type: startingGear
   id: ERTEngineerGear
@@ -250,7 +251,6 @@
   name: job-name-ertsecurity
   description: job-description-ertsecurity
   playTimeTracker: JobERTSecurity
-  whitelisted: true
   setPreference: false
   startingGear: ERTEngineerGearEVA
   icon: "JobIconNanotrasen"
@@ -260,6 +260,7 @@
   - AllAccess
   access:
   - CentralCommand
+  whitelisted: true # Frontier
 
 - type: startingGear
   id: ERTSecurityGear
@@ -274,7 +275,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
   storage:
     back:
@@ -298,7 +299,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
   storage:
     back:
@@ -341,7 +342,6 @@
   name: job-name-ertmedic
   description: job-description-ertmedic
   playTimeTracker: JobERTMedical
-  whitelisted: true
   setPreference: false
   startingGear: ERTMedicalGearEVA
   icon: "JobIconNanotrasen"
@@ -351,6 +351,7 @@
   - AllAccess
   access:
   - CentralCommand
+  whitelisted: true # Frontier
 
 - type: startingGear
   id: ERTMedicalGear
@@ -406,7 +407,6 @@
   name: job-name-ertjanitor
   description: job-description-ertjanitor
   playTimeTracker: JobERTJanitor
-  whitelisted: true
   setPreference: false
   startingGear: ERTJanitorGearEVA
   icon: "JobIconNanotrasen"
@@ -416,6 +416,7 @@
   - AllAccess
   access:
   - CentralCommand
+  whitelisted: true # Frontier
 
 - type: startingGear
   id: ERTJanitorGear
@@ -443,7 +444,7 @@
   id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitor # Frontier: ClothingBackpackERTJanitorFille<ClothingBackpackERTJanitor
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesBootsMagGaloshes # Frontier
     mask: ClothingMaskGasERT
     gloves: ClothingHandsGlovesColorPurple
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/base_structurecrates.yml
index bbb337c290e..938071541bd 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -1,6 +1,7 @@
 - type: entity
   parent: [BaseStructureLockImmuneToEmag, BaseStructureAccessReaderImmuneToEmag, CrateBaseWeldable]
   id: CrateTradeBaseSecure
+  abstract: true
   categories: [ HideSpawnMenu ]
   components:
   - type: TradeCrate