From 68505d69d130536568df0fe5c45ff9bd3f4e5e15 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 9 Jun 2017 18:10:13 -0400
Subject: [PATCH] A3XX: Seperate Aerodynamics, Improve Drag, Fix EGT Bug

---
 A319-100-CFM.xml              | 399 ++-------------------------------
 A319-100-IAE.xml              | 399 ++-------------------------------
 A320-200-CFM.xml              | 399 ++-------------------------------
 A320-200-IAE.xml              | 401 ++--------------------------------
 A321-200-CFM.xml              | 399 ++-------------------------------
 A321-200-IAE.xml              | 401 ++--------------------------------
 Systems/a319-aerodynamics.xml | 371 +++++++++++++++++++++++++++++++
 Systems/a320-aerodynamics.xml | 371 +++++++++++++++++++++++++++++++
 Systems/a321-aerodynamics.xml | 371 +++++++++++++++++++++++++++++++
 Systems/fadec-cfm.xml         |   7 +-
 Systems/fadec-iae.xml         |   9 +-
 11 files changed, 1216 insertions(+), 2311 deletions(-)
 create mode 100644 Systems/a319-aerodynamics.xml
 create mode 100644 Systems/a320-aerodynamics.xml
 create mode 100644 Systems/a321-aerodynamics.xml

diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml
index 4e70c01a..2a887500 100644
--- a/A319-100-CFM.xml
+++ b/A319-100-CFM.xml
@@ -581,389 +581,20 @@ YAW MOI_________3950000______23089847_______24848934
 
 <flight_control name="none"/>
 
-	<aerodynamics>
+<aerodynamics file="Systems/a319-aerodynamics.xml" />
 
-		<axis name="LIFT">
-
-			<function name="aero/force/Lift_alpha">
-				<description>Lift due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-0.20 -0.900
-							 0.00  0.103
-							 0.15  1.600
-							 0.23  1.900
-							 0.60  1.000
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_flap">
-				<description>Delta Lift due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
-						<tableData>
-							0.000  0.00000
-							0.290  0.00250
-							0.596  0.00700
-							0.645  0.01300
-							1.000  0.01700
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_slats">
-				<description>Delta Lift due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/slat-pos-deg</property>
-					<value> 0.01000 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_speedbrake">
-				<description>Delta Lift due to speedbrake</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.15</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_elevator">
-				<description>Lift due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<value>0.04</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="DRAG">
-
-			<function name="aero/force/Drag_basic">
-				<description>Drag at zero lift</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-1.57    1.260
-							-0.26    0.018
-							 0.00    0.008
-							 0.26    0.017
-							 1.57    1.320
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_induced">
-				<description>Induced drag</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/cl-squared</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_mach">
-				<description>Drag due to mach</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							 0.00      0.000
-							 0.79      0.000
-							 1.10      0.023
-							 1.80      0.015
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_flap">
-				<description>Drag due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00090 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_slats">
-				<description>Drag due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_gear">
-				<description>Drag due to gear</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>gear/gear-pos-norm</property>
-					<value>0.025</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_speedbrake">
-				<description>Drag due to speedbrakes</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_beta">
-				<description>Drag due to sideslip</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/beta-rad</independentVar>
-						<tableData>
-							-1.57    1.230
-							-0.26    0.050
-							 0.00    0.000
-							 0.26    0.050
-							 1.57    1.230
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_elevator">
-				<description>Drag due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<abs><property>fcs/elevator-pos-norm</property></abs>
-					<value>0.035</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="SIDE">
-
-			<function name="aero/force/Side_beta">
-				<description>Side force due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/beta-rad</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="ROLL">
-
-			<function name="aero/moment/Roll_beta">
-				<description>Roll moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>-0.1</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_damp">
-				<description>Roll moment due to roll rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/p-aero-rad_sec</property>
-					<value>-0.95</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_yaw">
-				<description>Roll moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>0.005</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_aileron">
-				<description>Roll moment due to aileron</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0.20</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_rudder">
-				<description>Roll moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>0.003</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="PITCH">
-
-			<function name="aero/moment/Pitch_alpha">
-				<description>Pitch moment due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/alpha-rad</property>
-					<value>-0.6</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_elevator">
-				<description>Pitch moment due to elevator</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							0.0     -1.900
-							2.0     -0.900
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_damp">
-				<description>Pitch moment due to pitch rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>velocities/q-aero-rad_sec</property>
-					<value>-140</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_alphadot">
-				<description>Pitch moment due to alpha rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>aero/alphadot-rad_sec</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="YAW">
-
-			<function name="aero/moment/Yaw_beta">
-				<description>Yaw moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>0.12</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_damp">
-				<description>Yaw moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_rudder">
-				<description>Yaw moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_aileron">
-				<description>Adverse yaw</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0</value>
-				</product>
-			</function>
-
-		</axis>
-
-	</aerodynamics>
-
-	<external_reactions>
-		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
-			</location>
-			<direction>
-				<x>1</x>
-				<y>0</y>
-				<z>0</z>
-			</direction>
-		</force>
-	</external_reactions>
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
 </fdm_config>
diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index 80707b55..8e54cc0c 100644
--- a/A319-100-IAE.xml
+++ b/A319-100-IAE.xml
@@ -581,389 +581,20 @@ YAW MOI_________3950000______23089847_______24848934
 
 <flight_control name="none"/>
 
-	<aerodynamics>
+<aerodynamics file="Systems/a319-aerodynamics.xml" />
 
-		<axis name="LIFT">
-
-			<function name="aero/force/Lift_alpha">
-				<description>Lift due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-0.20 -0.900
-							 0.00  0.103
-							 0.15  1.600
-							 0.23  1.900
-							 0.60  1.000
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_flap">
-				<description>Delta Lift due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
-						<tableData>
-							0.000  0.00000
-							0.290  0.00250
-							0.596  0.00700
-							0.645  0.01300
-							1.000  0.01700
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_slats">
-				<description>Delta Lift due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/slat-pos-deg</property>
-					<value> 0.01000 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_speedbrake">
-				<description>Delta Lift due to speedbrake</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.15</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_elevator">
-				<description>Lift due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<value>0.04</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="DRAG">
-
-			<function name="aero/force/Drag_basic">
-				<description>Drag at zero lift</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-1.57    1.260
-							-0.26    0.018
-							 0.00    0.008
-							 0.26    0.017
-							 1.57    1.320
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_induced">
-				<description>Induced drag</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/cl-squared</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_mach">
-				<description>Drag due to mach</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							 0.00      0.000
-							 0.79      0.000
-							 1.10      0.023
-							 1.80      0.015
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_flap">
-				<description>Drag due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00090 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_slats">
-				<description>Drag due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_gear">
-				<description>Drag due to gear</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>gear/gear-pos-norm</property>
-					<value>0.025</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_speedbrake">
-				<description>Drag due to speedbrakes</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_beta">
-				<description>Drag due to sideslip</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/beta-rad</independentVar>
-						<tableData>
-							-1.57    1.230
-							-0.26    0.050
-							 0.00    0.000
-							 0.26    0.050
-							 1.57    1.230
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_elevator">
-				<description>Drag due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<abs><property>fcs/elevator-pos-norm</property></abs>
-					<value>0.035</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="SIDE">
-
-			<function name="aero/force/Side_beta">
-				<description>Side force due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/beta-rad</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="ROLL">
-
-			<function name="aero/moment/Roll_beta">
-				<description>Roll moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>-0.1</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_damp">
-				<description>Roll moment due to roll rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/p-aero-rad_sec</property>
-					<value>-0.95</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_yaw">
-				<description>Roll moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>0.005</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_aileron">
-				<description>Roll moment due to aileron</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0.20</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_rudder">
-				<description>Roll moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>0.003</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="PITCH">
-
-			<function name="aero/moment/Pitch_alpha">
-				<description>Pitch moment due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/alpha-rad</property>
-					<value>-0.6</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_elevator">
-				<description>Pitch moment due to elevator</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							0.0     -1.900
-							2.0     -0.900
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_damp">
-				<description>Pitch moment due to pitch rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>velocities/q-aero-rad_sec</property>
-					<value>-140</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_alphadot">
-				<description>Pitch moment due to alpha rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>aero/alphadot-rad_sec</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="YAW">
-
-			<function name="aero/moment/Yaw_beta">
-				<description>Yaw moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>0.12</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_damp">
-				<description>Yaw moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_rudder">
-				<description>Yaw moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_aileron">
-				<description>Adverse yaw</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0</value>
-				</product>
-			</function>
-
-		</axis>
-
-	</aerodynamics>
-
-	<external_reactions>
-		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
-			</location>
-			<direction>
-				<x>1</x>
-				<y>0</y>
-				<z>0</z>
-			</direction>
-		</force>
-	</external_reactions>
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
 </fdm_config>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index a24fc369..a84a9ba0 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -581,389 +581,20 @@ YAW MOI_________3950000______23089847_______24848934
 
 <flight_control name="none"/>
 
