diff --git a/A320-main.xml b/A320-main.xml
index 8a2278fc..e85efd5c 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -205,6 +205,15 @@
 							</script>
 						</binding>
 					</item>
+					<item>
+						<label>Ground Services</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							acconfig.groundservices_dlg.open();
+							</script>
+						</binding>
+					</item>
 					<item>
 						<label>Announcements</label>
 						<binding>
@@ -1239,6 +1248,8 @@
 			<file>Aircraft/IDG-A32X/Nasal/ADIRS.nas</file>
 			<file>Aircraft/IDG-A32X/Nasal/fire.nas</file>
 			<file>Aircraft/IDG-A32X/Nasal/brakes.nas</file>
+			<file>Aircraft/IDG-A32X/Nasal/ground_services.nas</file>
+			<file>Aircraft/IDG-A32X/Nasal/effects.nas</file>
 		</systems>
 		<thrust>
 			<file>Aircraft/IDG-A32X/Nasal/fadec-common.nas</file>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 277bc49d..98927561 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -96,6 +96,7 @@ var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/
 var about_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/about/dialog", "Aircraft/IDG-A32X/AircraftConfig/about.xml");
 var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircraft/IDG-A32X/AircraftConfig/update.xml");
 var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml");
+var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml");
 spinning.start();
 init_dlg.open();
 
diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml
new file mode 100644
index 00000000..8839fa3b
--- /dev/null
+++ b/AircraftConfig/groundservices.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+# modified by D-ECHO for Ground Services
+-->
+
+<!-- A3XX Ground Services Config Dialog -->
+
+<PropertyList>
+
+	<name>ground-services</name>
+	<layout>vbox</layout>
+	
+	<group>
+		<layout>hbox</layout>
+		<text>
+			<halign>left</halign>
+			<label>Ground Services</label>
+		</text>
+		<button>
+			<halign>right</halign>
+			<pref-width>20</pref-width>
+			<pref-height>20</pref-height>
+			<legend>X</legend>
+			<key>Esc</key>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+	</group>
+		
+		<vrule/>
+		
+		<group>
+			<layout>vbox</layout>
+
+			<checkbox>
+				<label>Enable De-icing Truck</label>
+				<halign>left</halign>
+				<property>/services/deicing_truck/enable</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+
+			<button>
+				<legend>De-ice Aircraft</legend>
+				<halign>center</halign>
+				<padding>5</padding>
+				<enable>
+					<property>/services/deicing_truck/enable</property>
+				</enable>
+				<binding>
+					<command>property-assign</command>
+					<property>/services/deicing_truck/de-ice</property>
+					<value>1</value>
+				</binding>
+			</button>
+			
+			<checkbox>
+				<label>Enable Fuel Truck</label>
+				<halign>left</halign>
+				<enable>
+					<not><property>/services/fuel-truck/connect</property></not>
+				</enable>
+				<property>/services/fuel-truck/enable</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Connect Fuel Truck</label>
+				<halign>left</halign>
+				<enable>
+					<property>/services/fuel-truck/enable</property>
+				</enable>
+				<property>/services/fuel-truck/connect</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Enable Catering Truck</label>
+				<halign>left</halign>
+				<property>/services/catering/enable</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+
+			<button>
+				<legend>Toggle Catering</legend>
+				<halign>center</halign>
+				<padding>5</padding>
+				<enable>
+					<property>/services/catering/enable</property>
+				</enable>
+				<binding>
+					<condition>
+						<less-than>
+							<property>/services/catering/position-norm</property>
+							<value>0.1</value>
+						</less-than>
+					</condition><command>property-interpolate</command>
+					<property>/services/catering/position-norm</property>
+					<value>0.68</value>
+					<time>5</time>
+				</binding>
+				<binding>
+					<condition>
+						<greater-than-equals>
+							<property>/services/catering/position-norm</property>
+							<value>0.1</value>
+						</greater-than-equals>
+					</condition><command>property-interpolate</command>
+					<property>/services/catering/position-norm</property>
+					<value>0.0</value>
+					<time>5</time>
+				</binding>
+			</button>
+			
+			<checkbox>
+				<label>Enable Baggage Ramp</label>
+				<halign>left</halign>
+				<property>/services/baggage/enable</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<hrule/>
+			
+			<text>
+				<label>Stairways</label>
+			</text>
+			
+			<checkbox>
+				<label>Front Left</label>
+				<halign>left</halign>
+				<property>/services/stairs/l1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Rear Left</label>
+				<halign>left</halign>
+				<property>/services/stairs/l4</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Stairway cover</label>
+				<halign>left</halign>
+				<property>/services/stairs/cover</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<hrule/>
+			
+			<text>
+				<label>Wheel chockes</label>
+			</text>
+			
+			<checkbox>
+				<label>Nose Gear</label>
+				<halign>left</halign>
+				<property>/services/chokes/nose</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Main Left Gear</label>
+				<halign>left</halign>
+				<property>/services/chokes/left</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Main Right Gear</label>
+				<halign>left</halign>
+				<property>/services/chokes/right</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<hrule/>
+			<text>
+				<label>Ground Power</label>
+			</text>
+			
+			<checkbox>
+				<label>Enable External Power Box</label>
+				<halign>left</halign>
+				<property>/controls/switches/cart</property>
+				<binding>
+					<command>property-assign</command>
+					<property>/controls/electrical/switches/gen-ext</property>
+					<value>0</value>
+				</binding>
+				<enable>
+					<and>
+					<equals>
+						<property>/controls/gear/brake-parking</property>
+						<value>1</value>
+					</equals>
+					<less-than>
+						<property>/velocities/groundspeed-kt</property>
+						<value>2</value>
+					</less-than>
+					</and>
+				</enable>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Enable External Air</label>
+				<halign>left</halign>
+				<property>/controls/pneumatic/switches/groundair</property>
+				<binding>
+					<command>property-toggle</command>
+					<property>/controls/pneumatic/switches/groundair</property>
+				</binding>
+				<enable>
+					<and>
+					<equals>
+						<property>/controls/gear/brake-parking</property>
+						<value>1</value>
+					</equals>
+					<less-than>
+						<property>/velocities/groundspeed-kt</property>
+						<value>2</value>
+					</less-than>
+					</and>
+				</enable>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+		</group>
+		
+	</group>
+	
+</PropertyList>
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 3c5cde60..899949fd 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -186,129 +186,18 @@
 		<group>
 			<layout>vbox</layout>
 
