diff --git a/Aircraft/c172-3d-set.xml b/Aircraft/c172-3d-set.xml
index 8a6b14e06..e7a2436ee 100644
--- a/Aircraft/c172-3d-set.xml
+++ b/Aircraft/c172-3d-set.xml
@@ -20,6 +20,12 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <flight-model archive="y">jsb</flight-model>
   <aero archive="y">c172r</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
    <audible archive="y">true</audible>
diff --git a/Aircraft/c172-3d-yasim-set.xml b/Aircraft/c172-3d-yasim-set.xml
index fbacebc2e..d966502b6 100644
--- a/Aircraft/c172-3d-yasim-set.xml
+++ b/Aircraft/c172-3d-yasim-set.xml
@@ -20,6 +20,12 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <flight-model archive="y">yasim</flight-model>
   <aero archive="y">c172</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
    <audible archive="y">true</audible>
@@ -48,7 +54,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
   </current-view>
 
  </sim>
-  
+
  <autopilot>
    <config>
      <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
@@ -56,7 +62,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
      <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
      <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
      <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution> 
+     <integral-contribution type="float">0.01</integral-contribution>
      <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
      <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
    </config>
@@ -73,9 +79,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
   </fuel>
  </consumables>
 
-<!--
+
  <controls>
-  <aileron-trim>-0.055</aileron-trim>
   <magnetos>3</magnetos>
  </controls>
 
@@ -84,8 +89,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
    <rpm>700</rpm>
   </engine>
  </engines>
--->
-  
+
+
 </PropertyList>
 
 
diff --git a/Aircraft/c172-610x-set.xml b/Aircraft/c172-610x-set.xml
index 209304303..76a9439f9 100644
--- a/Aircraft/c172-610x-set.xml
+++ b/Aircraft/c172-610x-set.xml
@@ -17,22 +17,28 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <description>Cessna 172 with a full screen, hi-res panel</description>
  
   <!-- We want to be able to specify the flight model independently -->
-  <!-- <flight-model>jsb</flight-model> -->
-  <!-- <aero>c172</aero> -->
+  <!-- <flight-model archive="y">jsb</flight-model> -->
+  <!-- <aero archive="y">c172</aero> -->
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
    <path>Aircraft/c172/Panels/c172-610x-panel.xml</path>
-   <visibility>true</visibility>
+   <visibility archive="y">true</visibility>
    <flip-x>false</flip-x>
   </panel>
 
   <model>
-   <path>Aircraft/c172/Models/c172-dpm.xml</path>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
   </model>
 
  </sim>
diff --git a/Aircraft/c172-ifr-set.xml b/Aircraft/c172-ifr-set.xml
index b0ca02b0b..d5b8546e9 100644
--- a/Aircraft/c172-ifr-set.xml
+++ b/Aircraft/c172-ifr-set.xml
@@ -16,8 +16,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <description>Cessna 172 in IFR configuration</description>
  
-  <flight-model>jsb</flight-model>
-  <aero>c172r</aero>
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172r</aero>
 
   <systems>
     <electrical>
@@ -26,13 +26,13 @@ October 23 2001 John Check, fgpanels@rockfish.net
   </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
    <path>Aircraft/c172/Panels/c172-ifr-panel.xml</path>
-   <visibility>true</visibility>
+   <visibility archive="y">true</visibility>
   </panel>
   <panel_2>
    <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
@@ -40,14 +40,14 @@ October 23 2001 John Check, fgpanels@rockfish.net
   
 
   <model>
-   <path>Aircraft/c172/Models/c172-dpm.xml</path>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
   </model>
 
    <current-view>
     <pitch-offset-deg>-8</pitch-offset-deg>
    </current-view>
 
-</sim>
+ </sim>
   
  <autopilot>
    <config>
@@ -74,9 +74,11 @@ October 23 2001 John Check, fgpanels@rockfish.net
  </consumables>
 
  <controls>
+  <!--
   <aileron-trim>-0.117</aileron-trim>
   <elevator-trim>0</elevator-trim>
   <rudder-trim>0</rudder-trim>
+  -->
   <magnetos>3</magnetos>
  </controls>
 
diff --git a/Aircraft/c172-set.xml b/Aircraft/c172-set.xml
index 4c00fe86a..d4a0a1867 100644
--- a/Aircraft/c172-set.xml
+++ b/Aircraft/c172-set.xml
@@ -16,8 +16,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <description>Cessna 172</description>
  
-  <flight-model>jsb</flight-model>
-  <aero>c172r</aero>
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172r</aero>
 
   <systems>
     <electrical>
@@ -26,20 +26,20 @@ October 23 2001 John Check, fgpanels@rockfish.net
   </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
    <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
