From e1cb80f71662e2246d3b98b04c3b9a237212717d Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 28 Apr 2017 18:27:21 -0400
Subject: [PATCH] overhauled Pneumatic, fixed bugs, many improvements

---
 AircraftConfig/acconfig.nas               |  45 ++-
 Models/FlightDeck/a320.flightdeck.xml     |   2 +
 Models/Instruments/OHpanel/OHpanel.xml    | 394 +++++++++++++++-------
 Models/Instruments/OHpanel/res/ohpanel.ac | 324 +++++++++++++++++-
 Nasal/electrical.nas                      |   2 +-
 Nasal/engines.nas                         |  32 +-
 Nasal/it-fbw.nas                          |   2 +-
 Nasal/pneumatics.nas                      | 142 ++++----
 8 files changed, 712 insertions(+), 231 deletions(-)

diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 55477752..cb31c96f 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -104,11 +104,11 @@ var beforestart_b = func {
 	# Continue with engine start prep.
 	setprop("/controls/electrical/switches/gen-apu", 1);
 	setprop("/controls/electrical/switches/galley", 1);
-	setprop("/controls/bleed/OHP/bleedapu", 1);
 	setprop("/controls/electrical/switches/gen1", 1);
 	setprop("/controls/electrical/switches/gen2", 1);
-	setprop("/controls/bleed/OHP/bleed1", 1);
-	setprop("/controls/bleed/OHP/bleed2", 1);
+	setprop("/controls/pneumatic/switches/bleedapu", 1);
+	setprop("/controls/pneumatic/switches/bleed1", 1);
+	setprop("/controls/pneumatic/switches/bleed2", 1);
 	setprop("controls/adirs/ir[0]/knob","2");
 	setprop("controls/adirs/ir[1]/knob","2");
 	setprop("controls/adirs/ir[2]/knob","2");
@@ -165,11 +165,11 @@ var taxi_b = func {
 	# Continue with engine start prep, and start engine 2.
 	setprop("/controls/electrical/switches/gen-apu", 1);
 	setprop("/controls/electrical/switches/galley", 1);
-	setprop("/controls/bleed/OHP/bleedapu", 1);
 	setprop("/controls/electrical/switches/gen1", 1);
 	setprop("/controls/electrical/switches/gen2", 1);
-	setprop("/controls/bleed/OHP/bleed1", 1);
-	setprop("/controls/bleed/OHP/bleed2", 1);
+	setprop("/controls/pneumatic/switches/bleedapu", 1);
+	setprop("/controls/pneumatic/switches/bleed1", 1);
+	setprop("/controls/pneumatic/switches/bleed2", 1);
 	setprop("controls/adirs/ir[0]/knob","2");
 	setprop("controls/adirs/ir[1]/knob","2");
 	setprop("controls/adirs/ir[2]/knob","2");
@@ -179,31 +179,42 @@ var taxi_b = func {
 	setprop("instrumentation/adirs/ir[0]/aligned",1);
 	setprop("instrumentation/adirs/ir[1]/aligned",1);
 	setprop("instrumentation/adirs/ir[2]/aligned",1);
-	setprop("/controls/engines/engine-start-switch", 2);
-	setprop("/controls/engines/engine[1]/cutoff-switch", 0);
-	var eng_two_chk = setlistener("/engines/engine[1]/state", func {
-		if (getprop("/engines/engine[1]/state") == 3) {
-			removelistener(eng_two_chk);
+	var pneu_chk = setlistener("/systems/pneumatic/total-psi", func {
+		if (getprop("/systems/pneumatic/total-psi") >= 28) {
+			removelistener(pneu_chk);
 			taxi_c();
 		}
 	});
 }
 var taxi_c = func {
-	# Start engine 1.
-	setprop("/controls/engines/engine[0]/cutoff-switch", 0);
-	var eng_one_chk = setlistener("/engines/engine[0]/state", func {
-		if (getprop("/engines/engine[0]/state") == 3) {
-			removelistener(eng_one_chk);
+	setprop("/controls/engines/engine-start-switch", 2);
+	setprop("/controls/engines/engine[1]/cutoff-switch", 0);
+	var eng_two_chk = setlistener("/engines/engine[1]/state", func {
+		if (getprop("/engines/engine[1]/state") == 3) {
+			removelistener(eng_two_chk);
 			taxi_d();
 		}
 	});
 }
 var taxi_d = func {
+	# Start engine 1.
+	setprop("/controls/engines/engine[0]/cutoff-switch", 0);
+	var eng_one_chk = setlistener("/engines/engine[0]/state", func {
+		if (getprop("/engines/engine[0]/state") == 3) {
+			removelistener(eng_one_chk);
+			taxi_e();
+		}
+	});
+}
+var taxi_e = func {
 	# After Start items.
 	setprop("/controls/engines/engine-start-switch", 1);
-	setprop("/controls/bleed/OHP/bleedapu", 0);
 	setprop("/controls/APU/master", 0);
 	setprop("/controls/APU/start", 0);
+	setprop("/controls/pneumatic/switches/bleedapu", 0);
+	setprop("/controls/pneumatic/switches/pack1", 1);
+	setprop("/controls/pneumatic/switches/pack2", 1);
+	setprop("/controls/pneumatic/switches/hot-air", 1);
 	setprop("/systems/acconfig/autoconfig-running", 0);
 	ps_load_dlg.close();
 	ps_loaded_dlg.open();
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index e99f91d9..55457d1e 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -4164,6 +4164,7 @@
 		<object-name>EngMode</object-name>
 		<action>
 			<button>0</button>
+			<button>3</button>
 			<repeatable type="bool">false</repeatable>
 			<binding>
 				<command>property-cycle</command>
@@ -4175,6 +4176,7 @@
 		</action>
 		<action>
 			<button>1</button>
+			<button>4</button>
 			<repeatable type="bool">false</repeatable>
 			<binding>
 				<command>property-cycle</command>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index df7335b7..571b175d 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -69,11 +69,15 @@
 		</emission>
 	</animation>
 	
-	<!-- No buttons without power! -->
+	<!-- No button lights without power! -->
 	<animation>
 		<type>select</type>
 		<object-name>ACESSFeedBtn1F</object-name>
 		<object-name>ACESSFeedBtn2O</object-name>
+		<object-name>ACPack1Btn1F</object-name>
+		<object-name>ACPack1Btn2O</object-name>
+		<object-name>ACPack2Btn1F</object-name>
+		<object-name>ACPack2Btn2O</object-name>
 		<object-name>APUBleedBtn1F</object-name>
 		<object-name>APUBleedBtn2O</object-name>
 		<object-name>APUGenBtn1F</object-name>
@@ -106,6 +110,8 @@
 		<object-name>Gen1Btn2O</object-name>
 		<object-name>Gen2Btn1F</object-name>
 		<object-name>Gen2Btn2O</object-name>
+		<object-name>HotAirBtn1F</object-name>
+		<object-name>HotAirBtn2O</object-name>
 		<object-name>IDG1Btn1F</object-name>
 		<object-name>IDG2Btn1F</object-name>
 		<object-name>IR1Btn1F</object-name>
@@ -115,6 +121,7 @@
 		<object-name>IR3Btn1F</object-name>
 		<object-name>IR3Btn2A</object-name>
 		<object-name>IrsOnBatLightOB</object-name>
+		<object-name>RamAirBtn2O</object-name>
 		<condition>
 			<or>
 				<equals>
@@ -172,7 +179,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/ir[0]/knob</property>
@@ -185,7 +192,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/ir[0]/knob</property>
@@ -257,7 +264,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/ir[1]/knob</property>
@@ -270,7 +277,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/ir[1]/knob</property>
@@ -342,7 +349,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/ir[2]/knob</property>
@@ -355,7 +362,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/ir[2]/knob</property>
@@ -427,7 +434,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/display/dataknob</property>
@@ -443,7 +450,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/display/dataknob</property>
@@ -488,7 +495,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/display/selected</property>
@@ -502,7 +509,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/adirs/display/selected</property>
@@ -563,7 +570,7 @@
 		<object-name>ADR1Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/adirs/adr[0]/off</property>
@@ -614,7 +621,7 @@
 		<object-name>ADR2Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/adirs/adr[1]/off</property>
@@ -665,7 +672,7 @@
 		<object-name>ADR3Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/adirs/adr[2]/off</property>
@@ -759,7 +766,7 @@
 		<object-name>GroundCall</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -781,7 +788,7 @@
 		<object-name>FwdCabinCall</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -801,7 +808,7 @@
 		<object-name>GPWSBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
@@ -841,7 +848,7 @@
 		<object-name>GPWSGSBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>instrumentation/mk-viii/inputs/discretes/glideslope-cancel</property>
@@ -867,7 +874,7 @@
 		<object-name>GPWSFlpBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
@@ -893,7 +900,7 @@
 		<object-name>GPWSFlp3Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
@@ -919,7 +926,7 @@
 		<object-name>Eng1Fire</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/engines/engine[0]/fire-bottle-discharge</property>
@@ -944,7 +951,7 @@
 		<object-name>APUFire</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/APU/fire-switch</property>
@@ -969,7 +976,7 @@
 		<object-name>Eng2Fire</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/engines/engine[1]/fire-bottle-discharge</property>
@@ -996,7 +1003,7 @@
 		<object-name>LFuelTank1Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<!-- property>consumables/fuel/tank[0]/selected</property -->
@@ -1026,7 +1033,7 @@
 		<object-name>LFuelTank2Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<!--property>consumables/fuel/tank[1]/selected</property-->
@@ -1057,7 +1064,7 @@
 		<object-name>CFuelTank1Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<!--property>consumables/fuel/tank[3]/selected</property-->
@@ -1087,7 +1094,7 @@
 		<object-name>CFuelTank2Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<!--property>consumables/fuel/tank[3]/selected</property-->
@@ -1119,7 +1126,7 @@
 		<object-name>FuelXfeedBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/fuel/x-feed</property>
@@ -1151,7 +1158,7 @@
 		<object-name>RFuelTank1Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<!--property>consumables/fuel/tank[4]/selected</property-->
@@ -1182,7 +1189,7 @@
 		<object-name>RFuelTank2Btn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<!--property>consumables/fuel/tank[5]/selected</property-->
@@ -1216,7 +1223,7 @@
 		<object-name>fueldumpARM2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/fuel-dump/arm</property>
@@ -1243,7 +1250,7 @@
 		<object-name>fueldumpACT2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/fuel-dump/active</property>
@@ -1272,7 +1279,7 @@
 		<object-name>GalleyPwrBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/galley</property>
@@ -1323,7 +1330,7 @@
 		<object-name>BatteryBtn12O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/battery1</property>
@@ -1374,7 +1381,7 @@
 		<object-name>BatteryBtn22O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/battery2</property>
@@ -1424,7 +1431,7 @@
 		<object-name>IDG1Btn1F</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/systems/unused/unused-oh</property>
@@ -1458,7 +1465,7 @@
 		<object-name>Gen1Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen1</property>
@@ -1509,7 +1516,7 @@
 		<object-name>ACESSFeedBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/ac-ess-feed</property>
@@ -1560,7 +1567,7 @@
 		<object-name>APUGenBtnO</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen-apu</property>
@@ -1607,7 +1614,7 @@
 		<object-name>BusTieBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/apu-ext-crosstie</property>
@@ -1641,7 +1648,7 @@
 		<object-name>ExtPwrBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen-ext</property>
@@ -1696,7 +1703,7 @@
 		<object-name>Gen2Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen2</property>
@@ -1747,7 +1754,7 @@
 		<object-name>IDG2Btn1F</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/systems/unused/unused-oh</property>
@@ -1779,23 +1786,24 @@
 		<object-name>ACFlowKnb</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<button>3</button>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/pressurization/outflow-valve</property>
-				<step>0.5</step>
-				<max>1</max>
+				<property>/controls/pneumatic/switches/pack-flo</property>
+				<step>5</step>
+				<max>15</max>
 			</binding>
-
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable type="bool">false</repeatable>
+			<button>4</button>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/pressurization/outflow-valve</property>
-				<step>-0.5</step>
-				<min>0</min>
+				<property>/controls/pneumatic/switches/pack-flo</property>
+				<step>-5</step>
+				<min>5</min>
 			</binding>
 		</action>
 	</animation>
@@ -1803,11 +1811,11 @@
 		<name>AC pack flow rotate</name>
 		<type>rotate</type>
 		<object-name>ACFlowKnb</object-name>
-		<property>controls/pressurization/outflow-valve</property>
+		<property>/controls/pneumatic/switches/pack-flo</property>
 		<interpolation>
-			<entry><ind>0</ind><dep>55</dep></entry>
-			<entry><ind>0.5</ind><dep>0</dep></entry>
-			<entry><ind>1</ind><dep>-55</dep></entry>
+			<entry><ind> 5</ind><dep> 55</dep></entry>
+			<entry><ind>10</ind><dep>  0</dep></entry>
+			<entry><ind>15</ind><dep>-55</dep></entry>
 		</interpolation>
 		<axis>
 			<x>1</x>
@@ -1826,26 +1834,50 @@
 		<type>pick</type>
 		<object-name>ACPack1Btn1</object-name>
 		<object-name>ACPack1Btn2</object-name>
+		<object-name>ACPack1Btn1F</object-name>
+		<object-name>ACPack1Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>controls/pressurization/pack[0]/pack-on</property>
+				<property>/controls/pneumatic/switches/pack1</property>
 			</binding>
-
 		</action>
 	</animation>
+	
 	<animation>
-		<name>AC pack 1 on</name>
-		<type>textranslate</type>
-		<object-name>ACPack1Btn2</object-name>
-		<property>controls/pressurization/pack[0]/pack-on</property>
-		<factor>0.5</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
+		<type>select</type>
+		<object-name>ACPack1Btn1F</object-name>
+		<condition>
+			<or>
+				<greater-than>
+					<property>/systems/unused/unused-oh</property>
+					<value>150</value> <!-- I didn't model faults yet -->
+				</greater-than>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>ACPack1Btn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/pneumatic/switches/pack1</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
 	</animation>
 
 	<animation>
@@ -1857,10 +1889,10 @@
 		<object-name>Eng1BleedBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>/controls/bleed/OHP/bleed1</property>
+				<property>/controls/pneumatic/switches/bleed1</property>
 			</binding>
 		</action>
 	</animation>
@@ -1888,7 +1920,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>/controls/bleed/OHP/bleed1</property>
+					<property>/controls/pneumatic/switches/bleed1</property>
 					<value>0</value>
 				</equals>
 				<equals>
@@ -1908,10 +1940,10 @@
 		<object-name>APUBleedBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>/controls/bleed/OHP/bleedapu</property>
+				<property>/controls/pneumatic/switches/bleedapu</property>
 			</binding>
 		</action>
 	</animation>
@@ -1939,7 +1971,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>/controls/bleed/OHP/bleedapu</property>
+					<property>/controls/pneumatic/switches/bleedapu</property>
 					<value>1</value>
 				</equals>
 				<equals>
@@ -1959,10 +1991,10 @@
 		<object-name>Eng2BleedBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>/controls/bleed/OHP/bleed2</property>
+				<property>/controls/pneumatic/switches/bleed2</property>
 			</binding>
 		</action>
 	</animation>
@@ -1990,7 +2022,57 @@
 		<condition>
 			<or>
 				<equals>
-					<property>/controls/bleed/OHP/bleed2</property>
+					<property>/controls/pneumatic/switches/bleed2</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<name>Hot Air pick</name>
+		<type>pick</type>
+		<object-name>HotAirBtn</object-name>
+		<object-name>HotAirBtn1F</object-name>
+		<object-name>HotAirBtn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>/controls/pneumatic/switches/hot-air</property>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>HotAirBtn1F</object-name>
+		<condition>
+			<or>
+				<greater-than>
+					<property>/systems/unused/unused-oh</property>
+					<value>150</value> <!-- I didn't model faults yet -->
+				</greater-than>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>HotAirBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/pneumatic/switches/hot-air</property>
 					<value>0</value>
 				</equals>
 				<equals>
@@ -2006,26 +2088,82 @@
 		<type>pick</type>
 		<object-name>ACPack2Btn1</object-name>
 		<object-name>ACPack2Btn2</object-name>
+		<object-name>ACPack2Btn1F</object-name>
+		<object-name>ACPack2Btn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>controls/pressurization/pack[1]/pack-on</property>
+				<property>/controls/pneumatic/switches/pack2</property>
 			</binding>
-
 		</action>
 	</animation>
+	
 	<animation>
-		<name>AC pack 2 on</name>
-		<type>textranslate</type>
-		<object-name>ACPack2Btn2</object-name>
-		<property>controls/pressurization/pack[1]/pack-on</property>
-		<factor>0.5</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
+		<type>select</type>
+		<object-name>ACPack2Btn1F</object-name>
+		<condition>
+			<or>
+				<greater-than>
+					<property>/systems/unused/unused-oh</property>
+					<value>150</value> <!-- I didn't model faults yet -->
+				</greater-than>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>ACPack2Btn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/pneumatic/switches/pack2</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<name>RAM Air Turb switch pick</name>
+		<type>pick</type>
+		<object-name>RamAirBtn</object-name>
+		<object-name>RamAirBtn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>/controls/pneumatic/switches/ram-air</property>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>RamAirBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/pneumatic/switches/ram-air</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
 	</animation>
 
 	<!-- Anti-ice -->
@@ -2036,7 +2174,7 @@
 		<object-name>WingAntiIceBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/anti-ice/wing-heat</property>
@@ -2063,7 +2201,7 @@
 		<object-name>Eng1AntiIceBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/anti-ice/engine[0]/inlet-heat</property>
@@ -2090,7 +2228,7 @@
 		<object-name>Eng2AntiIceBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/anti-ice/engine[1]/inlet-heat</property>
@@ -2117,7 +2255,7 @@
 		<object-name>PrbWinHeatBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/anti-ice/pitot-heat</property>
@@ -2149,7 +2287,7 @@
 		<object-name>StrobeLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/lighting/strobe</property>
@@ -2184,7 +2322,7 @@
 		<object-name>BeaconLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/lighting/beacon</property>
@@ -2219,7 +2357,7 @@
 		<object-name>WingLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/lighting/wing-lights</property>
@@ -2254,7 +2392,7 @@
 		<object-name>NavLogoLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>controls/lighting/nav-lights-switch</property>
@@ -2294,7 +2432,7 @@
 		<object-name>LandingLtRSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/lighting/landing-lights[2]</property>
@@ -2329,7 +2467,7 @@
 		<object-name>NoseLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/lighting/landing-lights[1]</property>
@@ -2368,7 +2506,7 @@
 		<object-name>APUMasterBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>/controls/APU/master</property>
@@ -2419,10 +2557,14 @@
 		<object-name>APUStartBtn2O</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
-				<command>property-toggle</command>
-				<property>/controls/APU/start</property>
+				<command>nasal</command>
+				<script>
+				if (getprop("/controls/APU/master") == 1) {
+					setprop("/controls/APU/start", 1);
+				}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -2469,7 +2611,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>controls/lighting/overhead-panel-norm</property>
@@ -2480,7 +2622,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>controls/lighting/overhead-panel-norm</property>
@@ -2516,7 +2658,7 @@
 		<object-name>DomeLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>controls/lighting/dome-norm</property>
@@ -2554,7 +2696,7 @@
 		<object-name>AnnunciatorLtSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>/controls/switches/annun-test</property>
@@ -2595,7 +2737,7 @@
 		<object-name>SeatBeltSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/switches/seatbelt-sign</property>
@@ -2630,7 +2772,7 @@
 		<object-name>NoSmokingSwtch</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/switches/no-smoking-sign</property>
@@ -2672,7 +2814,7 @@
 		<object-name>Eng1ManStartBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/engines/engine[0]/starter-switch</property>
@@ -2699,7 +2841,7 @@
 		<object-name>Eng2ManStartBtn2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/engines/engine[1]/starter-switch</property>
@@ -2728,7 +2870,7 @@
 		<object-name>e1-pump</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>hydraulics/control/eng1-pump</property>
@@ -2744,7 +2886,7 @@
 		<object-name>e2-pump</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>hydraulics/control/eng2-pump</property>
@@ -2760,7 +2902,7 @@
 		<object-name>elec-pump</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>hydraulics/control/elec-pump</property>
@@ -2776,7 +2918,7 @@
 		<object-name>y-elec-pump</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>hydraulics/control/y-elec-pump</property>
@@ -2792,7 +2934,7 @@
 		<object-name>rat</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>hydraulics/control/rat-unlck</property>
@@ -2808,7 +2950,7 @@
 		<object-name>ptu</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>hydraulics/control/ptu</property>
@@ -2901,9 +3043,9 @@
 		<format type="string">%s</format>
 		<property>/controls/adirs/display/text</property>
 		<font type="string">LED-8.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.0095</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2927,9 +3069,9 @@
 		<format type="string">%2.1f</format>
 		<property>/systems/electrical/battery1-volts</property>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.007</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2953,9 +3095,9 @@
 		<format type="string">%2.1f</format>
 		<property>/systems/electrical/battery2-volts</property>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.007</character-size>
 		<font-resolution>
 			<width type="int">32</width>
diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac
index 1ea65786..de4cd103 100644
--- a/Models/Instruments/OHpanel/res/ohpanel.ac
+++ b/Models/Instruments/OHpanel/res/ohpanel.ac
@@ -7,7 +7,329 @@ MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157  amb 0.2 0.2 0.2  emis 1 1 1
 MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8  amb 1 1 1  emis 1 1 1  spec 0.5 0.5 0.5  shi 12  trans 0
 MATERIAL "Switch" rgb 0.678431 0.678431 0.678431  amb 0.678431 0.678431 0.678431  emis 0 0 0  spec 0 0 0  shi 32  trans 0.004
 OBJECT world
-kids 238
+kids 245
+OBJECT poly
+name "RamAirBtn2O"
+loc 0.0014462 -0.11785 0.08895
+data 8
+Cube.063
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.01 -0.0464 -0.0528
+-0.01 -0.0464 -0.0328
+-0.007 -0.0464 -0.0328
+-0.007 -0.0464 -0.0528
+-0.01 -0.0564 -0.0528
+-0.01 -0.0564 -0.0328
+-0.007 -0.0564 -0.0328
+-0.007 -0.0564 -0.0528
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.75
+7 0.5 0.5
+4 0.5 0.5
+0 0.5 0.75
+SURF 0x0
+mat 4
+refs 4
+6 0 0.5
+2 9.31321e-008 0.75
+1 9.31321e-008 0.75
+5 0 0.5
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.5
+3 0.5 0.75
+2 9.31321e-008 0.75
+6 0 0.5
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.5
+6 0 0.5
+5 0 0.5
+4 0.5 0.5
+kids 0
+OBJECT poly
+name "HotAirBtn2O"
+loc 0.0014462 -0.05255 -0.16815
+data 8
+Cube.062
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.01 -0.0464 0.0314
+-0.01 -0.0464 0.0514
+-0.007 -0.0464 0.0514
+-0.007 -0.0464 0.0314
+-0.01 -0.0564 0.0314
+-0.01 -0.0564 0.0514
+-0.007 -0.0564 0.0514
+-0.007 -0.0564 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.25
+7 0.5 0
+4 0.5 0
+0 0.5 0.25
+SURF 0x0
+mat 4
+refs 4
+6 0 1.19209e-007
+2 9.31321e-008 0.25
+1 9.31321e-008 0.25
+5 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+3 0.5 0.25
+2 9.31321e-008 0.25
+6 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+6 0 1.19209e-007
+5 0 1.19209e-007
+4 0.5 0
+kids 0
+OBJECT poly
+name "HotAirBtn1F"
+loc 0.0014462 -0.05255 -0.16815
+data 8
+Cube.061
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.007 -0.0464 0.0314
+-0.007 -0.0464 0.0514
+-0.01 -0.0464 0.0514
+-0.01 -0.0464 0.0314
+-0.007 -0.0364 0.0314
+-0.007 -0.0364 0.0514
+-0.01 -0.0364 0.0514
+-0.01 -0.0364 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.5
+7 0.5 0.5
+6 9.31321e-008 0.5
+5 9.31321e-008 0.5
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.25
+4 0.5 0.5
+5 9.31321e-008 0.5
+1 0 0.25
+SURF 0x0
+mat 4
+refs 4
+1 0 0.25
+5 9.31321e-008 0.5
+6 9.31321e-008 0.5
+2 0 0.25
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.5
+0 0.5 0.25
+3 0.5 0.25
+7 0.5 0.5
+kids 0
+OBJECT poly
+name "ACPack2Btn2O"
+loc 0.0014462 -0.08795 -0.16815
+data 8
+Cube.062
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.007 -0.0564 0.0314
+-0.007 -0.0564 0.0514
+-0.01 -0.0564 0.0514
+-0.01 -0.0564 0.0314
+-0.007 -0.0464 0.0314
+-0.007 -0.0464 0.0514
+-0.01 -0.0464 0.0514
+-0.01 -0.0464 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+1 0 1.19209e-007
+2 0 1.19209e-007
+3 0.5 0
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+4 0.5 0.25
+5 9.31321e-008 0.25
+1 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+1 0 1.19209e-007
+5 9.31321e-008 0.25
+6 9.31321e-008 0.25
+2 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0
+3 0.5 0
+7 0.5 0.25
+kids 0
+OBJECT poly
+name "ACPack2Btn1F"
+loc 0.0014462 -0.08795 -0.16815
+data 8
+Cube.061
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.01 -0.0364 0.0314
+-0.01 -0.0364 0.0514
+-0.007 -0.0364 0.0514
+-0.007 -0.0364 0.0314
+-0.01 -0.0464 0.0314
+-0.01 -0.0464 0.0514
+-0.007 -0.0464 0.0514
+-0.007 -0.0464 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.5
+7 0.5 0.25
+4 0.5 0.25
+0 0.5 0.5
+SURF 0x0
+mat 4
+refs 4
+6 0 0.25
+2 9.31321e-008 0.5
+1 9.31321e-008 0.5
+5 0 0.25
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.25
+3 0.5 0.5
+2 9.31321e-008 0.5
+6 0 0.25
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.5
+0 0.5 0.5
+1 9.31321e-008 0.5
+2 9.31321e-008 0.5
+kids 0
+OBJECT poly
+name "ACPack1Btn2O"
+loc 0.0014462 -0.09065 0.0848501
+data 8
+Cube.062
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.01 -0.0464 0.0314
+-0.01 -0.0464 0.0514
+-0.007 -0.0464 0.0514
+-0.007 -0.0464 0.0314
+-0.01 -0.0564 0.0314
+-0.01 -0.0564 0.0514
+-0.007 -0.0564 0.0514
+-0.007 -0.0564 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.25
+7 0.5 0
+4 0.5 0
+0 0.5 0.25
+SURF 0x0
+mat 4
+refs 4
+6 0 1.19209e-007
+2 9.31321e-008 0.25
+1 9.31321e-008 0.25
+5 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+3 0.5 0.25
+2 9.31321e-008 0.25
+6 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+6 0 1.19209e-007
+5 0 1.19209e-007
+4 0.5 0
+kids 0
+OBJECT poly
+name "ACPack1Btn1F"
+loc 0.0014462 -0.09065 0.0848501
+data 8
+Cube.061
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.007 -0.0464 0.0314
+-0.007 -0.0464 0.0514
+-0.01 -0.0464 0.0514
+-0.01 -0.0464 0.0314
+-0.007 -0.0364 0.0314
+-0.007 -0.0364 0.0514
+-0.01 -0.0364 0.0514
+-0.01 -0.0364 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.5
+7 0.5 0.5
+6 9.31321e-008 0.5
+5 9.31321e-008 0.5
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.25
+4 0.5 0.5
+5 9.31321e-008 0.5
+1 0 0.25
+SURF 0x0
+mat 4
+refs 4
+1 0 0.25
+5 9.31321e-008 0.5
+6 9.31321e-008 0.5
+2 0 0.25
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.5
+0 0.5 0.25
+3 0.5 0.25
+7 0.5 0.5
+kids 0
 OBJECT poly
 name "APUFireTst"
 loc 0.00144693 0.411855 0.015845
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index d51736fd..e2de8936 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -268,4 +268,4 @@ var update_electrical = func {
 	master_elec();
 }
 
-var elec_timer = maketimer(0.5, update_electrical);
+var elec_timer = maketimer(0.2, update_electrical);
diff --git a/Nasal/engines.nas b/Nasal/engines.nas
index c0d1e4df..ac06f0a9 100644
--- a/Nasal/engines.nas
+++ b/Nasal/engines.nas
@@ -48,7 +48,7 @@ setlistener("/controls/engines/engine[0]/cutoff-switch", func {
 });
 
 var start_one_check = func {
-	if ((getprop("/controls/engines/engine-start-switch") == 2) and (getprop("/controls/bleed/OHP/bleedapu") == 1) and (getprop("/systems/apu/rpm") >= 98)) {
+	if ((getprop("/controls/engines/engine-start-switch") == 2) and (getprop("/systems/pneumatic/total-psi") >= 28)) {
 		auto_start_one();
 	}
 }
@@ -65,7 +65,7 @@ setlistener("/controls/engines/engine[1]/cutoff-switch", func {
 });
 
 var start_two_check = func {
-	if ((getprop("/controls/engines/engine-start-switch") == 2) and (getprop("/controls/bleed/OHP/bleedapu") == 1) and (getprop("/systems/apu/rpm") >= 98)) {
+	if ((getprop("/controls/engines/engine-start-switch") == 2) and (getprop("/systems/pneumatic/total-psi") >= 28)) {
 		auto_start_two();
 	}
 }
@@ -166,21 +166,33 @@ var apu_stop = func {
 setlistener("/controls/engines/engine-start-switch", func {
 	if ((getprop("/controls/engines/engine-start-switch") == 0) or (getprop("/controls/engines/engine-start-switch") == 1)) {
 		if (getprop("/controls/engines/engine[0]/state") == 1) {
-			eng_one_stop();
+			setprop("/controls/engines/engine[0]/starter", 0);
+			setprop("/controls/engines/engine[0]/cutoff", 1);
+			setprop("/engines/engine[0]/state", 0);
+			interpolate(engines[0].getNode("egt-actual"), 0, egt_shutdown_time);
 		}
 		if (getprop("/controls/engines/engine[1]/state") == 1) {
-			eng_two_stop();
+			setprop("/controls/engines/engine[1]/starter", 0);
+			setprop("/controls/engines/engine[1]/cutoff", 1);
+			setprop("/engines/engine[1]/state", 0);
+			interpolate(engines[1].getNode("egt-actual"), 0, egt_shutdown_time);
 		}
 	}
 });
 
-setlistener("/controls/bleed/OHP/bleedapu", func {
-	if (getprop("/controls/bleed/OHP/bleedapu") == 0) {
-		if (getprop("/controls/engines/engine[0]/state") == 1) {
-			eng_one_stop();
+setlistener("/systems/pneumatic/start-psi", func {
+	if (getprop("/systems/pneumatic/total-psi") < 12) {
+		if (getprop("/engines/engine[0]/state") == 1) {
+			setprop("/controls/engines/engine[0]/starter", 0);
+			setprop("/controls/engines/engine[0]/cutoff", 1);
+			setprop("/engines/engine[0]/state", 0);
+			interpolate(engines[0].getNode("egt-actual"), 0, egt_shutdown_time);
 		}
-		if (getprop("/controls/engines/engine[1]/state") == 1) {
-			eng_two_stop();
+		if (getprop("/engines/engine[1]/state") == 1) {
+			setprop("/controls/engines/engine[1]/starter", 0);
+			setprop("/controls/engines/engine[1]/cutoff", 1);
+			setprop("/engines/engine[1]/state", 0);
+			interpolate(engines[1].getNode("egt-actual"), 0, egt_shutdown_time);
 		}
 	}
 });
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index 34624161..0e511078 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -40,7 +40,7 @@ var pitch_input = func {
 	var elev = getprop("/controls/flight/elevator");
 	
 	if (getprop("/it-fbw/law") == 0) {
-		if (getprop("/position/gear-agl-ft") <= 30) {
+		if (getprop("/position/gear-agl-ft") <= 15) {
 			setprop("/it-fbw/pitch-lim-max", "15");
 			setprop("/it-fbw/pitch-lim-min", "-5");
 		} else {
diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas
index 76ef6ede..fdd22986 100644
--- a/Nasal/pneumatics.nas
+++ b/Nasal/pneumatics.nas
@@ -1,39 +1,28 @@
 # A320 Pneumatics System
-# Jonathan Redpath (legoboyvdlp) and Joshua Davidson (it0uchpods)
+# Joshua Davidson (it0uchpods)
 
 #############
 # Init Vars #
 #############
 
-# 7th stage of HP compressor is where the bleed is normally extracted at 44 PSI +- 4 but at low N2 10th stage is selected to provide 36 +- 4 psi
 var pneumatics_init = func {
-	setprop("/systems/pneumatic/tempspsi/eng1/bleedvalvepsi", 0);
-	setprop("/systems/pneumatic/tempspsi/eng1/bleedvalvetemp", 0);
-	setprop("/systems/pneumatic/tempspsi/eng2/bleedvalvepsi", 0);
-	setprop("/systems/pneumatic/tempspsi/eng2/bleedvalvetemp", 0);
-	setprop("/systems/pneumatic/tempspsi/eng1/downstreamfavtemp", 0);
-	setprop("/systems/pneumatic/tempspsi/eng2/downstreamfavtemp", 0);
-	setprop("/systems/pneumatic/valves/xbleed", 0);
-	setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0);
-	setprop("/systems/pneumatic/valves/eng1/OPRESSvalve", 0);
-	setprop("/systems/pneumatic/valves/eng1/bleedengsrc", "7");
-	setprop("/systems/pneumatic/valves/eng1/fav", 0);
-	setprop("/systems/pneumatic/valves/eng2/fav", 0);
-	setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0);
-	setprop("/systems/pneumatic/valves/eng2/OPRESSvalve", 0);
-	setprop("/systems/pneumatic/valves/eng2/bleedengsrc", "7");
-	setprop("/systems/pneumatic/valves/eng2/fav", 0);
-	setprop("/systems/pneumatic/valves/apubleed", 0);
-	setprop("/systems/pneumatic/valves/eng1/startvalve", 0);
-	setprop("/systems/pneumatic/valves/eng2/startvalve", 0);
-	setprop("/controls/bleed/ground", 0);
-	setprop("/controls/bleed/OHP/pack1", 0);
-	setprop("/controls/bleed/OHP/pack2", 0);
-	setprop("/controls/bleed/OHP/bleed1", 0);
-	setprop("/controls/bleed/OHP/bleed2", 0);
-	setprop("/controls/bleed/OHP/xbleed", 0);
-	setprop("/controls/bleed/OHP/bleedapu", 0);
-	setprop("/controls/bleed/OHP/ramair", 0);
+	setprop("/controls/pneumatic/switches/bleed1", 0);
+	setprop("/controls/pneumatic/switches/bleed2", 0);
+	setprop("/controls/pneumatic/switches/bleedapu", 0);
+	setprop("/controls/pneumatic/switches/pack1", 0);
+	setprop("/controls/pneumatic/switches/pack2", 0);
+	setprop("/controls/pneumatic/switches/hot-air", 0);
+	setprop("/controls/pneumatic/switches/ram-air", 0);
+	setprop("/controls/pneumatic/switches/pack-flo", 10); # LO: 5, NORM: 10, HI: 15
+	setprop("/controls/pneumatic/switches/xbleed", 1);
+	setprop("/systems/pneumatic/bleed1", 0);
+	setprop("/systems/pneumatic/bleed2", 0);
+	setprop("/systems/pneumatic/bleedapu", 0);
+	setprop("/systems/pneumatic/total-psi", 0);
+	setprop("/systems/pneumatic/start-psi", 0);
+	setprop("/systems/pneumatic/pack1", 0);
+	setprop("/systems/pneumatic/pack2", 0);
+	setprop("/systems/pneumatic/startpsir", 0);
 	pneu_timer.start();
 }
 
@@ -42,59 +31,62 @@ var pneumatics_init = func {
 #######################
 
 var master_pneu = func {
-	var bleed1 = getprop("/controls/bleed/OHP/bleed1");
-	var bleed2 = getprop("/controls/bleed/OHP/bleed2");
-	var apubleedsw = getprop("/controls/bleed/OHP/bleedapu");
-	var apubleed = getprop("/systems/pneumatic/valves/apubleed");
-	var opress1 = getprop("/systems/pneumatic/valves/eng1/OPRESSvalve");
-	var bleedohp1 = getprop("/controls/bleed/OHP/bleed1");
-	var eng1valveopen = getprop("/systems/pneumatic/valves/eng1/startvalve");
-	var opress2 = getprop("/systems/pneumatic/valves/eng2/OPRESSvalve");
-	var bleedohp2 = getprop("/controls/bleed/OHP/bleed2");
-	var eng2valveopen = getprop("/systems/pneumatic/valves/eng2/startvalve");
+	var bleed1_sw = getprop("/controls/pneumatic/switches/bleed1");
+	var bleed2_sw = getprop("/controls/pneumatic/switches/bleed2");
+	var bleedapu_sw = getprop("/controls/pneumatic/switches/bleedapu");
+	var pack1_sw = getprop("/controls/pneumatic/switches/pack1");
+	var pack2_sw = getprop("/controls/pneumatic/switches/pack2");
+	var hot_air_sw = getprop("/controls/pneumatic/switches/hot-air");
+	var ram_air_sw	= getprop("/controls/pneumatic/switches/ram-air");
+	var pack_flo_sw = getprop("/controls/pneumatic/switches/pack-flo", 1);
+	var xbleed_sw = getprop("/controls/pneumatic/switches/xbleed");
+	var pack1 = getprop("/systems/pneumatic/pack1");
+	var pack2 = getprop("/systems/pneumatic/pack2");
+	var rpmapu = getprop("/systems/apu/rpm");
+	var stateL = getprop("/engines/engine[0]/state");
+	var stateR = getprop("/engines/engine[1]/state");
 	
-	if (bleed1) {
-		setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 1);
+	# Air Sources/PSI
+	if (rpmapu >= 94.9 and bleedapu_sw) {
+		setprop("/systems/pneumatic/bleedapu", 34);
 	} else {
-		setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0);
-	}
-
-	if (bleed2) {
-		setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 1);
-	} else {
-		setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0);
-	}
-
-	if (opress1 or apubleed or !bleedohp1 or eng1valveopen) {
-		setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0);
+		setprop("/systems/pneumatic/bleedapu", 0);
 	}
 	
-	if (opress2 or apubleed or !bleedohp2 or eng2valveopen) {
-		setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0);
-	}
-
-	if (apubleedsw) {
-		apubleedtimer.start();
+	if (stateL == 3 and bleed1_sw) {
+		setprop("/systems/pneumatic/bleed1", 31);
 	} else {
-		apubleedtimer.stop();
-		setprop("/systems/pneumatic/valves/xbleed", 0);
-		setprop("/systems/pneumatic/valves/apubleed", 0);
+		setprop("/systems/pneumatic/bleed1", 0);
 	}
+	
+	if (stateR == 3 and bleed2_sw) {
+		setprop("/systems/pneumatic/bleed2", 32);
+	} else {
+		setprop("/systems/pneumatic/bleed2", 0);
+	}
+	
+	var bleed1 = getprop("/systems/pneumatic/bleed1");
+	var bleed2 = getprop("/systems/pneumatic/bleed2");
+	var bleedapu = getprop("/systems/pneumatic/bleedapu");
+	
+	if ( stateL == 1 or stateR == 1) {
+		setprop("/systems/pneumatic/start-psi", 18);
+	} else {
+		setprop("/systems/pneumatic/start-psi", 0);
+	}
+	
+	var start_psi = getprop("/systems/pneumatic/start-psi");
+	
+	if ((bleed1 + bleed2 + bleedapu) > 42) {
+		setprop("/systems/pneumatic/total-psi", 42);
+	} else {
+		var total_psi_calc = ((bleed1 + bleed2 + bleedapu) - start_psi); # - pack_psi;
+		setprop("/systems/pneumatic/total-psi", total_psi_calc);
+	}
+	
+	var total_psi = getprop("/systems/pneumatic/total-psi");
 }
 
-var apubleedtimer = maketimer(0.5, func {
-	var APU = getprop("/systems/apu/rpm");
-	if (APU > 94.9) {
-		apubleedtimer.stop();
-		setprop("/systems/pneumatic/valves/xbleed", 1);
-		setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0);
-		setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0);
-		setprop("/controls/bleed/OHP/bleed1", 0);
-		setprop("/controls/bleed/OHP/bleed2", 0);
-		setprop("/systems/pneumatic/valves/apubleed", 1);
-	}
-});
-
 ###################
 # Update Function #
 ###################
@@ -103,4 +95,4 @@ var update_pneumatic = func {
 	master_pneu();
 }
 
-var pneu_timer = maketimer(0.5, update_pneumatic);
+var pneu_timer = maketimer(0.2, update_pneumatic);