-			<checkbox>
-				<label>Enable De-icing Truck</label>
-				<halign>left</halign>
-				<property>/services/deicing_truck/enable</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-
 			<button>
-				<legend>De-ice Aircraft</legend>
+				<legend>Ground Services</legend>
 				<halign>center</halign>
 				<padding>5</padding>
-				<enable>
-					<property>/services/deicing_truck/enable</property>
-				</enable>
 				<binding>
 					<command>nasal</command>
 					<script>
-					gui.popupTip("The Aircraft was De-iced!");
+							acconfig.groundservices_dlg.open();
 					</script>
 				</binding>
 			</button>
 			
-			<checkbox>
-				<label>Enable Fuel Truck</label>
-				<halign>left</halign>
-				<enable>
-					<not><property>/services/fuel-truck/connect</property></not>
-				</enable>
-				<property>/services/fuel-truck/enable</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Connect Fuel Truck</label>
-				<halign>left</halign>
-				<enable>
-					<property>/services/fuel-truck/enable</property>
-				</enable>
-				<property>/services/fuel-truck/connect</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Enable Catering Truck</label>
-				<halign>left</halign>
-				<property>/services/catering/enable</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Enable Baggage Ramp</label>
-				<halign>left</halign>
-				<property>/services/baggage/enable</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Enable External Power Box</label>
-				<halign>left</halign>
-				<property>/controls/switches/cart</property>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/electrical/switches/gen-ext</property>
-					<value>0</value>
-				</binding>
-				<enable>
-					<and>
-					<equals>
-						<property>/controls/gear/brake-parking</property>
-						<value>1</value>
-					</equals>
-					<less-than>
-						<property>/velocities/groundspeed-kt</property>
-						<value>2</value>
-					</less-than>
-					</and>
-				</enable>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Enable External Air</label>
-				<halign>left</halign>
-				<property>/controls/pneumatic/switches/groundair</property>
-				<binding>
-					<command>property-toggle</command>
-					<property>/controls/pneumatic/switches/groundair</property>
-				</binding>
-				<enable>
-					<and>
-					<equals>
-						<property>/controls/gear/brake-parking</property>
-						<value>1</value>
-					</equals>
-					<less-than>
-						<property>/velocities/groundspeed-kt</property>
-						<value>2</value>
-					</less-than>
-					</and>
-				</enable>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
 			
 			<checkbox>
 				<label>Yellow HYD Hand Pump</label>
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index 3603e871..9c74d928 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -330,197 +330,10 @@
 		</unload>
 	</nasal>
     