+   <visibility archive="y">true</visibility>
   </panel>
   <panel_2>
    <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
   </panel_2>
 
   <model>
-   <path>Aircraft/c172/Models/c172-dpm.xml</path>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
   </model>
 
   <current-view>
diff --git a/Aircraft/c172-yasim-set.xml b/Aircraft/c172-yasim-set.xml
index 87dfd5150..75bac8ab9 100644
--- a/Aircraft/c172-yasim-set.xml
+++ b/Aircraft/c172-yasim-set.xml
@@ -15,40 +15,40 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <description>Cessna 172 (YASim)</description>
 
-  <flight-model>yasim</flight-model>
-  <aero>c172</aero>
+  <flight-model archive="y">yasim</flight-model>
+  <aero archive="y">c172</aero>
   <fuel-fraction>1.0</fuel-fraction>
   <fuel-fraction>1.0</fuel-fraction>
+   
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
    <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
+   <visibility archive="y">true</visibility>
   </panel>
   <panel_2>
    <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
   </panel_2>
 
-<!--
   <model>
-   <path>Aircraft/c172/Models/N757/n757.ac</path>
-  </model>
--->
-
-  <model>
-   <path>Aircraft/c172/Models/c172-dpm.xml</path>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
   </model>
 
  </sim>
 
  <controls>
-  <magnetos>true</magnetos>
+  <magnetos>3</magnetos>
  </controls>
-  
+
  <autopilot>
    <config>
      <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
@@ -56,7 +56,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
      <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
      <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
      <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.008</integral-contribution> 
+     <integral-contribution type="float">0.008</integral-contribution>
      <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
      <zero-pitch-trim-full-throttle type="float">0.001</zero-pitch-trim-full-throttle>
    </config>
diff --git a/Aircraft/c172p-3d-set.xml b/Aircraft/c172p-3d-set.xml
index 0d0adc7dc..1eabbfe86 100644
--- a/Aircraft/c172p-3d-set.xml
+++ b/Aircraft/c172p-3d-set.xml
@@ -16,20 +16,26 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <description>Cessna 172P</description>
  
-  <flight-model>jsb</flight-model>
-  <aero>c172p</aero>
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172p</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
-   <visibility>false</visibility>
+   <visibility archive="y">false</visibility>
   </panel>
 
   <model>
-   <path>Aircraft/c172p/Models/c172p.xml</path>
+   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
   </model>
 
   <view>
diff --git a/Aircraft/c172p-set.xml b/Aircraft/c172p-set.xml
index eaa71979a..e4d797ee3 100644
--- a/Aircraft/c172p-set.xml
+++ b/Aircraft/c172p-set.xml
@@ -16,24 +16,30 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
   <description>Cessna 172P</description>
  
-  <flight-model>jsb</flight-model>
-  <aero>c172p</aero>
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172p</aero>
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
    <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
+   <visibility archive="y">true</visibility>
   </panel>
   <panel_2>
    <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
   </panel_2>
 
   <model>
-   <path>Aircraft/c172p/Models/c172p.xml</path>
+   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
   </model>
 
   <view>
@@ -45,7 +51,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
   </current-view>
 
  </sim>
-  
+
  <autopilot>
    <config>
      <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
@@ -53,7 +59,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
      <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
      <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
      <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution> 
+     <integral-contribution type="float">0.01</integral-contribution>
      <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
      <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
    </config>
@@ -81,5 +87,5 @@ October 23 2001 John Check, fgpanels@rockfish.net
    <rpm type="double">700</rpm>
   </engine>
  </engines>
-  
+
 </PropertyList>
diff --git a/Aircraft/c172x-set.xml b/Aircraft/c172x-set.xml
index 555c41b99..356130b57 100644
--- a/Aircraft/c172x-set.xml
+++ b/Aircraft/c172x-set.xml
@@ -15,31 +15,32 @@ October 23 2001 John Check, fgpanels@rockfish.net
  <sim>
 
   <description>Cessna 172 flight dynamics testbed</description>
- 
-  <flight-model>jsb</flight-model>
-  <aero>c172x</aero>
+
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172x</aero>
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
 
   <sound>
-   <audible>true</audible>
-   <path>Aircraft/c172/c172-sound.xml</path>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
   </sound>
 
   <panel>
    <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-  <visibility>true</visibility>
+  <visibility archive="y">true</visibility>
   </panel>
   <panel_2>
    <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
   </panel_2>
 
-<!--
-  <model>
-   <path>Aircraft/c172/Models/N757/n757.ac</path>
-  </model>
--->
 
   <model>
-   <path>Aircraft/c172/Models/c172-dpm.xml</path>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
   </model>
 
  </sim>