-	<aerodynamics>
+<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
-		<axis name="LIFT">
-
-			<function name="aero/force/Lift_alpha">
-				<description>Lift due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-0.20 -0.900
-							 0.00  0.103
-							 0.15  1.600
-							 0.23  1.900
-							 0.60  1.000
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_flap">
-				<description>Delta Lift due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
-						<tableData>
-							0.000  0.00000
-							0.290  0.00250
-							0.596  0.00700
-							0.645  0.01300
-							1.000  0.01700
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_slats">
-				<description>Delta Lift due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/slat-pos-deg</property>
-					<value> 0.01000 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_speedbrake">
-				<description>Delta Lift due to speedbrake</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.15</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_elevator">
-				<description>Lift due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<value>0.04</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="DRAG">
-
-			<function name="aero/force/Drag_basic">
-				<description>Drag at zero lift</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-1.57    1.260
-							-0.26    0.018
-							 0.00    0.008
-							 0.26    0.017
-							 1.57    1.320
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_induced">
-				<description>Induced drag</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/cl-squared</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_mach">
-				<description>Drag due to mach</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							 0.00      0.000
-							 0.79      0.000
-							 1.10      0.023
-							 1.80      0.015
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_flap">
-				<description>Drag due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00090 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_slats">
-				<description>Drag due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_gear">
-				<description>Drag due to gear</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>gear/gear-pos-norm</property>
-					<value>0.025</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_speedbrake">
-				<description>Drag due to speedbrakes</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_beta">
-				<description>Drag due to sideslip</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/beta-rad</independentVar>
-						<tableData>
-							-1.57    1.230
-							-0.26    0.050
-							 0.00    0.000
-							 0.26    0.050
-							 1.57    1.230
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_elevator">
-				<description>Drag due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<abs><property>fcs/elevator-pos-norm</property></abs>
-					<value>0.035</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="SIDE">
-
-			<function name="aero/force/Side_beta">
-				<description>Side force due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/beta-rad</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="ROLL">
-
-			<function name="aero/moment/Roll_beta">
-				<description>Roll moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>-0.1</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_damp">
-				<description>Roll moment due to roll rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/p-aero-rad_sec</property>
-					<value>-0.95</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_yaw">
-				<description>Roll moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>0.005</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_aileron">
-				<description>Roll moment due to aileron</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0.20</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_rudder">
-				<description>Roll moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>0.003</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="PITCH">
-
-			<function name="aero/moment/Pitch_alpha">
-				<description>Pitch moment due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/alpha-rad</property>
-					<value>-0.6</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_elevator">
-				<description>Pitch moment due to elevator</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							0.0     -1.900
-							2.0     -0.900
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_damp">
-				<description>Pitch moment due to pitch rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>velocities/q-aero-rad_sec</property>
-					<value>-140</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_alphadot">
-				<description>Pitch moment due to alpha rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>aero/alphadot-rad_sec</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="YAW">
-
-			<function name="aero/moment/Yaw_beta">
-				<description>Yaw moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>0.12</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_damp">
-				<description>Yaw moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_rudder">
-				<description>Yaw moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_aileron">
-				<description>Adverse yaw</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0</value>
-				</product>
-			</function>
-
-		</axis>
-
-	</aerodynamics>
-
-	<external_reactions>
-		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
-			</location>
-			<direction>
-				<x>1</x>
-				<y>0</y>
-				<z>0</z>
-			</direction>
-		</force>
-	</external_reactions>
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
 </fdm_config>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index ab20ec08..371cd4d0 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -580,390 +580,21 @@ YAW MOI_________3950000______23089847_______24848934
 <system file="fcs" />
 
 <flight_control name="none"/>
+	
+<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
-	<aerodynamics>
-
-		<axis name="LIFT">
-
-			<function name="aero/force/Lift_alpha">
-				<description>Lift due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-0.20 -0.900
-							 0.00  0.103
-							 0.15  1.600
-							 0.23  1.900
-							 0.60  1.000
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_flap">
-				<description>Delta Lift due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
-						<tableData>
-							0.000  0.00000
-							0.290  0.00250
-							0.596  0.00700
-							0.645  0.01300
-							1.000  0.01700
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_slats">
-				<description>Delta Lift due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/slat-pos-deg</property>
-					<value> 0.01000 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_speedbrake">
-				<description>Delta Lift due to speedbrake</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.15</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_elevator">
-				<description>Lift due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<value>0.04</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="DRAG">
-
-			<function name="aero/force/Drag_basic">
-				<description>Drag at zero lift</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-1.57    1.260
-							-0.26    0.018
-							 0.00    0.008
-							 0.26    0.017
-							 1.57    1.320
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_induced">
-				<description>Induced drag</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/cl-squared</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_mach">
-				<description>Drag due to mach</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							 0.00      0.000
-							 0.79      0.000
-							 1.10      0.023
-							 1.80      0.015
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_flap">
-				<description>Drag due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00090 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_slats">
-				<description>Drag due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_gear">
-				<description>Drag due to gear</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>gear/gear-pos-norm</property>
-					<value>0.025</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_speedbrake">
-				<description>Drag due to speedbrakes</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_beta">
-				<description>Drag due to sideslip</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/beta-rad</independentVar>
-						<tableData>
-							-1.57    1.230
-							-0.26    0.050
-							 0.00    0.000
-							 0.26    0.050
-							 1.57    1.230
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_elevator">
-				<description>Drag due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<abs><property>fcs/elevator-pos-norm</property></abs>
-					<value>0.035</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="SIDE">
-
-			<function name="aero/force/Side_beta">
-				<description>Side force due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/beta-rad</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="ROLL">
-
-			<function name="aero/moment/Roll_beta">
-				<description>Roll moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>-0.1</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_damp">
-				<description>Roll moment due to roll rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/p-aero-rad_sec</property>
-					<value>-0.95</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_yaw">
-				<description>Roll moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>0.005</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_aileron">
-				<description>Roll moment due to aileron</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0.20</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_rudder">
-				<description>Roll moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>0.003</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="PITCH">
-
-			<function name="aero/moment/Pitch_alpha">
-				<description>Pitch moment due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/alpha-rad</property>
-					<value>-0.6</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_elevator">
-				<description>Pitch moment due to elevator</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							0.0     -1.900
-							2.0     -0.900
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_damp">
-				<description>Pitch moment due to pitch rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>velocities/q-aero-rad_sec</property>
-					<value>-140</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_alphadot">
-				<description>Pitch moment due to alpha rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>aero/alphadot-rad_sec</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="YAW">
-
-			<function name="aero/moment/Yaw_beta">
-				<description>Yaw moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>0.12</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_damp">
-				<description>Yaw moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_rudder">
-				<description>Yaw moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_aileron">
-				<description>Adverse yaw</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0</value>
-				</product>
-			</function>
-
-		</axis>
-
-	</aerodynamics>
-
-	<external_reactions>
-		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
-			</location>
-			<direction>
-				<x>1</x>
-				<y>0</y>
-				<z>0</z>
-			</direction>
-		</force>
-	</external_reactions>
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
 </fdm_config>
diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml
index d8dbab47..324e2a2d 100644
--- a/A321-200-CFM.xml
+++ b/A321-200-CFM.xml
@@ -581,389 +581,20 @@ YAW MOI_________3950000______23089847_______24848934
 
 <flight_control name="none"/>
 
-	<aerodynamics>
+<aerodynamics file="Systems/a321-aerodynamics.xml" />
 
-		<axis name="LIFT">
-
-			<function name="aero/force/Lift_alpha">
-				<description>Lift due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-0.20 -0.900
-							 0.00  0.103
-							 0.15  1.600
-							 0.23  1.900
-							 0.60  1.000
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_flap">
-				<description>Delta Lift due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
-						<tableData>
-							0.000  0.00000
-							0.290  0.00250
-							0.596  0.00700
-							0.645  0.01300
-							1.000  0.01700
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_slats">
-				<description>Delta Lift due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/slat-pos-deg</property>
-					<value> 0.01000 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_speedbrake">
-				<description>Delta Lift due to speedbrake</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.15</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_elevator">
-				<description>Lift due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<value>0.04</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="DRAG">
-
-			<function name="aero/force/Drag_basic">
-				<description>Drag at zero lift</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-1.57    1.260
-							-0.26    0.018
-							 0.00    0.008
-							 0.26    0.017
-							 1.57    1.320
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_induced">
-				<description>Induced drag</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/cl-squared</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_mach">
-				<description>Drag due to mach</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							 0.00      0.000
-							 0.79      0.000
-							 1.10      0.023
-							 1.80      0.015
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_flap">
-				<description>Drag due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00090 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_slats">
-				<description>Drag due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_gear">
-				<description>Drag due to gear</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>gear/gear-pos-norm</property>
-					<value>0.025</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_speedbrake">
-				<description>Drag due to speedbrakes</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_beta">
-				<description>Drag due to sideslip</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/beta-rad</independentVar>
-						<tableData>
-							-1.57    1.230
-							-0.26    0.050
-							 0.00    0.000
-							 0.26    0.050
-							 1.57    1.230
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_elevator">
-				<description>Drag due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<abs><property>fcs/elevator-pos-norm</property></abs>
-					<value>0.035</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="SIDE">
-
-			<function name="aero/force/Side_beta">
-				<description>Side force due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/beta-rad</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="ROLL">
-
-			<function name="aero/moment/Roll_beta">
-				<description>Roll moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>-0.1</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_damp">
-				<description>Roll moment due to roll rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/p-aero-rad_sec</property>
-					<value>-0.95</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_yaw">
-				<description>Roll moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>0.005</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_aileron">
-				<description>Roll moment due to aileron</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0.20</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_rudder">
-				<description>Roll moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>0.003</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="PITCH">
-
-			<function name="aero/moment/Pitch_alpha">
-				<description>Pitch moment due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/alpha-rad</property>
-					<value>-0.6</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_elevator">
-				<description>Pitch moment due to elevator</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							0.0     -1.900
-							2.0     -0.900
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_damp">
-				<description>Pitch moment due to pitch rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>velocities/q-aero-rad_sec</property>
-					<value>-140</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_alphadot">
-				<description>Pitch moment due to alpha rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>aero/alphadot-rad_sec</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="YAW">
-
-			<function name="aero/moment/Yaw_beta">
-				<description>Yaw moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>0.12</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_damp">
-				<description>Yaw moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_rudder">
-				<description>Yaw moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_aileron">
-				<description>Adverse yaw</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0</value>
-				</product>
-			</function>
-
-		</axis>
-
-	</aerodynamics>
-
-	<external_reactions>
-		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
-			</location>
-			<direction>
-				<x>1</x>
-				<y>0</y>
-				<z>0</z>
-			</direction>
-		</force>
-	</external_reactions>
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
 </fdm_config>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index d72b47ee..3b84756d 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -579,391 +579,22 @@ YAW MOI_________3950000______23089847_______24848934
 <system file="fmgc" />
 <system file="fcs" />
 