-    <!-- Fuel Truck -->
-    
-    <model>
-        <name>fuel-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>31</x-m>
-			<y-m>-25</y-m>
-			<z-m>0.95</z-m>
-        </offsets>
-    </model>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>1</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe_disconnected</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>0</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <!-- De-icing Truck -->
-    
-    <model>
-        <name>de-ice-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
-        <condition>
-            <equals>
-                <property>services/deicing_truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>-3</x-m>
-            <y-m>9.5</y-m>
-            <z-m>-4</z-m>
-            <heading-deg>160</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Catering Truck - 1st door -->
-    
-    <model>
-        <name>cater-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
-        <condition>
-            <equals>
-                <property>services/catering/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>7.87</x-m>
-            <y-m>7.28</y-m>
-            <z-m>-3.70</z-m>
-            <heading-deg>100</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Baggage Truck -->
-    
-    <model>
-        <name>baggage-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Baggage/cargo_ramp.ac</path>
-        <condition>
-            <equals>
-                <property>services/baggage/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-		<offsets>
-			<x-m>11</x-m>
-			<y-m>0</y-m>
-			<z-m>0.5</z-m>            
-		</offsets>
-    </model>
-    
-    <!-- External Power -->
-    
-    <model>
-        <name>ext-pwr</name>
-        <path>Aircraft/IDG-A32X/Models/Services/External-Power/ext-pwr-box.ac</path>
-        <condition>
-            <equals>
-                <property>controls/switches/cart</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>5</x-m>
-			<y-m>2</y-m>
-			<z-m>0.5</z-m>
-        </offsets>
-    </model>
-    
-    <!-- Chocks -->
-    
-    <model>
-        <name>chock_nose</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_nose.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/nose</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>23.5</x-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_left</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_left.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/left</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_right</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_right.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/right</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>-1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    <!-- Stairways -->
-    
-
+	<!-- Ground Services -->    
 	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l1</name>
-	 <offsets>
-	  <x-m>7.94</x-m>
-	  <y-m>-0.1</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>-8</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l1</property>
-	 </condition>
-	</model>
-
-	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l4</name>
-	 <offsets>
-	  <x-m>31.94</x-m>
-	  <y-m>0.4</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>6</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l4</property>
-	 </condition>
+		<name>ground_services</name>
+		<path>Aircraft/IDG-A32X/Models/A320-groundservices.xml</path>
 	</model>
 
 	<animation>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index d33e8335..3012600e 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -359,197 +359,10 @@
 		</unload>
 	</nasal>
     
-    <!-- Fuel Truck -->
-    
-    <model>
-        <name>fuel-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>31</x-m>
-			<y-m>-25</y-m>
-			<z-m>0.95</z-m>
-        </offsets>
-    </model>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>1</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe_disconnected</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>0</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <!-- De-icing Truck -->
-    
-    <model>
-        <name>de-ice-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
-        <condition>
-            <equals>
-                <property>services/deicing_truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>-3</x-m>
-            <y-m>9.5</y-m>
-            <z-m>-4</z-m>
-            <heading-deg>160</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Catering Truck - 1st door -->
-    
-    <model>
-        <name>cater-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
-        <condition>
-            <equals>
-                <property>services/catering/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>7.87</x-m>
-            <y-m>7.28</y-m>
-            <z-m>-3.70</z-m>
-            <heading-deg>100</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Baggage Truck -->
-    
-    <model>
-        <name>baggage-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Baggage/cargo_ramp.ac</path>
-        <condition>
-            <equals>
-                <property>services/baggage/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-		<offsets>
-			<x-m>11</x-m>
-			<y-m>0</y-m>
-			<z-m>0.5</z-m>            
-		</offsets>
-    </model>
-    
-    <!-- External Power -->
-    
-    <model>
-        <name>ext-pwr</name>
-        <path>Aircraft/IDG-A32X/Models/Services/External-Power/ext-pwr-box.ac</path>
-        <condition>
-            <equals>
-                <property>controls/switches/cart</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>5</x-m>
-			<y-m>2</y-m>
-			<z-m>0.5</z-m>
-        </offsets>
-    </model>
-    
-    <!-- Chocks -->
-    
-    <model>
-        <name>chock_nose</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_nose.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/nose</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>23.5</x-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_left</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_left.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/left</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_right</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_right.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/right</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>-1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    <!-- Stairways -->
-    
-
+	<!-- Ground Services -->    
 	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l1</name>
