diff --git a/BackEnd.dll b/BackEnd.dll
index 9fd686419..ae2db6ff2 100644
Binary files a/BackEnd.dll and b/BackEnd.dll differ
diff --git a/Data-1.13/TableData/AttachmentClass.xml b/Data-1.13/TableData/AttachmentClass.xml
index 85995c39c..f60a2099d 100644
--- a/Data-1.13/TableData/AttachmentClass.xml
+++ b/Data-1.13/TableData/AttachmentClass.xml
@@ -3,209 +3,53 @@
 	<AttachmentClass>
 		<id>0</id>
 		<name>None</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>1</id>
 		<name>Default</name>
-		<isDefault>1</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>2</id>
 		<name>Barrel</name>
-		<isDefault>0</isDefault>
-		<isBarrel>1</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>4</id>
 		<name>Laser</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>1</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>8</id>
 		<name>Sight</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>1</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>16</id>
 		<name>Scope</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>1</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>32</id>
 		<name>Stock</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>1</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>64</id>
 		<name>Ammo</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>1</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>128</id>
 		<name>Internal</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>1</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>256</id>
 		<name>External</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>1</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>512</id>
 		<name>Underbarrel</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>1</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>1024</id>
 		<name>Grenade</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>1</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>2048</id>
 		<name>Rocket</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>1</isRocket>
 	</AttachmentClass>
 </JA2Data>
\ No newline at end of file
diff --git a/Data/TableData/AttachmentClass.xml b/Data/TableData/AttachmentClass.xml
index 85995c39c..f60a2099d 100644
--- a/Data/TableData/AttachmentClass.xml
+++ b/Data/TableData/AttachmentClass.xml
@@ -3,209 +3,53 @@
 	<AttachmentClass>
 		<id>0</id>
 		<name>None</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>1</id>
 		<name>Default</name>
-		<isDefault>1</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>2</id>
 		<name>Barrel</name>
-		<isDefault>0</isDefault>
-		<isBarrel>1</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>4</id>
 		<name>Laser</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>1</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>8</id>
 		<name>Sight</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>1</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>16</id>
 		<name>Scope</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>1</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>32</id>
 		<name>Stock</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>1</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>64</id>
 		<name>Ammo</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>1</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>128</id>
 		<name>Internal</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>1</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>256</id>
 		<name>External</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>1</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>512</id>
 		<name>Underbarrel</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>1</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>1024</id>
 		<name>Grenade</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>1</isGrenade>
-		<isRocket>0</isRocket>
 	</AttachmentClass>
 	<AttachmentClass>
 		<id>2048</id>
 		<name>Rocket</name>
-		<isDefault>0</isDefault>
-		<isBarrel>0</isBarrel>
-		<isLaser>0</isLaser>
-		<isSight>0</isSight>
-		<isScope>0</isScope>
-		<isStock>0</isStock>
-		<isAmmo>0</isAmmo>
-		<isInternal>0</isInternal>
-		<isExternal>0</isExternal>
-		<isUnderbarrel>0</isUnderbarrel>
-		<isGrenade>0</isGrenade>
-		<isRocket>1</isRocket>
 	</AttachmentClass>
 </JA2Data>
\ No newline at end of file
diff --git a/XML Editor.exe b/XML Editor.exe
index edf1e3bd5..eae7ce08c 100644
Binary files a/XML Editor.exe and b/XML Editor.exe differ
diff --git a/XML Editor.exe.config b/XML Editor.exe.config
index 6054d84d1..238e1e461 100644
--- a/XML Editor.exe.config	
+++ b/XML Editor.exe.config	
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="GUI.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="GUI.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <system.diagnostics>
@@ -17,12 +17,10 @@
             </source>
         </sources>
         <switches>
-            <add name="DefaultSwitch" value="Information" />
+            <add name="DefaultSwitch" value="Information"/>
         </switches>
         <sharedListeners>
-            <add name="FileLog"
-                 type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
-                 initializeData="FileLogWriter"/>
+            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
             <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
             <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
         </sharedListeners>
@@ -47,6 +45,12 @@
             <setting name="MainForm_State" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="Last_Version_Major" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="Last_Version_Minor" serializeAs="String">
+                <value>80</value>
+            </setting>
         </GUI.My.MySettings>
     </userSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/XMLEditorInit.xml b/XMLEditorInit.xml
index 5b99fc95f..d4a78fe08 100644
--- a/XMLEditorInit.xml
+++ b/XMLEditorInit.xml
@@ -1,7 +1,10 @@
 <XMLEditor>
    <!-- The current Data folder used for the XML-Editor -->
-	<Data_Directory>Data-1.13</Data_Directory>
-	
+	<Data_Directory_1>Data-1.13</Data_Directory_1>
+
+	<!-- Use a working directory to make loading files faster, turn this off if you do a lot of edits by hand -->
+	<Use_Working_Directory>True</Use_Working_Directory>
+
 	<!-- The AP system used for displaying values in the XML-Editor -->
 	<AP_Maximum>100</AP_Maximum>
 	
@@ -9,12 +12,12 @@
 	<!-- The <Data_Directory> property value and the "TableData" folder is automatically appended to the specified path, so don't add this to the path -->
 	<!-- If your language specific XML files are in the same place then the English (non language specific) XML files, you can just clear the values of the properties, but don't delete the properties -->
 	<!-- If no language specific XML files can be found, the XML-Editor will start without any errors, but you cannot edit the missing file in the XML-Editor -->
-	<GameDir_Russian_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Russian_Version</GameDir_Russian_Path>
-	<GameDir_German_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\German_Version</GameDir_German_Path>
-	<GameDir_Polish_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Polish_Version</GameDir_Polish_Path>
-	<GameDir_French_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\French_Version</GameDir_French_Path>
-	<GameDir_Italian_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Italian_Version</GameDir_Italian_Path>
-	<GameDir_Chinese_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Chinese_Version</GameDir_Chinese_Path>
-	<GameDir_Dutch_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Dutch_Version</GameDir_Dutch_Path>
-	<GameDir_Taiwanese_Path>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Taiwanese_Version</GameDir_Taiwanese_Path>
+	<GameDir_Russian_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Russian_Version</GameDir_Russian_Path_1>
+	<GameDir_German_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\German_Version</GameDir_German_Path_1>
+	<GameDir_Polish_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Polish_Version</GameDir_Polish_Path_1>
+	<GameDir_French_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\French_Version</GameDir_French_Path_1>
+	<GameDir_Italian_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Italian_Version</GameDir_Italian_Path_1>
+	<GameDir_Chinese_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Chinese_Version</GameDir_Chinese_Path_1>
+	<GameDir_Dutch_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Dutch_Version</GameDir_Dutch_Path_1>
+	<GameDir_Taiwanese_Path_1>C:\stuff\1.13\Development\Game Data\GameDir_LanguageSpecific\Taiwanese_Version</GameDir_Taiwanese_Path_1>
 </XMLEditor>
\ No newline at end of file