diff --git a/Models/A320-200-CFM - Copy.xml b/Models/A320-200-CFM - Copy.xml
new file mode 100644
index 00000000..e371bf47
--- /dev/null
+++ b/Models/A320-200-CFM - Copy.xml	
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
+
+<PropertyList>
+	<name>A320-200</name>
+	<path>empty.ac</path> <!-- Livery system on MP multimodel -->
+
+	<offsets>
+		<x-m>-18.8499</x-m>
+		<z-m>1.7005004</z-m>
+	</offsets>
+
+	<model>
+		<name>Fuselage</name>
+		<path>Aircraft/A320-family/Models/Fuselages/A320/fuselage.xml</path>
+	</model>
+	
+	<model>
+		<name>Interior</name>
+		<path>Aircraft/A320-family/Models/A320-interior.xml</path>
+		<!-- On multiplayer models, the interior is loaded separately and global
+			 offsets are not applied. This cancels the global offsets, so that
+			 the interior is loaded at (0,0,0) anyway. -->
+		<offsets>
+			<x-m>18.8499</x-m>
+			<z-m>-1.7005004</z-m>
+		</offsets>
+		<usage>interior</usage>
+	</model>
+
+	<model>
+		<name>Nose Gear</name>
+		<path>Aircraft/A320-family/Models/LandingGears/a320.nlg.xml</path>
+		<offsets>
+			<x-m>7.83</x-m>
+			<z-m>-1.9306008</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Main Gears.Left</name>
+		<path>Aircraft/A320-family/Models/LandingGears/a320.mlg.left.xml</path>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Main Gears.Right</name>
+		<path>Aircraft/A320-family/Models/LandingGears/a320.mlg.right.xml</path>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<path>Aircraft/A320-family/Models/Wings/a320.wings.cfm.xml</path>
+		<offsets>
+			<x-m>15.280</x-m>
+			<z-m>-1.06019</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>A320 Winglets</name>
+		<path>Aircraft/A320-family/Models/Wings/a320.winglets.xml</path>
+		<condition>
+			<equals>
+				<property>sim/multiplay/generic/int[12]</property>
+				<value>0</value>
+			</equals>
+		</condition>
+		<offsets>
+			<x-m>15.280</x-m>
+			<z-m>-1.06019</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>A320 Sharklets</name>
+		<path>Aircraft/A320-family/Models/Wings/a320.sharklets.xml</path>
+		<condition>
+			<equals>
+				<property>sim/multiplay/generic/int[12]</property>
+				<value>1</value>
+			</equals>
+		</condition>
+		<offsets>
+			<x-m>15.280</x-m>
+			<z-m>-1.06019</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Horizontal Stabilizer</name>
+		<path>Aircraft/A320-family/Models/Fuselages/A320/hstab.xml</path>
+		<offsets>
+			<x-m>34.1512207</x-m>
+			<pitch-deg>0.0</pitch-deg>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Vertical Stabilizer</name>
+		<path>Aircraft/A320-family/Models/Fuselages/A320/vstab.xml</path>
+		<offsets>
+			<x-m>32.2535728</x-m>
+		</offsets>
+	</model>
+	
+	<!-- Lights -->
+	
+	<model>
+		<name>Left nav light</name>
+		<path>Aircraft/A320-family/Models/Lights/rednav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>-16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Left nav light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/rednav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>-16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Right nav light</name>
+		<path>Aircraft/A320-family/Models/Lights/greennav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Right nav light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/greennav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Tail nav light</name>
+		<path>Aircraft/A320-family/Models/Lights/tailnav.xml</path>
+		<offsets>
+			<x-m>40.00461</x-m>
+			<y-m>0.0495674</y-m>
+			<z-m>1.2301</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Tail nav light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/tailnav.xml</path>
+		<offsets>
+			<x-m>40.00461</x-m>
+			<y-m>0.0495674</y-m>
+			<z-m>1.2301</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Left strobe light</name>
+		<path>Aircraft/A320-family/Models/Lights/strobe.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>-16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Left strobe light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/left-strobe.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>-16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Right strobe light</name>
+		<path>Aircraft/A320-family/Models/Lights/strobe.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Right strobe light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/right-strobe.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Tail strobe light</name>
+		<path>Aircraft/A320-family/Models/Lights/tailstrobe.xml</path>
+		<offsets>
+			<x-m>40.00461</x-m>
+			<y-m>-0.0495674</y-m>
+			<z-m>1.2301</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Tail strobe light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/tail-strobe.xml</path>
+		<offsets>
+			<x-m>40.00461</x-m>
+			<y-m>-0.0495674</y-m>
+			<z-m>1.2301</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Top beacon light</name>
+		<path>Aircraft/A320-family/Models/Lights/beacon.xml</path>
+		<offsets>
+			<x-m>16.7</x-m>
+			<y-m>0</y-m>
+			<z-m>1.977</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Bottom beacon light</name>
+		<path>Aircraft/A320-family/Models/Lights/beacon.xml</path>
+		<offsets>
+			<x-m>18.2</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Top beacon light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/beacon.xml</path>
+		<offsets>
+			<x-m>16.7</x-m>
+			<y-m>0</y-m>
+			<z-m>1.977</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Bottom beacon light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/beacon.xml</path>
+		<offsets>
+			<x-m>18.2</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Port landing light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/landinglightL.xml</path>
+		<offsets>
+			<x-m>15.9</x-m>
+			<y-m>-3.16</y-m>
+			<z-m>-1.25</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Nosegear landing light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/taxilight.xml</path>
+		<offsets>
+			<x-m>7.6</x-m>
+			<y-m>-0.1018315</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Second Nosegear landing light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/taxilight.xml</path>
+		<offsets>
+			<x-m>7.6</x-m>
+			<y-m>0.1018315</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Left Turnoff ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/turnoffL.xml</path>
+		<offsets>
+			<x-m>7.7</x-m>
+			<y-m>-0.1518315</y-m>
+			<z-m>-2.9</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Right Turnoff ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/turnoffR.xml</path>
+		<offsets>
+			<x-m>7.7</x-m>
+			<y-m>0.1518315</y-m>
+			<z-m>-2.9</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Starboard landing light ALS</name>
+		<path>Aircraft/A320-family/Models/Lights/ALS/landinglightR.xml</path>
+		<offsets>
+			<x-m>15.9</x-m>
+			<y-m>3.16</y-m>
+			<z-m>-1.25</z-m>
+		</offsets>
+	</model>
+
+	<!-- Tire smoke and spray effects -->
+	<model>
+		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+		<name>tyre-smoke-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	 </model>
+	 
+	<model>
+		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+		<name>tyre-smoke-p</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	 
+	<model>
+		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+		<name>tyre-smoke-s</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
+		<name>rain-splash-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<path>Aircraft/Generic/Effects/rain-port.xml</path>
+		<name>rain-splash-p</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	 
+	<model>
+		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+		<name>rain-splash-s</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+		<name>tire-smoke-l</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+		<name>tire-smoke-r</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<!-- wing condensation effect -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+		<name>wing-condensation</name>
+	</model>
+	
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+		<name>wing-condensation</name>
+	</model>
+
+	<!-- Other non-aircraft models -->
+	<model>
+		<name>Pushback</name>
+		<path>Aircraft/A320-family/Models/Services/Pushback/Douglas.xml</path>
+		<offsets>
+			<x-m>6.0</x-m>
+			<y-m>0</y-m>
+			<z-m>-4.24</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<path>Aircraft/Generic/marker.xml</path>
+	</model>
+	
+	<!-- Firetruck -->
+
+	<model>
+		<name>Firetruck1</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>60.0</x-m>
+			<y-m>10.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Firetruck2</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>80.0</x-m>
+			<y-m>-8.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
+	</model>
+	
+	<animation>
+		<type>select</type>
+		<object-name>Firetruck1</object-name>
+		<object-name>Firetruck2</object-name>
+		<condition>
+			<and>
+				<property>sim/animation/fire-services</property>
+				<less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>40</value>
+				</less-than>
+			</and>
+		</condition>
+	</animation>
+	
+	<!-- LIVERY SELECT -->
+	<!-- Animation -->
+	<animation>
+		<type>material</type>
+		<!-- Fuselage -->
+		<object-name>Fuselage</object-name>
+		<object-name>Vstab</object-name>
+		<!-- Wings -->
+		<object-name>WingletL</object-name>
+		<object-name>WingletR</object-name>
+		<!-- Engines -->
+		<object-name>Intake</object-name>
+		<object-name>Nacelle</object-name>
+		<object-name>Reverser</object-name>
+		<!-- Fuselage -->
+		<property-base>sim/model/livery</property-base>
+		<texture-prop>texture</texture-prop>
+		<texture>a320.png</texture>
+	</animation>
+
+	<!-- Nasal code -->
+	<nasal>
+		<load>
+			var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320/CFM");
+		</load>
+		<unload>
+			livery_update.stop();
+		</unload>
+	</nasal>
+	
+	<!-- Ground Services -->	
+	<model>
+		<name>ground_services</name>
+		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>
+	</model>
+
+	<animation>
+		<type>select</type>
+		<object-name>Top beacon light</object-name>
+		<object-name>Bottom beacon light</object-name>
+		<object-name>Left nav light</object-name>
+		<object-name>Right nav light</object-name>
+		<object-name>Left strobe light</object-name>
+		<object-name>Right strobe light</object-name>
+		<object-name>Tail strobe light</object-name>
+		<object-name>Tail nav light</object-name>
+		<condition>
+			<not>
+				<property>sim/rendering/shaders/skydome</property>
+			</not>
+		</condition>
+	</animation>
+	<animation>
+		<type>select</type>
+		<object-name>Top beacon light ALS</object-name>
+		<object-name>Bottom beacon light ALS</object-name>
+		<object-name>Left nav light ALS</object-name>
+		<object-name>Right nav light ALS</object-name>
+		<object-name>Left strobe light ALS</object-name>
+		<object-name>Right strobe light ALS</object-name>
+		<object-name>Port landing light ALS</object-name>
+		<object-name>Nosegear landing light ALS</object-name>
+		<object-name>Starboard landing light ALS</object-name>
+		<object-name>Tail strobe light ALS</object-name>
+		<object-name>Tail nav light ALS</object-name>
+		<condition>
+				<property>sim/rendering/shaders/skydome</property>
+		</condition>
+	</animation>
+	<animation>
+		<type>select</type>
+		<object-name>Nosegear landing light ALS</object-name>
+		<condition>
+			<and>
+				<not>
+					<property>sim/model/lights/nose-ldglight</property>
+					<value>0</value>
+				</not>
+				<greater-than>
+					<property>gear/gear/position-norm</property>
+					<value>0.1</value>
+				</greater-than>
+			</and>
+		</condition>
+	</animation>
+</PropertyList>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index e371bf47..d75949a0 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -28,540 +28,4 @@
 		</offsets>
 		<usage>interior</usage>
 	</model>