-	 <offsets>
-	  <x-m>7.94</x-m>
-	  <y-m>-0.1</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>-8</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l1</property>
-	 </condition>
-	</model>
-
-	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l4</name>
-	 <offsets>
-	  <x-m>31.94</x-m>
-	  <y-m>0.4</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>6</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l4</property>
-	 </condition>
+		<name>ground_services</name>
+		<path>Aircraft/IDG-A32X/Models/A320-groundservices.xml</path>
 	</model>
 
 	<animation>
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 5bb42842..1416cd56 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -358,197 +358,11 @@
 		</unload>
 	</nasal>
     
-    <!-- Fuel Truck -->
     
-    <model>
-        <name>fuel-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>31</x-m>
-			<y-m>-25</y-m>
-			<z-m>0.95</z-m>
-        </offsets>
-    </model>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>1</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe_disconnected</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>0</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <!-- De-icing Truck -->
-    
-    <model>
-        <name>de-ice-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
-        <condition>
-            <equals>
-                <property>services/deicing_truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>-3</x-m>
-            <y-m>9.5</y-m>
-            <z-m>-4</z-m>
-            <heading-deg>160</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Catering Truck - 1st door -->
-    
-    <model>
-        <name>cater-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
-        <condition>
-            <equals>
-                <property>services/catering/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>7.87</x-m>
-            <y-m>7.28</y-m>
-            <z-m>-3.70</z-m>
-            <heading-deg>100</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Baggage Truck -->
-    
-    <model>
-        <name>baggage-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Baggage/cargo_ramp.ac</path>
-        <condition>
-            <equals>
-                <property>services/baggage/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-		<offsets>
-			<x-m>11</x-m>
-			<y-m>0</y-m>
-			<z-m>0.5</z-m>            
-		</offsets>
-    </model>
-    
-    <!-- External Power -->
-    
-    <model>
-        <name>ext-pwr</name>
-        <path>Aircraft/IDG-A32X/Models/Services/External-Power/ext-pwr-box.ac</path>
-        <condition>
-            <equals>
-                <property>services/ext-pwr/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>5</x-m>
-			<y-m>2</y-m>
-			<z-m>0.5</z-m>
-        </offsets>
-    </model>
-    
-    <!-- Chocks -->
-    
-    <model>
-        <name>chock_nose</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_nose.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/nose</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>23.5</x-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_left</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_left.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/left</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_right</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_right.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/right</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>-1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    <!-- Stairways -->
-    
-
+	<!-- Ground Services -->    
 	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l1</name>
-	 <offsets>
-	  <x-m>7.94</x-m>
-	  <y-m>-0.1</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>-8</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l1</property>
-	 </condition>
-	</model>
-
-	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l4</name>
-	 <offsets>
-	  <x-m>31.94</x-m>
-	  <y-m>0.4</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>6</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l4</property>
-	 </condition>
+		<name>ground_services</name>
+		<path>Aircraft/IDG-A32X/Models/A320-groundservices.xml</path>
 	</model>
 
 	<animation>