-<flight_control name="none"/>
+<flight_control name="none" />
 
-	<aerodynamics>
+<aerodynamics file="Systems/a321-aerodynamics.xml" />
 
-		<axis name="LIFT">
-
-			<function name="aero/force/Lift_alpha">
-				<description>Lift due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-0.20 -0.900
-							 0.00  0.103
-							 0.15  1.600
-							 0.23  1.900
-							 0.60  1.000
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_flap">
-				<description>Delta Lift due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
-						<tableData>
-							0.000  0.00000
-							0.290  0.00250
-							0.596  0.00700
-							0.645  0.01300
-							1.000  0.01700
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_slats">
-				<description>Delta Lift due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/slat-pos-deg</property>
-					<value> 0.01000 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_speedbrake">
-				<description>Delta Lift due to speedbrake</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.15</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Lift_elevator">
-				<description>Lift due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<value>0.04</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="DRAG">
-
-			<function name="aero/force/Drag_basic">
-				<description>Drag at zero lift</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/alpha-rad</independentVar>
-						<tableData>
-							-1.57    1.260
-							-0.26    0.018
-							 0.00    0.008
-							 0.26    0.017
-							 1.57    1.320
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_induced">
-				<description>Induced drag</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/cl-squared</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_mach">
-				<description>Drag due to mach</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							 0.00      0.000
-							 0.79      0.000
-							 1.10      0.023
-							 1.80      0.015
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_flap">
-				<description>Drag due to flaps</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00090 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_slats">
-				<description>Drag due to slats</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_gear">
-				<description>Drag due to gear</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>gear/gear-pos-norm</property>
-					<value>0.025</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_speedbrake">
-				<description>Drag due to speedbrakes</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.035</value>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_beta">
-				<description>Drag due to sideslip</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar lookup="row">aero/beta-rad</independentVar>
-						<tableData>
-							-1.57    1.230
-							-0.26    0.050
-							 0.00    0.000
-							 0.26    0.050
-							 1.57    1.230
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/force/Drag_elevator">
-				<description>Drag due to Elevator Deflection</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<abs><property>fcs/elevator-pos-norm</property></abs>
-					<value>0.035</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="SIDE">
-
-			<function name="aero/force/Side_beta">
-				<description>Side force due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>aero/beta-rad</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="ROLL">
-
-			<function name="aero/moment/Roll_beta">
-				<description>Roll moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>-0.1</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_damp">
-				<description>Roll moment due to roll rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/p-aero-rad_sec</property>
-					<value>-0.95</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_yaw">
-				<description>Roll moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>0.005</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_aileron">
-				<description>Roll moment due to aileron</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0.20</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Roll_rudder">
-				<description>Roll moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>0.003</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="PITCH">
-
-			<function name="aero/moment/Pitch_alpha">
-				<description>Pitch moment due to alpha</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/alpha-rad</property>
-					<value>-0.6</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_elevator">
-				<description>Pitch moment due to elevator</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>fcs/elevator-pos-rad</property>
-					<table>
-						<independentVar lookup="row">velocities/mach</independentVar>
-						<tableData>
-							0.0     -1.900
-							2.0     -0.900
-						</tableData>
-					</table>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_damp">
-				<description>Pitch moment due to pitch rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>velocities/q-aero-rad_sec</property>
-					<value>-140</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Pitch_alphadot">
-				<description>Pitch moment due to alpha rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/cbarw-ft</property>
-					<property>aero/ci2vel</property>
-					<property>aero/alphadot-rad_sec</property>
-					<value>-1</value>
-				</product>
-			</function>
-
-		</axis>
-
-		<axis name="YAW">
-
-			<function name="aero/moment/Yaw_beta">
-				<description>Yaw moment due to beta</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/beta-rad</property>
-					<value>0.12</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_damp">
-				<description>Yaw moment due to yaw rate</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>aero/bi2vel</property>
-					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_rudder">
-				<description>Yaw moment due to rudder</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/rudder-pos-rad</property>
-					<value>-0.2</value>
-				</product>
-			</function>
-
-			<function name="aero/moment/Yaw_aileron">
-				<description>Adverse yaw</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<property>metrics/bw-ft</property>
-					<property>fcs/left-aileron-pos-rad</property>
-					<value>0</value>
-				</product>
-			</function>
-
-		</axis>
-
-	</aerodynamics>
-
-	<external_reactions>
-		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
-			</location>
-			<direction>
-				<x>1</x>
-				<y>0</y>
-				<z>0</z>
-			</direction>
-		</force>
-	</external_reactions>
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
 </fdm_config>
