diff --git a/configurations/bletchley_chassis.json b/configurations/bletchley_chassis.json
index 67e3607..69129db 100644
--- a/configurations/bletchley_chassis.json
+++ b/configurations/bletchley_chassis.json
@@ -167,6 +167,257 @@
                 }
             ],
             "Type": "AspeedFan"
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "FAN0_TACH_IL",
+                "FAN0_TACH_OL",
+                "FAN1_TACH_IL",
+                "FAN1_TACH_OL",
+                "FAN2_TACH_IL",
+                "FAN2_TACH_OL",
+                "FAN3_TACH_IL",
+                "FAN3_TACH_OL"
+            ],
+            "Name": "FAN_TACH",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 0.0,
+            "Outputs": [
+                "Pwm 1",
+                "Pwm 1",
+                "Pwm 2",
+                "Pwm 2",
+                "Pwm 3",
+                "Pwm 3",
+                "Pwm 4",
+                "Pwm 4"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone0"
+            ]
+        },
+        {
+            "FailSafePercent": 60,
+            "MinThermalOutput": 15,
+            "Name": "Zone0",
+            "Type": "Pid.Zone"
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "Virtual_Inlet_Temp"
+            ],
+            "Name": "inlet_temp",
+            "NegativeHysteresis": 1,
+            "Output": [
+                15.0,
+                15.0,
+                15.0,
+                15.0,
+                16.0,
+                17.0,
+                18.0,
+                19.0,
+                20.0,
+                21.0,
+                22.0,
+                23.0,
+                25.0,
+                27.0,
+                47.0,
+                50.0,
+                80.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                20.0,
+                22.0,
+                24.0,
+                26.0,
+                28.0,
+                30.0,
+                31.0,
+                32.0,
+                33.0,
+                34.0,
+                35.0,
+                36.0,
+                37.0,
+                38.0,
+                39.0,
+                40.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "Zone0"
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "MB_U402_THERM_LOCAL"
+            ],
+            "Name": "switch_temp",
+            "NegativeHysteresis": 0,
+            "Output": [
+                0.0,
+                15.0,
+                20.0,
+                25.0,
+                40.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                48.0,
+                49.0,
+                50.0,
+                51.0,
+                52.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "Zone0"
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "MB_U19_THERM_LOCAL"
+            ],
+            "Name": "retimer_temp",
+            "NegativeHysteresis": 0,
+            "Output": [
+                0.0,
+                20.0,
+                40.0,
+                42.0,
+                44.0,
+                46.0,
+                48.0,
+                50.0,
+                80.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                39.0,
+                40.0,
+                43.0,
+                44.0,
+                45.0,
+                46.0,
+                47.0,
+                48.0,
+                49.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "Zone0"
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "SLED1_THERM_LOCAL",
+                "SLED2_THERM_LOCAL",
+                "SLED3_THERM_LOCAL",
+                "SLED4_THERM_LOCAL",
+                "SLED5_THERM_LOCAL",
+                "SLED6_THERM_LOCAL"
+            ],
+            "Name": "sled_thermal_local",
+            "NegativeHysteresis": 0,
+            "Output": [
+                0.0,
+                20.0,
+                20.0,
+                45.0,
+                46.0,
+                47.0,
+                50.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                29.0,
+                30.0,
+                35.0,
+                47.0,
+                48.0,
+                49.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "Zone0"
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "nvme1",
+                "nvme2",
+                "nvme3",
+                "nvme4",
+                "nvme5",
+                "nvme6"
+            ],
+            "Name": "nvme_temp",
+            "NegativeHysteresis": 3,
+            "Output": [
+                0.0,
+                22.0,
+                22.0,
+                24.0,
+                28.0,
+                30.0,
+                32.0,
+                34.0,
+                35.0,
+                37.0,
+                39.0,
+                42.0,
+                43.0,
+                44.0,
+                45.0,
+                50.0,
+                80.0
+            ],
+            "PositiveHysteresis": 1,
+            "Reading": [
+                35.0,
+                38.0,
+                44.0,
+                46.0,
+                48.0,
+                49.0,
+                50.0,
+                51.0,
+                52.0,
+                54.0,
+                55.0,
+                56.0,
+                57.0,
+                58.0,
+                59.0,
+                64.0,
+                67.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "Zone0"
+            ]
         }
     ],
     "Name": "Bletchley Chassis",
diff --git a/configurations/bletchley_frontpanel.json b/configurations/bletchley_frontpanel.json
index bf433a8..a6c7f34 100644
--- a/configurations/bletchley_frontpanel.json
+++ b/configurations/bletchley_frontpanel.json
@@ -15,6 +15,20 @@
                         "Value": 40.0
                     },
                     {
+                        "Direction": "greater than",
+                        "Index": 1,
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 39.0
+                    },
+                    {
+                        "Direction": "less than",
+                        "Index": 1,
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 1
+                    },
+                    {
                         "Direction": "less than",
                         "Index": 1,
                         "Name": "lower critical",
@@ -49,6 +63,20 @@
                         "Value": 40.0
                     },
                     {
+                        "Direction": "greater than",
+                        "Index": 1,
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 39.0
+                    },
+                    {
+                        "Direction": "less than",
+                        "Index": 1,
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 1
+                    },
+                    {
                         "Direction": "less than",
                         "Index": 1,
                         "Name": "lower critical",