diff --git a/Models/A320-groundservices.xml b/Models/A320-groundservices.xml
new file mode 100644
index 00000000..4ec831e7
--- /dev/null
+++ b/Models/A320-groundservices.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+# modified ground services (D-ECHO)
+-->
+
+<PropertyList>
+	<name>A320-groundservices</name>
+    
+    <!-- Fuel Truck -->
+    
+    <model>
+        <name>fuel-truck</name>
+        <path>Aircraft/IDG-A32X/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
+        <condition>
+            <equals>
+                <property>services/fuel-truck/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+			<x-m>26.11094</x-m>
+			<y-m>-29.16832</y-m>
+			<z-m>0.95</z-m>
+			<heading-deg>170</heading-deg>
+        </offsets>
+    </model>
+    
+    <animation>
+        <type>select</type>
+        <object-name>fuel_pipe</object-name>
+        <condition>
+            <equals>
+                <property>services/fuel-truck/connect</property>
+                <value>1</value>
+            </equals>
+        </condition>
+    </animation>
+    
+    <animation>
+        <type>select</type>
+        <object-name>fuel_pipe_disconnected</object-name>
+        <condition>
+            <equals>
+                <property>services/fuel-truck/connect</property>
+                <value>0</value>
+            </equals>
+        </condition>
+    </animation>
+    
+    <!-- De-icing Truck -->
+    
+    <model>
+        <name>de-ice-truck</name>
+        <path>Aircraft/IDG-A32X/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
+        <condition>
+            <equals>
+                <property>services/deicing_truck/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>-3</x-m>
+            <y-m>9.5</y-m>
+            <z-m>-4</z-m>
+            <heading-deg>160</heading-deg>
+        </offsets>
+    </model>
+    
+    <!-- Catering Truck - 1st door -->
+    
+    <model>
+        <name>cater-truck</name>
+        <path>Aircraft/IDG-A32X/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
+        <condition>
+            <equals>
+                <property>services/catering/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>6.84</x-m>
+            <y-m>6.62</y-m>
+            <z-m>-4.1</z-m>
+            <heading-deg>93.412</heading-deg>
+        </offsets>
+    </model>
+    
+    <!-- Baggage Truck -->
+    
+    <model>
+        <name>baggage-truck</name>
+        <path>Aircraft/IDG-A32X/Models/Services/Baggage/cargo_ramp.ac</path>
+        <condition>
+            <equals>
+                <property>services/baggage/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+		<offsets>
+			<x-m>9.52482</x-m>
+			<y-m>0</y-m>
+			<z-m>0.5</z-m>            
+		</offsets>
+    </model>
+    
+    <!-- External Power -->
+    
+    <model>
+        <name>ext-pwr</name>
+        <path>Aircraft/IDG-A32X/Models/Services/External-Power/ext-pwr-box.ac</path>
+        <condition>
+            <equals>
+                <property>controls/switches/cart</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+			<x-m>5</x-m>
+			<y-m>2</y-m>
+			<z-m>0.5</z-m>
+        </offsets>
+    </model>
+    
+    <!-- Chocks -->
+    
+    <model>
+        <name>chock_nose</name>
+        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_nose.ac</path>
+        <condition>
+            <equals>
+                <property>services/chokes/nose</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>23.5</x-m>
+            <z-m>1.25</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <name>chock_left</name>
+        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_left.ac</path>
+        <condition>
+            <equals>
+                <property>services/chokes/left</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>15.5</x-m>
+            <y-m>1.18</y-m>
+            <z-m>1.25</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <name>chock_right</name>
+        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_right.ac</path>
+        <condition>
+            <equals>
+                <property>services/chokes/right</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>15.5</x-m>
+            <y-m>-1.18</y-m>
+            <z-m>1.25</z-m>
+        </offsets>
+    </model>
+    <!-- Stairways -->
+    
+
+	<model>
+	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
+	 <name>l1</name>
+	 <offsets>
+	  <x-m>7.94</x-m>
+	  <y-m>-0.1</y-m>
+	  <z-m>-0.6</z-m>
+	  <heading-deg>-8</heading-deg>
+	 </offsets>
+	 <condition>
+	  <property>services/stairs/l1</property>
+	 </condition>
+	</model>
+
+	<model>
+	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
+	 <name>l4</name>
+	 <offsets>
+	  <x-m>31.94</x-m>
+	  <y-m>0.4</y-m>
+	  <z-m>-0.6</z-m>
+	  <heading-deg>6</heading-deg>
+	 </offsets>
+	 <condition>
+	  <property>services/stairs/l4</property>
+	 </condition>
+	</model>
+
+	
+</PropertyList>
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index 4339a422..8d3ebe25 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -339,197 +339,11 @@
 		</unload>
 	</nasal>
     
-    <!-- Fuel Truck -->
     
-    <model>
-        <name>fuel-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>31</x-m>
-			<y-m>-25</y-m>
-			<z-m>0.95</z-m>
-        </offsets>
-    </model>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>1</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe_disconnected</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>0</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <!-- De-icing Truck -->
-    
-    <model>
-        <name>de-ice-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
-        <condition>
-            <equals>
-                <property>services/deicing_truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>-3</x-m>
-            <y-m>9.5</y-m>
-            <z-m>-4</z-m>
-            <heading-deg>160</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Catering Truck - 1st door -->
-    
-    <model>
-        <name>cater-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
-        <condition>
-            <equals>
-                <property>services/catering/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>7.87</x-m>
-            <y-m>7.28</y-m>
-            <z-m>-3.70</z-m>
-            <heading-deg>100</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Baggage Truck -->
-    
-    <model>
-        <name>baggage-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Baggage/cargo_ramp.ac</path>
-        <condition>
-            <equals>
-                <property>services/baggage/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-		<offsets>
-			<x-m>11</x-m>
-			<y-m>0</y-m>
-			<z-m>0.5</z-m>            
-		</offsets>
-    </model>
-    
-    <!-- External Power -->
-    
-    <model>
-        <name>ext-pwr</name>
-        <path>Aircraft/IDG-A32X/Models/Services/External-Power/ext-pwr-box.ac</path>
-        <condition>
-            <equals>
-                <property>controls/switches/cart</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>5</x-m>
-			<y-m>2</y-m>
-			<z-m>0.5</z-m>
-        </offsets>
-    </model>
-    
-    <!-- Chocks -->
-    
-    <model>
-        <name>chock_nose</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_nose.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/nose</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>23.5</x-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_left</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_left.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/left</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_right</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_right.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/right</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>-1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    <!-- Stairways -->
-    
-
+	<!-- Ground Services -->    
 	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l1</name>