diff --git a/Systems/a319-aerodynamics.xml b/Systems/a319-aerodynamics.xml
new file mode 100644
index 00000000..318d7b8a
--- /dev/null
+++ b/Systems/a319-aerodynamics.xml
@@ -0,0 +1,371 @@
+<!-- A3XX Aerodynamics -->
+<!-- Joshua Davidson (it0uchpods) -->
+
+<aerodynamics>
+	<axis name="LIFT">
+
+		<function name="aero/force/Lift_alpha">
+			<description>Lift due to alpha</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<tableData>
+						-0.20 -0.900
+						 0.00  0.103
+						 0.15  1.600
+						 0.23  1.900
+						 0.60  1.000
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_flap">
+			<description>Delta Lift due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+					<tableData>
+						0.000  0.00000
+						0.290  0.00250
+						0.596  0.00700
+						0.645  0.01300
+						1.000  0.01700
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_slats">
+			<description>Delta Lift due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/slat-pos-deg</property>
+				<value> 0.01000 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_speedbrake">
+			<description>Delta Lift due to speedbrake</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>-0.15</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_elevator">
+			<description>Lift due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/elevator-pos-rad</property>
+				<value>0.04</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="DRAG">
+
+		<function name="aero/force/Drag_basic">
+			<description>Drag at zero lift</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<tableData>
+						-1.57    1.260
+						-0.26    0.018
+						 0.00    0.008
+						 0.26    0.017
+						 1.57    1.320
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_induced">
+			<description>Induced drag</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/cl-squared</property>
+				<value>0.035</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_mach">
+			<description>Drag due to mach</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">velocities/mach</independentVar>
+					<tableData>
+						 0.00      0.000
+						 0.79      0.000
+						 1.10      0.023
+						 1.80      0.015
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_flap">
+			<description>Drag due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value> 0.00080 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_slats">
+			<description>Drag due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value> 0.00080 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_gear">
+			<description>Drag due to gear</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>gear/gear-pos-norm</property>
+				<value>0.025</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_speedbrake">
+			<description>Drag due to speedbrakes</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>0.035</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_beta">
+			<description>Drag due to sideslip</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/beta-rad</independentVar>
+					<tableData>
+						-1.57    1.230
+						-0.26    0.050
+						 0.00    0.000
+						 0.26    0.050
+						 1.57    1.230
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_elevator">
+			<description>Drag due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<abs><property>fcs/elevator-pos-norm</property></abs>
+				<value>0.035</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="SIDE">
+
+		<function name="aero/force/Side_beta">
+			<description>Side force due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/beta-rad</property>
+				<value>-1</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="ROLL">
+
+		<function name="aero/moment/Roll_beta">
+			<description>Roll moment due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/beta-rad</property>
+				<value>-0.1</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_damp">
+			<description>Roll moment due to roll rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/p-aero-rad_sec</property>
+				<value>-0.95</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_yaw">
+			<description>Roll moment due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>0.005</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_aileron">
+			<description>Roll moment due to aileron</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/left-aileron-pos-rad</property>
+				<value>0.20</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_rudder">
+			<description>Roll moment due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>0.003</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="PITCH">
+
+		<function name="aero/moment/Pitch_alpha">
+			<description>Pitch moment due to alpha</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/alpha-rad</property>
+				<value>-0.6</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_elevator">
+			<description>Pitch moment due to elevator</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>fcs/elevator-pos-rad</property>
+				<table>
+					<independentVar lookup="row">velocities/mach</independentVar>
+					<tableData>
+						0.0     -1.900
+						2.0     -0.900
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_damp">
+			<description>Pitch moment due to pitch rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/ci2vel</property>
+				<property>velocities/q-aero-rad_sec</property>
+				<value>-140</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_alphadot">
+			<description>Pitch moment due to alpha rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/ci2vel</property>
+				<property>aero/alphadot-rad_sec</property>
+				<value>-1</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="YAW">
+
+		<function name="aero/moment/Yaw_beta">
+			<description>Yaw moment due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/beta-rad</property>
+				<value>0.12</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_damp">
+			<description>Yaw moment due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>-0.2</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_rudder">
+			<description>Yaw moment due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>-0.2</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_aileron">
+			<description>Adverse yaw</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/left-aileron-pos-rad</property>
+				<value>0</value>
+			</product>
+		</function>
+
+	</axis>
+</aerodynamics>
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
new file mode 100644
index 00000000..318d7b8a
--- /dev/null
+++ b/Systems/a320-aerodynamics.xml
@@ -0,0 +1,371 @@
+<!-- A3XX Aerodynamics -->
+<!-- Joshua Davidson (it0uchpods) -->
+
+<aerodynamics>
+	<axis name="LIFT">
+
+		<function name="aero/force/Lift_alpha">
+			<description>Lift due to alpha</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<tableData>
+						-0.20 -0.900
+						 0.00  0.103
+						 0.15  1.600
+						 0.23  1.900
+						 0.60  1.000
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_flap">
+			<description>Delta Lift due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+					<tableData>
+						0.000  0.00000
+						0.290  0.00250
+						0.596  0.00700
+						0.645  0.01300
+						1.000  0.01700
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_slats">
+			<description>Delta Lift due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/slat-pos-deg</property>
+				<value> 0.01000 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_speedbrake">
+			<description>Delta Lift due to speedbrake</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>-0.15</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_elevator">
+			<description>Lift due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/elevator-pos-rad</property>
+				<value>0.04</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="DRAG">
+
+		<function name="aero/force/Drag_basic">
+			<description>Drag at zero lift</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<tableData>
+						-1.57    1.260
+						-0.26    0.018
+						 0.00    0.008
+						 0.26    0.017
+						 1.57    1.320
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_induced">
+			<description>Induced drag</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/cl-squared</property>
+				<value>0.035</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_mach">
+			<description>Drag due to mach</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">velocities/mach</independentVar>
+					<tableData>
+						 0.00      0.000
+						 0.79      0.000
+						 1.10      0.023
+						 1.80      0.015
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_flap">
+			<description>Drag due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value> 0.00080 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_slats">
+			<description>Drag due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value> 0.00080 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_gear">
+			<description>Drag due to gear</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>gear/gear-pos-norm</property>
+				<value>0.025</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_speedbrake">
+			<description>Drag due to speedbrakes</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>0.035</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_beta">
+			<description>Drag due to sideslip</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/beta-rad</independentVar>
+					<tableData>
+						-1.57    1.230
+						-0.26    0.050
+						 0.00    0.000
+						 0.26    0.050
+						 1.57    1.230
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_elevator">
+			<description>Drag due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<abs><property>fcs/elevator-pos-norm</property></abs>
+				<value>0.035</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="SIDE">
+
+		<function name="aero/force/Side_beta">
+			<description>Side force due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/beta-rad</property>
+				<value>-1</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="ROLL">
+
+		<function name="aero/moment/Roll_beta">
+			<description>Roll moment due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/beta-rad</property>
+				<value>-0.1</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_damp">
+			<description>Roll moment due to roll rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/p-aero-rad_sec</property>
+				<value>-0.95</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_yaw">
+			<description>Roll moment due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>0.005</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_aileron">
+			<description>Roll moment due to aileron</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/left-aileron-pos-rad</property>
+				<value>0.20</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_rudder">
+			<description>Roll moment due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>0.003</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="PITCH">
+
+		<function name="aero/moment/Pitch_alpha">
+			<description>Pitch moment due to alpha</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/alpha-rad</property>
+				<value>-0.6</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_elevator">
+			<description>Pitch moment due to elevator</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>fcs/elevator-pos-rad</property>
+				<table>
+					<independentVar lookup="row">velocities/mach</independentVar>
+					<tableData>
+						0.0     -1.900
+						2.0     -0.900
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_damp">
+			<description>Pitch moment due to pitch rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/ci2vel</property>
+				<property>velocities/q-aero-rad_sec</property>
+				<value>-140</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_alphadot">
+			<description>Pitch moment due to alpha rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/ci2vel</property>
+				<property>aero/alphadot-rad_sec</property>
+				<value>-1</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="YAW">
+
+		<function name="aero/moment/Yaw_beta">
+			<description>Yaw moment due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/beta-rad</property>
+				<value>0.12</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_damp">
+			<description>Yaw moment due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>-0.2</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_rudder">
+			<description>Yaw moment due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>-0.2</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_aileron">
+			<description>Adverse yaw</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/left-aileron-pos-rad</property>
+				<value>0</value>
+			</product>
+		</function>
+
+	</axis>
+</aerodynamics>
diff --git a/Systems/a321-aerodynamics.xml b/Systems/a321-aerodynamics.xml
new file mode 100644
index 00000000..318d7b8a
--- /dev/null
+++ b/Systems/a321-aerodynamics.xml
@@ -0,0 +1,371 @@
+<!-- A3XX Aerodynamics -->
+<!-- Joshua Davidson (it0uchpods) -->
+
+<aerodynamics>
+	<axis name="LIFT">
+
+		<function name="aero/force/Lift_alpha">
+			<description>Lift due to alpha</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<tableData>
+						-0.20 -0.900
+						 0.00  0.103
+						 0.15  1.600
+						 0.23  1.900
+						 0.60  1.000
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_flap">
+			<description>Delta Lift due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+					<tableData>
+						0.000  0.00000
+						0.290  0.00250
+						0.596  0.00700
+						0.645  0.01300
+						1.000  0.01700
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_slats">
+			<description>Delta Lift due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/slat-pos-deg</property>
+				<value> 0.01000 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_speedbrake">
+			<description>Delta Lift due to speedbrake</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>-0.15</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Lift_elevator">
+			<description>Lift due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/elevator-pos-rad</property>
+				<value>0.04</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="DRAG">
+
+		<function name="aero/force/Drag_basic">
+			<description>Drag at zero lift</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<tableData>
+						-1.57    1.260
+						-0.26    0.018
+						 0.00    0.008
+						 0.26    0.017
+						 1.57    1.320
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_induced">
+			<description>Induced drag</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/cl-squared</property>
+				<value>0.035</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_mach">
+			<description>Drag due to mach</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">velocities/mach</independentVar>
+					<tableData>
+						 0.00      0.000
+						 0.79      0.000
+						 1.10      0.023
+						 1.80      0.015
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_flap">
+			<description>Drag due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value> 0.00080 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_slats">
+			<description>Drag due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value> 0.00080 </value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_gear">
+			<description>Drag due to gear</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>gear/gear-pos-norm</property>
+				<value>0.025</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_speedbrake">
+			<description>Drag due to speedbrakes</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>0.035</value>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_beta">
+			<description>Drag due to sideslip</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar lookup="row">aero/beta-rad</independentVar>
+					<tableData>
+						-1.57    1.230
+						-0.26    0.050
+						 0.00    0.000
+						 0.26    0.050
+						 1.57    1.230
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/force/Drag_elevator">
+			<description>Drag due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<abs><property>fcs/elevator-pos-norm</property></abs>
+				<value>0.035</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="SIDE">
+
+		<function name="aero/force/Side_beta">
+			<description>Side force due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/beta-rad</property>
+				<value>-1</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="ROLL">
+
+		<function name="aero/moment/Roll_beta">
+			<description>Roll moment due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/beta-rad</property>
+				<value>-0.1</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_damp">
+			<description>Roll moment due to roll rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/p-aero-rad_sec</property>
+				<value>-0.95</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_yaw">
+			<description>Roll moment due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>0.005</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_aileron">
+			<description>Roll moment due to aileron</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/left-aileron-pos-rad</property>
+				<value>0.20</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Roll_rudder">
+			<description>Roll moment due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>0.003</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="PITCH">
+
+		<function name="aero/moment/Pitch_alpha">
+			<description>Pitch moment due to alpha</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/alpha-rad</property>
+				<value>-0.6</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_elevator">
+			<description>Pitch moment due to elevator</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>fcs/elevator-pos-rad</property>
+				<table>
+					<independentVar lookup="row">velocities/mach</independentVar>
+					<tableData>
+						0.0     -1.900
+						2.0     -0.900
+					</tableData>
+				</table>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_damp">
+			<description>Pitch moment due to pitch rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/ci2vel</property>
+				<property>velocities/q-aero-rad_sec</property>
+				<value>-140</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Pitch_alphadot">
+			<description>Pitch moment due to alpha rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/cbarw-ft</property>
+				<property>aero/ci2vel</property>
+				<property>aero/alphadot-rad_sec</property>
+				<value>-1</value>
+			</product>
+		</function>
+
+	</axis>
+
+	<axis name="YAW">
+
+		<function name="aero/moment/Yaw_beta">
+			<description>Yaw moment due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/beta-rad</property>
+				<value>0.12</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_damp">
+			<description>Yaw moment due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>-0.2</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_rudder">
+			<description>Yaw moment due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>-0.2</value>
+			</product>
+		</function>
+
+		<function name="aero/moment/Yaw_aileron">
+			<description>Adverse yaw</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>metrics/bw-ft</property>
+				<property>fcs/left-aileron-pos-rad</property>
+				<value>0</value>
+			</product>
+		</function>
+
+	</axis>
+</aerodynamics>
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index 5057b01d..add9e078 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- A3XX CFM56 FADEC -->
+<!-- Joshua Davidson -->
+
 <PropertyList>
 
     <filter>