-
-	<model>
-		<name>Nose Gear</name>
-		<path>Aircraft/A320-family/Models/LandingGears/a320.nlg.xml</path>
-		<offsets>
-			<x-m>7.83</x-m>
-			<z-m>-1.9306008</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Main Gears.Left</name>
-		<path>Aircraft/A320-family/Models/LandingGears/a320.mlg.left.xml</path>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>-3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Main Gears.Right</name>
-		<path>Aircraft/A320-family/Models/LandingGears/a320.mlg.right.xml</path>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<path>Aircraft/A320-family/Models/Wings/a320.wings.cfm.xml</path>
-		<offsets>
-			<x-m>15.280</x-m>
-			<z-m>-1.06019</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>A320 Winglets</name>
-		<path>Aircraft/A320-family/Models/Wings/a320.winglets.xml</path>
-		<condition>
-			<equals>
-				<property>sim/multiplay/generic/int[12]</property>
-				<value>0</value>
-			</equals>
-		</condition>
-		<offsets>
-			<x-m>15.280</x-m>
-			<z-m>-1.06019</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>A320 Sharklets</name>
-		<path>Aircraft/A320-family/Models/Wings/a320.sharklets.xml</path>
-		<condition>
-			<equals>
-				<property>sim/multiplay/generic/int[12]</property>
-				<value>1</value>
-			</equals>
-		</condition>
-		<offsets>
-			<x-m>15.280</x-m>
-			<z-m>-1.06019</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Horizontal Stabilizer</name>
-		<path>Aircraft/A320-family/Models/Fuselages/A320/hstab.xml</path>
-		<offsets>
-			<x-m>34.1512207</x-m>
-			<pitch-deg>0.0</pitch-deg>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Vertical Stabilizer</name>
-		<path>Aircraft/A320-family/Models/Fuselages/A320/vstab.xml</path>
-		<offsets>
-			<x-m>32.2535728</x-m>
-		</offsets>
-	</model>
-	
-	<!-- Lights -->
-	
-	<model>
-		<name>Left nav light</name>
-		<path>Aircraft/A320-family/Models/Lights/rednav.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>-16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Left nav light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/rednav.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>-16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Right nav light</name>
-		<path>Aircraft/A320-family/Models/Lights/greennav.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Right nav light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/greennav.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Tail nav light</name>
-		<path>Aircraft/A320-family/Models/Lights/tailnav.xml</path>
-		<offsets>
-			<x-m>40.00461</x-m>
-			<y-m>0.0495674</y-m>
-			<z-m>1.2301</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Tail nav light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/tailnav.xml</path>
-		<offsets>
-			<x-m>40.00461</x-m>
-			<y-m>0.0495674</y-m>
-			<z-m>1.2301</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Left strobe light</name>
-		<path>Aircraft/A320-family/Models/Lights/strobe.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>-16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Left strobe light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/left-strobe.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>-16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Right strobe light</name>
-		<path>Aircraft/A320-family/Models/Lights/strobe.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Right strobe light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/right-strobe.xml</path>
-		<offsets>
-			<x-m>22.93</x-m>
-			<y-m>16.5</y-m>
-			<z-m>0.25</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Tail strobe light</name>
-		<path>Aircraft/A320-family/Models/Lights/tailstrobe.xml</path>
-		<offsets>
-			<x-m>40.00461</x-m>
-			<y-m>-0.0495674</y-m>
-			<z-m>1.2301</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Tail strobe light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/tail-strobe.xml</path>
-		<offsets>
-			<x-m>40.00461</x-m>
-			<y-m>-0.0495674</y-m>
-			<z-m>1.2301</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Top beacon light</name>
-		<path>Aircraft/A320-family/Models/Lights/beacon.xml</path>
-		<offsets>
-			<x-m>16.7</x-m>
-			<y-m>0</y-m>
-			<z-m>1.977</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Bottom beacon light</name>
-		<path>Aircraft/A320-family/Models/Lights/beacon.xml</path>
-		<offsets>
-			<x-m>18.2</x-m>
-			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Top beacon light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/beacon.xml</path>
-		<offsets>
-			<x-m>16.7</x-m>
-			<y-m>0</y-m>
-			<z-m>1.977</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Bottom beacon light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/beacon.xml</path>
-		<offsets>
-			<x-m>18.2</x-m>
-			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Port landing light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/landinglightL.xml</path>
-		<offsets>
-			<x-m>15.9</x-m>
-			<y-m>-3.16</y-m>
-			<z-m>-1.25</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Nosegear landing light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/taxilight.xml</path>
-		<offsets>
-			<x-m>7.6</x-m>
-			<y-m>-0.1018315</y-m>
-			<z-m>-2.5</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Second Nosegear landing light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/taxilight.xml</path>
-		<offsets>
-			<x-m>7.6</x-m>
-			<y-m>0.1018315</y-m>
-			<z-m>-2.5</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Left Turnoff ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/turnoffL.xml</path>
-		<offsets>
-			<x-m>7.7</x-m>
-			<y-m>-0.1518315</y-m>
-			<z-m>-2.9</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Right Turnoff ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/turnoffR.xml</path>
-		<offsets>
-			<x-m>7.7</x-m>
-			<y-m>0.1518315</y-m>
-			<z-m>-2.9</z-m>
-		</offsets>
-	</model>
-
-	<model>
-		<name>Starboard landing light ALS</name>
-		<path>Aircraft/A320-family/Models/Lights/ALS/landinglightR.xml</path>
-		<offsets>
-			<x-m>15.9</x-m>
-			<y-m>3.16</y-m>
-			<z-m>-1.25</z-m>
-		</offsets>
-	</model>
-
-	<!-- Tire smoke and spray effects -->
-	<model>
-		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-		<name>tyre-smoke-n</name>
-		<offsets>
-			<x-m>7.83</x-m>
-			<y-m>0</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	 </model>
-	 
-	<model>
-		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-		<name>tyre-smoke-p</name>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>-3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	 
-	<model>
-		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-		<name>tyre-smoke-s</name>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
-		<name>rain-splash-n</name>
-		<offsets>
-			<x-m>7.83</x-m>
-			<y-m>0</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/Generic/Effects/rain-port.xml</path>
-		<name>rain-splash-p</name>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>-3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	 
-	<model>
-		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-		<name>rain-splash-s</name>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-		<name>tire-smoke-l</name>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>-3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-		<name>tire-smoke-r</name>
-		<offsets>
-			<x-m>20.3180764</x-m>
-			<y-m>3.795</y-m>
-			<z-m>-3.9669424</z-m>
-		</offsets>
-	</model>
-	
-	<!-- wing condensation effect -->
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
-		<name>wing-condensation</name>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
-		<name>wing-condensation</name>
-	</model>
-
-	<!-- Other non-aircraft models -->
-	<model>
-		<name>Pushback</name>
-		<path>Aircraft/A320-family/Models/Services/Pushback/Douglas.xml</path>
-		<offsets>
-			<x-m>6.0</x-m>
-			<y-m>0</y-m>
-			<z-m>-4.24</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/Generic/marker.xml</path>
-	</model>
-	
-	<!-- Firetruck -->
-
-	<model>
-		<name>Firetruck1</name>
-		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-		<offsets>
-			<x-m>60.0</x-m>
-			<y-m>10.0</y-m>
-			<z-m>-4.4</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<name>Firetruck2</name>
-		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-		<offsets>
-			<x-m>80.0</x-m>
-			<y-m>-8.0</y-m>
-			<z-m>-4.4</z-m>
-		</offsets>
-	</model>
-	
-	<animation>
-		<type>select</type>
-		<object-name>Firetruck1</object-name>
-		<object-name>Firetruck2</object-name>
-		<condition>
-			<and>
-				<property>sim/animation/fire-services</property>
-				<less-than>
-					<property>velocities/groundspeed-kt</property>
-					<value>40</value>
-				</less-than>
-			</and>
-		</condition>
-	</animation>
-	
-	<!-- LIVERY SELECT -->
-	<!-- Animation -->
-	<animation>
-		<type>material</type>
-		<!-- Fuselage -->
-		<object-name>Fuselage</object-name>
-		<object-name>Vstab</object-name>
-		<!-- Wings -->
-		<object-name>WingletL</object-name>
-		<object-name>WingletR</object-name>
-		<!-- Engines -->
-		<object-name>Intake</object-name>
-		<object-name>Nacelle</object-name>
-		<object-name>Reverser</object-name>
-		<!-- Fuselage -->
-		<property-base>sim/model/livery</property-base>
-		<texture-prop>texture</texture-prop>
-		<texture>a320.png</texture>
-	</animation>
-
-	<!-- Nasal code -->
-	<nasal>
-		<load>
-			var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320/CFM");
-		</load>
-		<unload>
-			livery_update.stop();
-		</unload>
-	</nasal>
-	
-	<!-- Ground Services -->	
-	<model>
-		<name>ground_services</name>
-		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>
-	</model>
-
-	<animation>
-		<type>select</type>
-		<object-name>Top beacon light</object-name>
-		<object-name>Bottom beacon light</object-name>
-		<object-name>Left nav light</object-name>
-		<object-name>Right nav light</object-name>
-		<object-name>Left strobe light</object-name>
-		<object-name>Right strobe light</object-name>
-		<object-name>Tail strobe light</object-name>
-		<object-name>Tail nav light</object-name>
-		<condition>
-			<not>
-				<property>sim/rendering/shaders/skydome</property>
-			</not>
-		</condition>
-	</animation>
-	<animation>
-		<type>select</type>
-		<object-name>Top beacon light ALS</object-name>
-		<object-name>Bottom beacon light ALS</object-name>
-		<object-name>Left nav light ALS</object-name>
-		<object-name>Right nav light ALS</object-name>
-		<object-name>Left strobe light ALS</object-name>
-		<object-name>Right strobe light ALS</object-name>
-		<object-name>Port landing light ALS</object-name>
-		<object-name>Nosegear landing light ALS</object-name>
-		<object-name>Starboard landing light ALS</object-name>
-		<object-name>Tail strobe light ALS</object-name>
-		<object-name>Tail nav light ALS</object-name>
-		<condition>
-				<property>sim/rendering/shaders/skydome</property>
-		</condition>
-	</animation>
-	<animation>
-		<type>select</type>
-		<object-name>Nosegear landing light ALS</object-name>
-		<condition>
-			<and>
-				<not>
-					<property>sim/model/lights/nose-ldglight</property>
-					<value>0</value>
-				</not>
-				<greater-than>
-					<property>gear/gear/position-norm</property>
-					<value>0.1</value>
-				</greater-than>
-			</and>
-		</condition>
-	</animation>
 </PropertyList>