-	 <offsets>
-	  <x-m>7.94</x-m>
-	  <y-m>-0.1</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>-8</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l1</property>
-	 </condition>
-	</model>
-
-	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l4</name>
-	 <offsets>
-	  <x-m>31.94</x-m>
-	  <y-m>0.4</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>6</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l4</property>
-	 </condition>
+		<name>ground_services</name>
+		<path>Aircraft/IDG-A32X/Models/A320-groundservices.xml</path>
 	</model>
 
 	<animation>
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index b5d45e12..e9b33d6a 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -346,197 +346,10 @@
 		</unload>
 	</nasal>
     
-    <!-- Fuel Truck -->
-    
-    <model>
-        <name>fuel-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>31</x-m>
-			<y-m>-25</y-m>
-			<z-m>0.95</z-m>
-        </offsets>
-    </model>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>1</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <animation>
-        <type>select</type>
-        <object-name>fuel_pipe_disconnected</object-name>
-        <condition>
-            <equals>
-                <property>services/fuel-truck/connect</property>
-                <value>0</value>
-            </equals>
-        </condition>
-    </animation>
-    
-    <!-- De-icing Truck -->
-    
-    <model>
-        <name>de-ice-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
-        <condition>
-            <equals>
-                <property>services/deicing_truck/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>-3</x-m>
-            <y-m>9.5</y-m>
-            <z-m>-4</z-m>
-            <heading-deg>160</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Catering Truck - 1st door -->
-    
-    <model>
-        <name>cater-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
-        <condition>
-            <equals>
-                <property>services/catering/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>7.87</x-m>
-            <y-m>7.28</y-m>
-            <z-m>-3.70</z-m>
-            <heading-deg>100</heading-deg>
-        </offsets>
-    </model>
-    
-    <!-- Baggage Truck -->
-    
-    <model>
-        <name>baggage-truck</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Baggage/cargo_ramp.ac</path>
-        <condition>
-            <equals>
-                <property>services/baggage/enable</property>
-                <value>1</value>
-            </equals>
-        </condition>
-		<offsets>
-			<x-m>11</x-m>
-			<y-m>0</y-m>
-			<z-m>0.5</z-m>            
-		</offsets>
-    </model>
-    
-    <!-- External Power -->
-    
-    <model>
-        <name>ext-pwr</name>
-        <path>Aircraft/IDG-A32X/Models/Services/External-Power/ext-pwr-box.ac</path>
-        <condition>
-            <equals>
-                <property>controls/switches/cart</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-			<x-m>5</x-m>
-			<y-m>2</y-m>
-			<z-m>0.5</z-m>
-        </offsets>
-    </model>
-    
-    <!-- Chocks -->
-    
-    <model>
-        <name>chock_nose</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_nose.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/nose</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>23.5</x-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_left</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_left.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/left</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    
-    <model>
-        <name>chock_right</name>
-        <path>Aircraft/IDG-A32X/Models/Services/Chocks/chock_right.ac</path>
-        <condition>
-            <equals>
-                <property>services/chokes/right</property>
-                <value>1</value>
-            </equals>
-        </condition>
-        <offsets>
-            <x-m>15.5</x-m>
-            <y-m>-1.18</y-m>
-            <z-m>1.25</z-m>
-        </offsets>
-    </model>
-    <!-- Stairways -->
-    
-
+	<!-- Ground Services -->    
 	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l1</name>
