Index: trunk/src/scriptbuilder/structures/units/Unit.java
===================================================================
--- trunk/src/scriptbuilder/structures/units/Unit.java	(revision 145)
+++ trunk/src/scriptbuilder/structures/units/Unit.java	(revision 203)
@@ -8,5 +8,5 @@
 import scriptbuilder.structures.ELEMENT;
 import scriptbuilder.structures.I_XML_Writable;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -113,98 +113,98 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.NEW_UNIT.tag + " UnitNum=\"" + UnitNum + "\"");
+        String output = XMLBuilder.openTag(ELEMENT.NEW_UNIT.tag + " UnitNum=\"" + UnitNum + "\"");
 
         if (!ID.equals(""))
         {
-            output += XMLWriter.simpleTag(ID, ELEMENT.ID);
+            output += XMLBuilder.simpleTag(ID, ELEMENT.ID);
         }
 
         if (!Status.equals(""))
         {
-            output += XMLWriter.simpleTag(Status, ELEMENT.STATUS);
+            output += XMLBuilder.simpleTag(Status, ELEMENT.STATUS);
         }
 
         if (!Master_Inc_Num.equals(""))
         {
-            output += XMLWriter.simpleTag(Master_Inc_Num, ELEMENT.MASTER_INC_NUM);
+            output += XMLBuilder.simpleTag(Master_Inc_Num, ELEMENT.MASTER_INC_NUM);
         }
 
         if (!Primary.equals(""))
         {
-            output += XMLWriter.simpleTag(Primary, ELEMENT.PRIMARY);
+            output += XMLBuilder.simpleTag(Primary, ELEMENT.PRIMARY);
         }
 
         if (!OOS.equals(""))
         {
-            output += XMLWriter.simpleTag(OOS, ELEMENT.OOS);
+            output += XMLBuilder.simpleTag(OOS, ELEMENT.OOS);
         }
 
         if (!Type.equals(""))
         {
-            output += XMLWriter.simpleTag(Type, ELEMENT.TYPE);
+            output += XMLBuilder.simpleTag(Type, ELEMENT.TYPE);
         }
 
         //All units have a current location field, even if it's blank
-        output += XMLWriter.simpleTag(Curr_Loc, ELEMENT.CURR_LOC);
+        output += XMLBuilder.simpleTag(Curr_Loc, ELEMENT.CURR_LOC);
 
         //All units have a destination field, even if it's blank
-        output += XMLWriter.simpleTag(Destination, ELEMENT.DESTINATION);
+        output += XMLBuilder.simpleTag(Destination, ELEMENT.DESTINATION);
 
         if (!Misc_Info.equals(""))
         {
-            output += XMLWriter.simpleTag(Misc_Info, ELEMENT.MISC_INFO);
+            output += XMLBuilder.simpleTag(Misc_Info, ELEMENT.MISC_INFO);
         }
 
         if (!Stack.equals(""))
         {
-            output += XMLWriter.simpleTag(Stack, ELEMENT.STACK);
+            output += XMLBuilder.simpleTag(Stack, ELEMENT.STACK);
         }
 
         if (!Area.equals(""))
         {
-            output += XMLWriter.simpleTag(Area, ELEMENT.AREA);
+            output += XMLBuilder.simpleTag(Area, ELEMENT.AREA);
         }
 
         if (!Badge_Num.equals(""))
         {
-            output += XMLWriter.simpleTag(Badge_Num, ELEMENT.BADGE_NUM);
+            output += XMLBuilder.simpleTag(Badge_Num, ELEMENT.BADGE_NUM);
         }
 
         if (!Officer.equals(""))
         {
-            output += XMLWriter.simpleTag(Officer, ELEMENT.OFFICER);
+            output += XMLBuilder.simpleTag(Officer, ELEMENT.OFFICER);
         }
 
         if (!Office.equals(""))
         {
-            output += XMLWriter.simpleTag(Office, ELEMENT.OFFICE);
+            output += XMLBuilder.simpleTag(Office, ELEMENT.OFFICE);
         }
 
         if (!Timer.equals(""))
         {
-            output += XMLWriter.simpleTag(Timer, ELEMENT.TIMER);
+            output += XMLBuilder.simpleTag(Timer, ELEMENT.TIMER);
         }
 
         if (!P.equals(""))
         {
-            output += XMLWriter.simpleTag(P, ELEMENT.P);
+            output += XMLBuilder.simpleTag(P, ELEMENT.P);
         }
 
         if (!Agy.equals(""))
         {
-            output += XMLWriter.simpleTag(Agy, ELEMENT.AGY);
+            output += XMLBuilder.simpleTag(Agy, ELEMENT.AGY);
         }
 
         if (!Alias.equals(""))
         {
-            output += XMLWriter.simpleTag(Alias, ELEMENT.ALIAS);
+            output += XMLBuilder.simpleTag(Alias, ELEMENT.ALIAS);
         }
 
         if (!Unit_Status.equals(""))
         {
-            output += XMLWriter.simpleTag(Unit_Status, ELEMENT.UNIT_STATUS);
-        }
-
-        output += XMLWriter.closeTag(ELEMENT.NEW_UNIT.tag);
+            output += XMLBuilder.simpleTag(Unit_Status, ELEMENT.UNIT_STATUS);
+        }
+
+        output += XMLBuilder.closeTag(ELEMENT.NEW_UNIT.tag);
         return output;
     }