diff --git a/Models/A320-interior.xml b/Models/A320-interior.xml
index aa5c89d2..a373ca3b 100644
--- a/Models/A320-interior.xml
+++ b/Models/A320-interior.xml
@@ -11,13 +11,4 @@
 			<z-m>1.7005004</z-m>
 		</offsets>
 	</model>
-	
-	<model>
-		<name>Interior</name>
-		<path>Aircraft/A320-family/Models/Interior/a320.interior.xml</path>
-		<offsets>
-			<x-m>-18.8499</x-m>
-			<z-m>1.7005004</z-m>
-		</offsets>
-	</model>
 </PropertyList>
diff --git a/Models/Fuselages/A320/fuselage-old.xml b/Models/Fuselages/A320/fuselage-old.xml
new file mode 100644
index 00000000..380343cb
--- /dev/null
+++ b/Models/Fuselages/A320/fuselage-old.xml
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
+
+<PropertyList>
+	<name>Fuselage</name>
+	<path>res/fuselage.ac</path>
+
+	<!-- Reflection Shader -->
+	<!--effect>
+		<inherits-from>Aircraft/A320-family/Models/Effects/NEOreflect</inherits-from>
+		<object-name>Fuselage</object-name>
+	</effect-->
+    
+	<effect>
+		<inherits-from>Effects/glass</inherits-from>
+		<object-name>Windsheild</object-name>
+		<object-name>Windows</object-name>
+		<object-name>glass</object-name>
+		<object-name>glass1</object-name>
+		<object-name>glass2</object-name>
+		<object-name>glass3</object-name>
+    </effect>
+
+	<!-- APU fire -->
+	<model>
+		<name>APU fire</name>
+		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
+		<offsets>
+			<x-m>38.9</x-m>
+			<y-m>0</y-m>
+			<z-m>0.95</z-m>
+		</offsets>
+		<condition>
+			<property>systems/failures/apu-fire</property>
+		</condition>
+	</model>
+
+	<!-- ANIMATIONS -->
+	<!-- PAX doors -->
+	<animation>
+		<name>PAX left-front door pick</name>
+		<type>pick</type>
+		<object-name>DoorL1</object-name>
+		<object-name>DoorL1int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.doorl1, "doorl1", "PAX left-front (main)");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>PAX left-front door x translate</name>
+		<type>translate</type>
+		<object-name>DoorL1</object-name>
+		<object-name>DoorL1int</object-name>
+		<property>sim/model/door-positions/doorl1/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>0</dep></entry>
+			<entry><ind>1</ind><dep>-1</dep></entry>
+		</interpolation>
+		<axis>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</axis>
+	</animation>
+	<animation>
+		<name>PAX left-front door y translate</name>
+		<type>translate</type>
+		<object-name>DoorL1</object-name>
+		<object-name>DoorL1int</object-name>
+		<property>sim/model/door-positions/doorl1/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>-0.2</dep></entry>
+			<entry><ind>1</ind><dep>-0.2</dep></entry>
+		</interpolation>
+		<axis>
+			<x>0</x>
+			<y>1</y>
+			<z>0</z>
+		</axis>
+	</animation>
+
+	<animation>
+		<name>PAX right-front door pick</name>
+		<type>pick</type>
+		<object-name>DoorR1</object-name>
+		<object-name>DoorR1int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.doorr1, "doorr1", "PAX right-front");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>PAX right-front door x translate</name>
+		<type>translate</type>
+		<object-name>DoorR1</object-name>
+		<object-name>DoorR1int</object-name>
+		<property>sim/model/door-positions/doorr1/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>0</dep></entry>
+			<entry><ind>1</ind><dep>-1</dep></entry>
+		</interpolation>
+		<axis>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</axis>
+	</animation>
+	<animation>
+		<name>PAX right-front door y translate</name>
+		<type>translate</type>
+		<object-name>DoorR1</object-name>
+		<object-name>DoorR1int</object-name>
+		<property>sim/model/door-positions/doorr1/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>0.2</dep></entry>
+			<entry><ind>1</ind><dep>0.2</dep></entry>
+		</interpolation>
+		<axis>
+			<x>0</x>
+			<y>1</y>
+			<z>0</z>
+		</axis>
+	</animation>
+
+	<animation>
+		<name>PAX left-back door pick</name>
+		<type>pick</type>
+		<object-name>DoorL4</object-name>
+		<object-name>DoorL4int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.doorl4, "doorl4", "PAX left-back");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>PAX left-back door x translate</name>
+		<type>translate</type>
+		<object-name>DoorL4</object-name>
+		<object-name>DoorL4int</object-name>
+		<property>sim/model/door-positions/doorl4/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>0</dep></entry>
+			<entry><ind>1</ind><dep>-1</dep></entry>
+		</interpolation>
+		<axis>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</axis>
+	</animation>
+	<animation>
+		<name>PAX left-back door y translate</name>
+		<type>translate</type>
+		<object-name>DoorL4</object-name>
+		<object-name>DoorL4int</object-name>
+		<property>sim/model/door-positions/doorl4/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>-0.2</dep></entry>
+			<entry><ind>1</ind><dep>-0.2</dep></entry>
+		</interpolation>
+		<axis>
+			<x>0</x>
+			<y>1</y>
+			<z>0</z>
+		</axis>
+	</animation>
+
+	<animation>
+		<name>PAX right-back door pick</name>
+		<type>pick</type>
+		<object-name>DoorR4</object-name>
+		<object-name>DoorR4int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.doorr4, "doorr4", "PAX right-back");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>PAX right-back door x translate</name>
+		<type>translate</type>
+		<object-name>DoorR4</object-name>
+		<object-name>DoorR4int</object-name>
+		<property>sim/model/door-positions/doorr4/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>0</dep></entry>
+			<entry><ind>1</ind><dep>-1</dep></entry>
+		</interpolation>
+		<axis>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</axis>
+	</animation>
+	<animation>
+		<name>PAX right-back door y translate</name>
+		<type>translate</type>
+		<object-name>DoorR4</object-name>
+		<object-name>DoorR4int</object-name>
+		<property>sim/model/door-positions/doorr4/position-norm</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>0</dep></entry>
+			<entry><ind>0.25</ind><dep>0.2</dep></entry>
+			<entry><ind>1</ind><dep>0.2</dep></entry>
+		</interpolation>
+		<axis>
+			<x>0</x>
+			<y>1</y>
+			<z>0</z>
+		</axis>
+	</animation>
+
+	<!-- Cargo doors -->
+	<animation>
+		<name>Cargo forward door pick</name>
+		<type>pick</type>
+		<object-name>Cargo1</object-name>
+		<object-name>Cargo1int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.cargofwd, "cargofwd", "forward cargo");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>Cargo forward door rotate</name>
+		<type>rotate</type>
+		<object-name>Cargo1</object-name>
+		<object-name>Cargo1int</object-name>
+		<property>sim/model/door-positions/cargofwd/position-norm</property>
+		<factor>150</factor>
+		<axis>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</axis>
+		<center>
+			<x-m>0</x-m>
+			<y-m>1.92</y-m>
+			<z-m>-0.507</z-m>
+		</center>
+	</animation>
+
+	<animation>
+		<name>Cargo aft door pick</name>
+		<type>pick</type>
+		<object-name>Cargo2</object-name>
+		<object-name>Cargo2int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.cargoaft, "cargoaft", "aft cargo");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>Cargo aft door rotate</name>
+		<type>rotate</type>
+		<object-name>Cargo2</object-name>
+		<object-name>Cargo2int</object-name>
+		<property>sim/model/door-positions/cargoaft/position-norm</property>
+		<factor>150</factor>
+		<axis>
+			<x1-m>24.442</x1-m>
+			<y1-m>1.912</y1-m>
+			<z1-m>-0.507</z1-m>
+			<x2-m>26.022</x2-m>
+			<y2-m>1.914</y2-m>
+			<z2-m>-0.509</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<name>Cargo bulk door pick</name>
+		<type>pick</type>
+		<object-name>Cargo3</object-name>
+		<object-name>Cargo3int</object-name>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+				 libraries.triggerDoor(libraries.cargobulk, "cargobulk", "bulk cargo");
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<name>Cargo bulk door rotate</name>
+		<type>rotate</type>
+		<object-name>Cargo3</object-name>
+		<object-name>Cargo3int</object-name>
+		<property>sim/model/door-positions/cargobulk/position-norm</property>
+		<factor>150</factor>
+		<axis>
+			<x1-m>28.367</x1-m>
+			<y1-m>1.735</y1-m>
+			<z1-m>-0.972</z1-m>
+			<x2-m>29.166</x2-m>
+			<y2-m>1.702</y2-m>
+			<z2-m>-0.942</z2-m>
+		</axis>
+	</animation>
+
+	<!-- Animation for the doors of the main gears. -->
+	<animation>
+		<name>Main_Gear_Doors.Left</name>
+		<type>rotate</type>
+		<object-name>GearLDoor</object-name>
+		<property>gear/gear[1]/position-norm</property>
+		<interpolation>
+			<entry><ind>0.0</ind><dep>0.0</dep></entry>
+			<entry><ind>0.2</ind><dep>84.0</dep></entry>
+			<entry><ind>0.8</ind><dep>84.0</dep></entry>
+			<entry><ind>1.0</ind><dep>0.0</dep></entry>
+		</interpolation>
+		<center>
+			<y-m>-0.4646725</y-m>
+			<z-m>-2.3824937</z-m>
+		</center>
+		<axis>
+			<x>1</x>
+		</axis>
+	</animation>
+	
+	<animation>
+		<name>Main_Gear_Doors.Right</name>
+		<type>rotate</type>
+		<object-name>GearRDoor</object-name>
+		<property>gear/gear[2]/position-norm</property>
+		<interpolation>
+			<entry><ind>0.0</ind><dep>0.0</dep></entry>
+			<entry><ind>0.2</ind><dep>84.0</dep></entry>
+			<entry><ind>0.8</ind><dep>84.0</dep></entry>
+			<entry><ind>1.0</ind><dep>0.0</dep></entry>
+		</interpolation>
+		<center>
+			<y-m>0.4646725</y-m>
+			<z-m>-2.3824937</z-m>
+		</center>
+		<axis>
+			<x>-1</x>
+		</axis>
+	</animation>
+	
+	<!-- Animation for the doors of the nose gear. -->
+	<animation>
+		<name>Nose_Gear_Doors.Left.01</name>
+		<type>rotate</type>
+		<object-name>GearNFwdDoorL</object-name>
+		<property>gear/gear[0]/position-norm</property>
+		<interpolation>
+			<entry><ind>0.0z</ind><dep>0.0</dep></entry>
+			<entry><ind>0.2</ind><dep>90.0</dep></entry>
+			<entry><ind>0.8</ind><dep>90.0</dep></entry>
+			<entry><ind>1.0</ind><dep>0.0</dep></entry>
+		</interpolation>
+		<axis>
+			
+			<x1-m>7.599</x1-m>
+			<y1-m>-0.5</y1-m>
+			<z1-m>-2.0649564</z1-m>
+			
+			<x2-m>5.394</x2-m>
+			<y2-m>-0.5</y2-m>
+			<z2-m>-1.9179121</z2-m>
+			
+		</axis>
+	</animation>
+	
+	<animation>
+		<name>Nose_Gear_Doors.Left.02</name>
+		<type>rotate</type>
+		<object-name>GearNAftDoorL</object-name>
+		<property>gear/gear[0]/position-norm</property>
+		<interpolation>
+			<entry><ind>0.2</ind><dep>0.0</dep></entry>
+			<entry><ind>0.8</ind><dep>45.0</dep></entry>
+		</interpolation>
+		<axis>
+			
+			<x1-m>8.077</x1-m>
+			<y1-m>-0.5</y1-m>
+			<z1-m>-2.0790732</z1-m>
+			
+			<x2-m>7.599</x2-m>
+			<y2-m>-0.5</y2-m>
+			<z2-m>-2.0649564</z2-m>
+			
+		</axis>
+	</animation>
+	
+	<animation>
+		<name>Nose_Gear_Doors.Right.01</name>
+		<type>rotate</type>
+		<object-name>GearNFwdDoorR</object-name>
+		<property>gear/gear[0]/position-norm</property>
+		<interpolation>
+			<entry><ind>0.0</ind><dep>0.0</dep></entry>
+			<entry><ind>0.2</ind><dep>90.0</dep></entry>
+			<entry><ind>0.8</ind><dep>90.0</dep></entry>
+			<entry><ind>1.0</ind><dep>0.0</dep></entry>
+		</interpolation>
+		<axis>
+			<x1-m>5.394</x1-m>
+			<y1-m>0.5</y1-m>
+			<z1-m>-1.9179121</z1-m>
+			<x2-m>7.599</x2-m>
+			<y2-m>0.5</y2-m>
+			<z2-m>-2.0649564</z2-m>
+		</axis>
+	</animation>
+	
+	<animation>
+		<name>Nose_Gear_Doors.Right.02</name>
+		<type>rotate</type>
+		<object-name>GearNAftDoorR</object-name>
+		<property>gear/gear[0]/position-norm</property>
+		<interpolation>
+			<entry><ind>0.2</ind><dep>0.0</dep></entry>
+			<entry><ind>0.8</ind><dep>45.0</dep></entry>
+		</interpolation>
+		<axis>
+			<x1-m>7.599</x1-m>
+			<y1-m>0.5</y1-m>
+			<z1-m>-2.0649564</z1-m>
+			<x2-m>8.077</x2-m>
+			<y2-m>0.5</y2-m>
+			<z2-m>-2.0790732</z2-m>
+		</axis>
+	</animation>
+
+	<model>
+		<name>RAT</name>
+		<path>Aircraft/A320-family/Models/RAT/RAT.xml</path>
+		<offsets>
+			<x-m>18</x-m>
+			<y-m>-1</y-m>
+			<z-m>-2.9</z-m>
+		</offsets>
+	</model>
+
+</PropertyList>
diff --git a/Models/Fuselages/A320/fuselage.xml b/Models/Fuselages/A320/fuselage.xml
index 380343cb..eb388150 100644
--- a/Models/Fuselages/A320/fuselage.xml
+++ b/Models/Fuselages/A320/fuselage.xml
@@ -4,482 +4,6 @@
 
 <PropertyList>
 	<name>Fuselage</name>