-	 <offsets>
-	  <x-m>7.94</x-m>
-	  <y-m>-0.1</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>-8</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l1</property>
-	 </condition>
-	</model>
-
-	<model>
-	 <path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
-	 <name>l4</name>
-	 <offsets>
-	  <x-m>31.94</x-m>
-	  <y-m>0.4</y-m>
-	  <z-m>-0.6</z-m>
-	  <heading-deg>6</heading-deg>
-	 </offsets>
-	 <condition>
-	  <property>services/stairs/l4</property>
-	 </condition>
+		<name>ground_services</name>
+		<path>Aircraft/IDG-A32X/Models/A320-groundservices.xml</path>
 	</model>
 
 	<animation>
diff --git a/Models/Liveries/A320/CFM/RZO.png b/Models/Liveries/A320/CFM/RZO.png
new file mode 100644
index 00000000..0caf6af6
Binary files /dev/null and b/Models/Liveries/A320/CFM/RZO.png differ
diff --git a/Models/Liveries/A320/CFM/RZO.xml b/Models/Liveries/A320/CFM/RZO.xml
new file mode 100644
index 00000000..c6e882e4
--- /dev/null
+++ b/Models/Liveries/A320/CFM/RZO.xml
@@ -0,0 +1,16 @@
+<PropertyList>
+  <sim>
+    <model>
+      <livery>
+        <name type="string">Sata Internacional</name>
+            <texture>Liveries/A320/CFM/RZO.png</texture>
+      </livery>    
+    </model>
+  </sim>
+  
+	<options>
+		<EIS2 type="bool">1</EIS2>
+	</options>
+  
+	<sharklet type="bool">0</sharklet>
+</PropertyList>
diff --git a/Models/Liveries/A320/CFM/RZO2.png b/Models/Liveries/A320/CFM/RZO2.png
new file mode 100644
index 00000000..156ecbba
Binary files /dev/null and b/Models/Liveries/A320/CFM/RZO2.png differ
diff --git a/Models/Liveries/A320/CFM/RZO2.xml b/Models/Liveries/A320/CFM/RZO2.xml
new file mode 100644
index 00000000..5bbe01b6
--- /dev/null
+++ b/Models/Liveries/A320/CFM/RZO2.xml
@@ -0,0 +1,16 @@
+<PropertyList>
+  <sim>
+    <model>
+      <livery>
+        <name type="string">Azores Airlines</name>
+            <texture>Liveries/A320/CFM/RZO2.png</texture>
+      </livery>    
+    </model>
+  </sim>
+  
+	<options>
+		<EIS2 type="bool">1</EIS2>
+	</options>
+  
+	<sharklet type="bool">0</sharklet>
+</PropertyList>
diff --git a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml
index dafa9548..8e98dee2 100644
--- a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml
+++ b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml
@@ -54,7 +54,7 @@
 		<type>translate</type>
 		<object-name>pistons_left</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.0 </ind><dep>  0.00 </dep></entry>
@@ -75,7 +75,7 @@
 		<type>translate</type>
 		<object-name>pistons_right</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.0 </ind><dep>  0.00 </dep></entry>
@@ -97,7 +97,7 @@
 		<object-name>piston_02_left</object-name>
 		<object-name>piston_02_right</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.0 </ind><dep>  0.00 </dep></entry>
@@ -120,7 +120,7 @@
 		<type>translate</type>
 		<object-name>cargo_box_all</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.0 </ind><dep>  0.00 </dep></entry>
@@ -141,7 +141,7 @@
 		<type>translate</type>
 		<object-name>platform</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.00 </ind><dep> 0.00 </dep></entry>
@@ -163,7 +163,7 @@
 		<type>rotate</type>
 		<object-name>arm_top</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.00 </ind><dep>  0.00 </dep></entry>
@@ -184,7 +184,7 @@
 		<type>rotate</type>
 		<object-name>arm_bottom</object-name>
 		<!--<property>sim/signals/fdm-initialized</property>-->
-		<property>sim/model/door-positions/cater_pos/position-norm</property>
+		<property>services/catering/position-norm</property>
 			<factor>1</factor>
 			<interpolation>
 				<entry><ind> 0.00 </ind><dep>   0.00 </dep></entry>
@@ -248,7 +248,7 @@
 	<path>warning-light.xml</path>
 		<condition>
 			<greater-than>
-				<property>sim/model/door-positions/cater_pos/position-norm</property>
+				<property>services/catering/position-norm</property>
 				<value>0.01</value>
 			</greater-than>
 		</condition>
@@ -265,7 +265,7 @@
 		<object-name>warning_light_glass</object-name>
 			<condition>
 			<greater-than>
