Index: trunk/src/scriptbuilder/structures/events/TowEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/TowEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/TowEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -39,5 +39,5 @@
     public String toXML()
     {
-        return XMLWriter.emptyTag(ELEMENT.TOW.tag + " Company=\"" + towCompany + "\" ConfNum=\""
+        return XMLBuilder.emptyTag(ELEMENT.TOW.tag + " Company=\"" + towCompany + "\" ConfNum=\""
                 + towConfNum + "\" PubNum=\"" + towPubNum + "\" Beat=\"" + towBeat + "\"");
     }
Index: trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -66,10 +66,10 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\"");
-        output += XMLWriter.simpleTag(location, ELEMENT.LOCATION);
+        String output = XMLBuilder.openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\"");
+        output += XMLBuilder.simpleTag(location, ELEMENT.LOCATION);
 
         if (message.size() > 0)
         {
-            output += XMLWriter.openTag(ELEMENT.SAMPLE_MESSAGE.tag);
+            output += XMLBuilder.openTag(ELEMENT.SAMPLE_MESSAGE.tag);
             for (String str : message)
             {
@@ -78,10 +78,10 @@
                     str = "";
                 }
-                output += XMLWriter.simpleTag(str, ELEMENT.CMS_LINE);
+                output += XMLBuilder.simpleTag(str, ELEMENT.CMS_LINE);
             }
-            output += XMLWriter.closeTag(ELEMENT.SAMPLE_MESSAGE.tag);
+            output += XMLBuilder.closeTag(ELEMENT.SAMPLE_MESSAGE.tag);
         }
 
-        output += XMLWriter.closeTag(ELEMENT.CMS_EVALUATION.tag);
+        output += XMLBuilder.closeTag(ELEMENT.CMS_EVALUATION.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/UnitEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/UnitEvent.java	(revision 145)
+++ trunk/src/scriptbuilder/structures/events/UnitEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -41,5 +41,5 @@
     public String toXML()
     {
-        return XMLWriter.emptyTag(ELEMENT.UNIT.tag+" UnitNum=\""+unitNum+"\" Status=\""
+        return XMLBuilder.emptyTag(ELEMENT.UNIT.tag+" UnitNum=\""+unitNum+"\" Status=\""
                 +unitStatus+"\" Primary=\""+unitPrimary+"\" Active=\""+unitActive+"\"");
     }
Index: trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -60,5 +60,5 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.CAD_EVALUATION.tag);
+        String output = XMLBuilder.openTag(ELEMENT.CAD_EVALUATION.tag);
         if (expectedAction != null)
         {
@@ -69,8 +69,8 @@
                     str = "";
                 }
-                output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION);
+                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION);
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.CAD_EVALUATION.tag);
+        output += XMLBuilder.closeTag(ELEMENT.CAD_EVALUATION.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/TelephoneEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/TelephoneEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/TelephoneEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -37,19 +37,19 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.TELEPHONE.tag);
+        String output = XMLBuilder.openTag(ELEMENT.TELEPHONE.tag);
         for (int i = 0; i < lines.size(); i++)
         {
             if (roles.get(i).equalsIgnoreCase(ELEMENT.STUDENT.tag))
             {
-                output += XMLWriter.simpleTag(lines.get(i), ELEMENT.STUDENT);
+                output += XMLBuilder.simpleTag(lines.get(i), ELEMENT.STUDENT);
             }
             else
             {
-                output += XMLWriter.openTag(ELEMENT.INSTRUCTOR.tag + " Role=\"" + roles.get(i) + "\"");
+                output += XMLBuilder.openTag(ELEMENT.INSTRUCTOR.tag + " Role=\"" + roles.get(i) + "\"");
                 output += lines.get(i);
-                output += XMLWriter.closeTag(ELEMENT.INSTRUCTOR.tag);
+                output += XMLBuilder.closeTag(ELEMENT.INSTRUCTOR.tag);
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.TELEPHONE.tag);
+        output += XMLBuilder.closeTag(ELEMENT.TELEPHONE.tag);
         return output;
     }
Index: trunk/src/scriptbuilder/structures/events/TMTRadioEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/TMTRadioEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/TMTRadioEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -33,5 +33,5 @@
     public String toXML()
     {
-        String output = XMLWriter.simpleTag(message, ELEMENT.TMT_RADIO);
+        String output = XMLBuilder.simpleTag(message, ELEMENT.TMT_RADIO);
         return output;
     }
Index: trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -60,5 +60,5 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
+        String output = XMLBuilder.openTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
         if (expectedAction != null)
         {
@@ -69,8 +69,8 @@
                     str = "";
                 }
-                output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION);
+                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION);
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
+        output += XMLBuilder.closeTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -60,5 +60,5 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.RADIO_EVALUATION.tag);
+        String output = XMLBuilder.openTag(ELEMENT.RADIO_EVALUATION.tag);
         if (expectedAction != null)
         {
@@ -69,8 +69,8 @@
                     str = "";
                 }
