Index: trunk/src/scriptbuilder/structures/CadData.java
===================================================================
--- trunk/src/scriptbuilder/structures/CadData.java	(revision 143)
+++ trunk/src/scriptbuilder/structures/CadData.java	(revision 145)
@@ -15,14 +15,31 @@
         locInfo = new ArrayList<Location_Info>();
     }
+    
+    /**
+     * Constructor to add type and location, where TruncLoc is the first 5 letters of the fullloc.
+     * @param Header_Type
+     * @param Header_FullLoc 
+     */
+    public CadData(String Header_Type, String Header_FullLoc)
+    {
+        this.Header_Type = Header_Type;
+        this.Header_FullLoc = Header_FullLoc;
+//        if(Header_FullLoc.length()>10)
+//        {
+//            this.Header_TruncLoc = Header_FullLoc.substring(0,9);
+//        }
+        this.Header_TruncLoc = Header_FullLoc;
+        locInfo = new ArrayList<Location_Info>();
+    }
 
     public TimeSlice tSlice;
 
-    public String Header_Type = "DEFAULT";
+    public String Header_Type = "";
 
     public String Header_Beat = "";
 
-    public String Header_TruncLoc = "Default Location (short)";
-
-    public String Header_FullLoc = "Default Location (long)";
+    public String Header_TruncLoc = "";
+
+    public String Header_FullLoc = "";
 
     public String Master_Inc_Num = "";
@@ -134,6 +151,7 @@
         }
 
-        if (hasHeaderInfo() || true) //checking to see if header info is always necessary
-        {
+        if (hasHeaderInfo()) //checking to see if header info is always necessary
+        {
+            //todo: make this logic trigger only once per incident
             output += XMLWriter.openTag(ELEMENT.HEADER_INFO.tag);