@@ -436,7 +439,7 @@
 					</equals>
 					<greater-than>
 						<property>/engines/engine[0]/n1</property>
-						<value>23</value>
+						<value>22</value>
 					</greater-than>
 				</and>
 			</condition>
@@ -469,7 +472,7 @@
 					</equals>
 					<greater-than>
 						<property>/engines/engine[1]/n1</property>
-						<value>23</value>
+						<value>22</value>
 					</greater-than>
 				</and>
 			</condition>
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 1a72e389..c0d91476 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- A3XX IAE V2500 FADEC -->
+<!-- Joshua Davidson -->
+
 <PropertyList>
 
     <filter>
@@ -702,7 +705,7 @@
 					</equals>
 					<greater-than>
 						<property>/engines/engine[0]/n1</property>
-						<value>23</value>
+						<value>22</value>
 					</greater-than>
 				</and>
 			</condition>
@@ -735,7 +738,7 @@
 					</equals>
 					<greater-than>
 						<property>/engines/engine[1]/n1</property>
-						<value>23</value>
+						<value>22</value>
 					</greater-than>
 				</and>
 			</condition>
@@ -755,4 +758,4 @@
 		<output>/engines/engine[1]/egt-actual</output>
     </filter>
 
-</PropertyList>
+</PropertyList>
\ No newline at end of file