-	<path>res/fuselage.ac</path>
-
-	<!-- Reflection Shader -->
-	<!--effect>
-		<inherits-from>Aircraft/A320-family/Models/Effects/NEOreflect</inherits-from>
-		<object-name>Fuselage</object-name>
-	</effect-->
-    
-	<effect>
-		<inherits-from>Effects/glass</inherits-from>
-		<object-name>Windsheild</object-name>
-		<object-name>Windows</object-name>
-		<object-name>glass</object-name>
-		<object-name>glass1</object-name>
-		<object-name>glass2</object-name>
-		<object-name>glass3</object-name>
-    </effect>
-
-	<!-- APU fire -->
-	<model>
-		<name>APU fire</name>
-		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
-		<offsets>
-			<x-m>38.9</x-m>
-			<y-m>0</y-m>
-			<z-m>0.95</z-m>
-		</offsets>
-		<condition>
-			<property>systems/failures/apu-fire</property>
-		</condition>
-	</model>
-
-	<!-- ANIMATIONS -->
-	<!-- PAX doors -->
-	<animation>
-		<name>PAX left-front door pick</name>
-		<type>pick</type>
-		<object-name>DoorL1</object-name>
-		<object-name>DoorL1int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.doorl1, "doorl1", "PAX left-front (main)");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>PAX left-front door x translate</name>
-		<type>translate</type>
-		<object-name>DoorL1</object-name>
-		<object-name>DoorL1int</object-name>
-		<property>sim/model/door-positions/doorl1/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>0</dep></entry>
-			<entry><ind>1</ind><dep>-1</dep></entry>
-		</interpolation>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-			<z>0</z>
-		</axis>
-	</animation>
-	<animation>
-		<name>PAX left-front door y translate</name>
-		<type>translate</type>
-		<object-name>DoorL1</object-name>
-		<object-name>DoorL1int</object-name>
-		<property>sim/model/door-positions/doorl1/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>-0.2</dep></entry>
-			<entry><ind>1</ind><dep>-0.2</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-	</animation>
-
-	<animation>
-		<name>PAX right-front door pick</name>
-		<type>pick</type>
-		<object-name>DoorR1</object-name>
-		<object-name>DoorR1int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.doorr1, "doorr1", "PAX right-front");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>PAX right-front door x translate</name>
-		<type>translate</type>
-		<object-name>DoorR1</object-name>
-		<object-name>DoorR1int</object-name>
-		<property>sim/model/door-positions/doorr1/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>0</dep></entry>
-			<entry><ind>1</ind><dep>-1</dep></entry>
-		</interpolation>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-			<z>0</z>
-		</axis>
-	</animation>
-	<animation>
-		<name>PAX right-front door y translate</name>
-		<type>translate</type>
-		<object-name>DoorR1</object-name>
-		<object-name>DoorR1int</object-name>
-		<property>sim/model/door-positions/doorr1/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>0.2</dep></entry>
-			<entry><ind>1</ind><dep>0.2</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-	</animation>
-
-	<animation>
-		<name>PAX left-back door pick</name>
-		<type>pick</type>
-		<object-name>DoorL4</object-name>
-		<object-name>DoorL4int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.doorl4, "doorl4", "PAX left-back");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>PAX left-back door x translate</name>
-		<type>translate</type>
-		<object-name>DoorL4</object-name>
-		<object-name>DoorL4int</object-name>
-		<property>sim/model/door-positions/doorl4/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>0</dep></entry>
-			<entry><ind>1</ind><dep>-1</dep></entry>
-		</interpolation>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-			<z>0</z>
-		</axis>
-	</animation>
-	<animation>
-		<name>PAX left-back door y translate</name>
-		<type>translate</type>
-		<object-name>DoorL4</object-name>
-		<object-name>DoorL4int</object-name>
-		<property>sim/model/door-positions/doorl4/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>-0.2</dep></entry>
-			<entry><ind>1</ind><dep>-0.2</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-	</animation>
-
-	<animation>
-		<name>PAX right-back door pick</name>
-		<type>pick</type>
-		<object-name>DoorR4</object-name>
-		<object-name>DoorR4int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.doorr4, "doorr4", "PAX right-back");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>PAX right-back door x translate</name>
-		<type>translate</type>
-		<object-name>DoorR4</object-name>
-		<object-name>DoorR4int</object-name>
-		<property>sim/model/door-positions/doorr4/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>0</dep></entry>
-			<entry><ind>1</ind><dep>-1</dep></entry>
-		</interpolation>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-			<z>0</z>
-		</axis>
-	</animation>
-	<animation>
-		<name>PAX right-back door y translate</name>
-		<type>translate</type>
-		<object-name>DoorR4</object-name>
-		<object-name>DoorR4int</object-name>
-		<property>sim/model/door-positions/doorr4/position-norm</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0</dep></entry>
-			<entry><ind>0.25</ind><dep>0.2</dep></entry>
-			<entry><ind>1</ind><dep>0.2</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-	</animation>
-
-	<!-- Cargo doors -->
-	<animation>
-		<name>Cargo forward door pick</name>
-		<type>pick</type>
-		<object-name>Cargo1</object-name>
-		<object-name>Cargo1int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.cargofwd, "cargofwd", "forward cargo");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Cargo forward door rotate</name>
-		<type>rotate</type>
-		<object-name>Cargo1</object-name>
-		<object-name>Cargo1int</object-name>
-		<property>sim/model/door-positions/cargofwd/position-norm</property>
-		<factor>150</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>0</x-m>
-			<y-m>1.92</y-m>
-			<z-m>-0.507</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Cargo aft door pick</name>
-		<type>pick</type>
-		<object-name>Cargo2</object-name>
-		<object-name>Cargo2int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.cargoaft, "cargoaft", "aft cargo");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Cargo aft door rotate</name>
-		<type>rotate</type>
-		<object-name>Cargo2</object-name>
-		<object-name>Cargo2int</object-name>
-		<property>sim/model/door-positions/cargoaft/position-norm</property>
-		<factor>150</factor>
-		<axis>
-			<x1-m>24.442</x1-m>
-			<y1-m>1.912</y1-m>
-			<z1-m>-0.507</z1-m>
-			<x2-m>26.022</x2-m>
-			<y2-m>1.914</y2-m>
-			<z2-m>-0.509</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<name>Cargo bulk door pick</name>
-		<type>pick</type>
-		<object-name>Cargo3</object-name>
-		<object-name>Cargo3int</object-name>
-		<action>
-			<button>0</button>
-			<repeatable type="bool">false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-				 libraries.triggerDoor(libraries.cargobulk, "cargobulk", "bulk cargo");
-				</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Cargo bulk door rotate</name>
-		<type>rotate</type>
-		<object-name>Cargo3</object-name>
-		<object-name>Cargo3int</object-name>
-		<property>sim/model/door-positions/cargobulk/position-norm</property>
-		<factor>150</factor>
-		<axis>
-			<x1-m>28.367</x1-m>
-			<y1-m>1.735</y1-m>
-			<z1-m>-0.972</z1-m>
-			<x2-m>29.166</x2-m>
-			<y2-m>1.702</y2-m>
-			<z2-m>-0.942</z2-m>
-		</axis>
-	</animation>
-
-	<!-- Animation for the doors of the main gears. -->
-	<animation>
-		<name>Main_Gear_Doors.Left</name>
-		<type>rotate</type>
-		<object-name>GearLDoor</object-name>
-		<property>gear/gear[1]/position-norm</property>
-		<interpolation>
-			<entry><ind>0.0</ind><dep>0.0</dep></entry>
-			<entry><ind>0.2</ind><dep>84.0</dep></entry>
-			<entry><ind>0.8</ind><dep>84.0</dep></entry>
-			<entry><ind>1.0</ind><dep>0.0</dep></entry>
-		</interpolation>
-		<center>
-			<y-m>-0.4646725</y-m>
-			<z-m>-2.3824937</z-m>
-		</center>
-		<axis>
-			<x>1</x>
-		</axis>
-	</animation>
-	
-	<animation>
-		<name>Main_Gear_Doors.Right</name>
-		<type>rotate</type>
-		<object-name>GearRDoor</object-name>
-		<property>gear/gear[2]/position-norm</property>
-		<interpolation>
-			<entry><ind>0.0</ind><dep>0.0</dep></entry>
-			<entry><ind>0.2</ind><dep>84.0</dep></entry>
-			<entry><ind>0.8</ind><dep>84.0</dep></entry>
-			<entry><ind>1.0</ind><dep>0.0</dep></entry>
-		</interpolation>
-		<center>
-			<y-m>0.4646725</y-m>
-			<z-m>-2.3824937</z-m>
-		</center>
-		<axis>
-			<x>-1</x>
-		</axis>
-	</animation>
-	
-	<!-- Animation for the doors of the nose gear. -->
-	<animation>
-		<name>Nose_Gear_Doors.Left.01</name>
-		<type>rotate</type>
-		<object-name>GearNFwdDoorL</object-name>
-		<property>gear/gear[0]/position-norm</property>
-		<interpolation>
-			<entry><ind>0.0z</ind><dep>0.0</dep></entry>
-			<entry><ind>0.2</ind><dep>90.0</dep></entry>
-			<entry><ind>0.8</ind><dep>90.0</dep></entry>
-			<entry><ind>1.0</ind><dep>0.0</dep></entry>
-		</interpolation>
-		<axis>
-			
-			<x1-m>7.599</x1-m>
-			<y1-m>-0.5</y1-m>
-			<z1-m>-2.0649564</z1-m>
-			
-			<x2-m>5.394</x2-m>
-			<y2-m>-0.5</y2-m>
-			<z2-m>-1.9179121</z2-m>
-			
-		</axis>
-	</animation>
-	
-	<animation>
-		<name>Nose_Gear_Doors.Left.02</name>
-		<type>rotate</type>
-		<object-name>GearNAftDoorL</object-name>
-		<property>gear/gear[0]/position-norm</property>
-		<interpolation>
-			<entry><ind>0.2</ind><dep>0.0</dep></entry>
-			<entry><ind>0.8</ind><dep>45.0</dep></entry>
-		</interpolation>
-		<axis>
-			
-			<x1-m>8.077</x1-m>
-			<y1-m>-0.5</y1-m>
-			<z1-m>-2.0790732</z1-m>
-			
-			<x2-m>7.599</x2-m>
-			<y2-m>-0.5</y2-m>
-			<z2-m>-2.0649564</z2-m>
-			
-		</axis>
-	</animation>
-	
-	<animation>
-		<name>Nose_Gear_Doors.Right.01</name>
-		<type>rotate</type>
-		<object-name>GearNFwdDoorR</object-name>
-		<property>gear/gear[0]/position-norm</property>
-		<interpolation>
-			<entry><ind>0.0</ind><dep>0.0</dep></entry>
-			<entry><ind>0.2</ind><dep>90.0</dep></entry>
-			<entry><ind>0.8</ind><dep>90.0</dep></entry>
-			<entry><ind>1.0</ind><dep>0.0</dep></entry>
-		</interpolation>
-		<axis>
-			<x1-m>5.394</x1-m>
-			<y1-m>0.5</y1-m>
-			<z1-m>-1.9179121</z1-m>
-			<x2-m>7.599</x2-m>
-			<y2-m>0.5</y2-m>
-			<z2-m>-2.0649564</z2-m>
-		</axis>
-	</animation>
-	
-	<animation>
-		<name>Nose_Gear_Doors.Right.02</name>
-		<type>rotate</type>
-		<object-name>GearNAftDoorR</object-name>
-		<property>gear/gear[0]/position-norm</property>
-		<interpolation>
-			<entry><ind>0.2</ind><dep>0.0</dep></entry>
-			<entry><ind>0.8</ind><dep>45.0</dep></entry>
-		</interpolation>
-		<axis>
-			<x1-m>7.599</x1-m>
-			<y1-m>0.5</y1-m>
-			<z1-m>-2.0649564</z1-m>
-			<x2-m>8.077</x2-m>
-			<y2-m>0.5</y2-m>
-			<z2-m>-2.0790732</z2-m>
-		</axis>
-	</animation>
-
-	<model>
-		<name>RAT</name>
-		<path>Aircraft/A320-family/Models/RAT/RAT.xml</path>
-		<offsets>
-			<x-m>18</x-m>
-			<y-m>-1</y-m>
-			<z-m>-2.9</z-m>
-		</offsets>
-	</model>
+	<path>res/A320-216.ac</path>
 
 </PropertyList>