-                output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION);
+                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION);
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.RADIO_EVALUATION.tag);
+        output += XMLBuilder.closeTag(ELEMENT.RADIO_EVALUATION.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/CADEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CADEvent.java	(revision 185)
+++ trunk/src/scriptbuilder/structures/events/CADEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -46,5 +46,5 @@
         while (tok.hasMoreTokens())
         {
-            output += XMLWriter.simpleTag(tok.nextToken(), ELEMENT.DETAIL);
+            output += XMLBuilder.simpleTag(tok.nextToken(), ELEMENT.DETAIL);
         }
         return output;
Index: trunk/src/scriptbuilder/structures/events/CHPRadioEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CHPRadioEvent.java	(revision 175)
+++ trunk/src/scriptbuilder/structures/events/CHPRadioEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -101,16 +101,16 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.CHP_RADIO.tag + " RadioFile=\"" + radioFile + "\"");
-        output += XMLWriter.openTag(ELEMENT.DIALOG.tag);
+        String output = XMLBuilder.openTag(ELEMENT.CHP_RADIO.tag + " RadioFile=\"" + radioFile + "\"");
+        output += XMLBuilder.openTag(ELEMENT.DIALOG.tag);
 
         for (int i = 0; i < lines.size(); i++)
         {
-            output += XMLWriter.openTag(ELEMENT.LINE.tag + " Role=\"" + roles.get(i) + "\"");
+            output += XMLBuilder.openTag(ELEMENT.LINE.tag + " Role=\"" + roles.get(i) + "\"");
             output += lines.get(i);
-            output += XMLWriter.closeTag(ELEMENT.LINE.tag);
+            output += XMLBuilder.closeTag(ELEMENT.LINE.tag);
         }
 
-        output += XMLWriter.closeTag(ELEMENT.DIALOG.tag);
-        output += XMLWriter.closeTag(ELEMENT.CHP_RADIO.tag);
+        output += XMLBuilder.closeTag(ELEMENT.DIALOG.tag);
+        output += XMLBuilder.closeTag(ELEMENT.CHP_RADIO.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -60,5 +60,5 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.FACILITATOR_EVALUATION.tag);
+        String output = XMLBuilder.openTag(ELEMENT.FACILITATOR_EVALUATION.tag);
         if (expectedAction != null)
         {
@@ -69,8 +69,8 @@
                     str = "";
                 }
-                output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION);
+                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION);
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.FACILITATOR_EVALUATION.tag);
+        output += XMLBuilder.closeTag(ELEMENT.FACILITATOR_EVALUATION.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/WitnessEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/WitnessEvent.java	(revision 46)
+++ trunk/src/scriptbuilder/structures/events/WitnessEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -37,5 +37,5 @@
     public String toXML()
     {
-        return XMLWriter.emptyTag(ELEMENT.WITNESS.tag + " Name=\"" + witnessName + "\" Address=\""
+        return XMLBuilder.emptyTag(ELEMENT.WITNESS.tag + " Name=\"" + witnessName + "\" Address=\""
                 + witnessAddress + "\" PhoneNum=\"" + witnessNum + "\"");
     }
Index: trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -60,5 +60,5 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.ATMS_EVALUATION.tag);
+        String output = XMLBuilder.openTag(ELEMENT.ATMS_EVALUATION.tag);
         if (expectedAction != null)
         {
@@ -69,8 +69,8 @@
                     str = "";
                 }
-                output += XMLWriter.simpleTag(str, ELEMENT.EXPECTED_ACTION);
+                output += XMLBuilder.simpleTag(str, ELEMENT.EXPECTED_ACTION);
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.ATMS_EVALUATION.tag);
+        output += XMLBuilder.closeTag(ELEMENT.ATMS_EVALUATION.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/CCTVEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CCTVEvent.java	(revision 153)
+++ trunk/src/scriptbuilder/structures/events/CCTVEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
Index: trunk/src/scriptbuilder/structures/events/ParamicsEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/ParamicsEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/ParamicsEvent.java	(revision 203)
@@ -10,5 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -40,18 +40,18 @@
     public String toXML()
     {
-        String output = XMLWriter.openTag(ELEMENT.PARAMICS.tag + " LocationID=\"" + locationID + "\"");
+        String output = XMLBuilder.openTag(ELEMENT.PARAMICS.tag + " LocationID=\"" + locationID + "\"");
 
-        output += XMLWriter.simpleTag(status, ELEMENT.Status);
+        output += XMLBuilder.simpleTag(status, ELEMENT.Status);
 
         if (!type.equals(""))
         {
-            output += XMLWriter.simpleTag(type, ELEMENT.Incident_type);
+            output += XMLBuilder.simpleTag(type, ELEMENT.Incident_type);
         }
 
         for (Integer lane : laneNums)
         {
-            output += XMLWriter.simpleTag("" + lane, ELEMENT.Lane_number);
+            output += XMLBuilder.simpleTag("" + lane, ELEMENT.Lane_number);
         }
-        output += XMLWriter.closeTag(ELEMENT.PARAMICS.tag);
+        output += XMLBuilder.closeTag(ELEMENT.PARAMICS.tag);
 
         return output;
Index: trunk/src/scriptbuilder/structures/events/AudioEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/AudioEvent.java	(revision 167)
+++ trunk/src/scriptbuilder/structures/events/AudioEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -75,5 +75,5 @@
     public String toXML()
     {
-        return XMLWriter.emptyTag(ELEMENT.AUDIO.tag + " Length=\"" + audioLength + "\" Path=\"" + audioPath + "\"");
+        return XMLBuilder.emptyTag(ELEMENT.AUDIO.tag + " Length=\"" + audioLength + "\" Path=\"" + audioPath + "\"");
     }
 }
Index: trunk/src/scriptbuilder/structures/events/MaintenanceRadioEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/MaintenanceRadioEvent.java	(revision 76)
+++ trunk/src/scriptbuilder/structures/events/MaintenanceRadioEvent.java	(revision 203)
@@ -9,5 +9,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.XMLWriter;
+import scriptbuilder.structures.XMLBuilder;
 
 /**
@@ -33,5 +33,5 @@
     public String toXML()
     {
-        String output = XMLWriter.simpleTag(message, ELEMENT.MAINTENANCE_RADIO);
+        String output = XMLBuilder.simpleTag(message, ELEMENT.MAINTENANCE_RADIO);
         return output;
     }