-				<property>sim/model/door-positions/cater_pos/position-norm</property>
+				<property>services/catering/position-norm</property>
 				<value>0.01</value>
 			</greater-than>
 		</condition>
diff --git a/Nasal/effects.nas b/Nasal/effects.nas
new file mode 100644
index 00000000..f4816f26
--- /dev/null
+++ b/Nasal/effects.nas
@@ -0,0 +1,4 @@
+ #============================ Tyre Smoke ===================================
+ aircraft.tyresmoke_system.new(0, 1, 2);
+ 
+aircraft.rain.init(); 
diff --git a/Nasal/ground_services.nas b/Nasal/ground_services.nas
new file mode 100644
index 00000000..811f6765
--- /dev/null
+++ b/Nasal/ground_services.nas
@@ -0,0 +1,117 @@
+# adapted from 787-8 (omega)
+
+
+var door = aircraft.door.new("/services/deicing_truck/crane", 20);
+var door3 = aircraft.door.new("/services/deicing_truck/deicing", 20);
+
+var ground_services = {
+	init : func {
+		me.UPDATE_INTERVAL = 0.1;
+	me.loopid = 0;
+	
+	me.ice_time = 0;
+	
+	# Catering Truck
+	
+	setprop("/services/catering/scissor-deg", 0);
+	setprop("/services/catering/position-norm", 0);
+	
+	# De-icing Truck
+	
+	setprop("/services/deicing_truck/enable", 0);
+	setprop("/services/deicing_truck/de-ice", 0);
+	
+	# Set them all to 0 if the aircraft is not stationary
+	
+	if (getprop("/velocities/groundspeed-kt") > 10) {
+		setprop("/services/chokes/nose", 0);
+		setprop("/services/chokes/left", 0);
+		setprop("/services/chokes/right", 0);
+		setprop("/services/fuel-truck/enable", 0);
+		setprop("/services/ext-pwr/enable", 0);
+		setprop("/services/deicing_truck/enable", 0);
+		setprop("/services/catering/enable", 0);
+	}
+
+	me.reset();
+	},
+	update : func {
+	
+		# Chokes and Parking Brakes Control
+		
+	#	if ((getprop("/services/chokes/nose") == 1) or (getprop("/services/chokes/left") == 1) or (getprop("/services/chokes/right") == 1) or (getprop("/controls/parking-brake") == 1))
+	#		setprop("/controls/gear/brake-parking", 1);
+	#	else
+	#		setprop("/controls/gear/brake-parking", 0);
+			
+	
+		# Catering Truck Controls
+		
+		var cater_pos = getprop("/services/catering/position-norm");
+		
+		var scissor_deg = 3.325 * (1/D2R) * math.asin(cater_pos / (2 * 3.6612));
+		
+		setprop("/services/catering/scissor-deg", scissor_deg);
+		
+			
+		
+		# De-icing Truck
+		
+		if (getprop("/services/deicing_truck/enable") and getprop("/services/deicing_truck/de-ice"))
+		{
+		
+			if (me.ice_time == 2){
+				door.move(1);
+				ground_message ("Lifting De-icing Crane...");
+			}
+			
+			if (me.ice_time == 220){
+				door3.move(1);
+				ground_message ("Starting De-icing Process...");
+			}
+			
+			if (me.ice_time == 420){
+				door3.move(0);
+				ground_message ("De-icing Process Completed...");
+			}
+				
+			if (me.ice_time == 650){
+				door.move(0);
+				ground_message ("Lowering De-icing Crane...");
+			}
+			
+			if (me.ice_time == 900) {
+				ground_message("De-icing Completed!", 1, 1, 1);
+				setprop("/services/deicing_truck/de-ice", 0);
+				setprop("/controls/ice/wing/temp", 30);
+				setprop("/controls/ice/wing/eng1", 30);
+				setprop("/controls/ice/wing/eng2", 30);
+			}
+		
+		} else 
+			me.ice_time = 0;
+		
+		
+	me.ice_time += 1;
+	
+	},
+	reset : func {
+		me.loopid += 1;
+		me._loop_(me.loopid);
+	},
+	_loop_ : func(id) {
+		id == me.loopid or return;
+		me.update();
+		settimer(func { me._loop_(id); }, me.UPDATE_INTERVAL);
+	}
+};
+
+var ground_message = func (string) {
+	setprop("/sim/messages/ground", string);
+}
+
+
+setlistener("sim/signals/fdm-initialized", func {
+	ground_services.init();
+	print("Ground Services ..... Initialized");
+});