Index: /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java	(revision 47)
+++ /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java	(revision 52)
@@ -11,5 +11,5 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import tmcsim.paramicscommunicator.PComm;
+import tmcsim.paramicscommunicator.ParamicsCommunicator;
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
@@ -47,6 +47,6 @@
         // UISpec will complain about an uncaught window appearing.
 
-        PComm pc = null;
-        pc = new PComm("config/testConfig/paramics_communicator_config.properties");
+        ParamicsCommunicator pc = null;
+        pc = new ParamicsCommunicator("config/testConfig/paramics_communicator_config.properties");
         ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
         pc.setGUI(theGUI);
Index: /trunk/test/tmcsim/cadsimulator/SystemTest.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 47)
+++ /trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 52)
@@ -12,5 +12,4 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import tmcsim.paramicscommunicator.PComm;
 import tmcsim.paramicscommunicator.ParamicsCommunicator;
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
@@ -28,5 +27,5 @@
     SimulationManager simMgrApp;
     CADSimulator engine;
-    ParamicsCommunicator paramicscomm;
+//    ParamicsCommunicator paramicscomm;
 
     public SystemTest(String testName)
@@ -72,6 +71,6 @@
         assertEquals("network id should be None", "None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
-        PComm pc = null;
-        pc = new PComm("config/testConfig/paramics_communicator_config.properties");
+        ParamicsCommunicator pc = null;
+        pc = new ParamicsCommunicator("config/testConfig/paramics_communicator_config.properties");
         ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
         pc.setGUI(theGUI);
Index: /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 47)
+++ /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 52)
@@ -16,5 +16,5 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import tmcsim.paramicscommunicator.PComm;
+import tmcsim.paramicscommunicator.ParamicsCommunicator;
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
@@ -58,6 +58,6 @@
         }
 
-        PComm pc = null;
-        pc = new PComm("config/testConfig/paramics_communicator_config.properties");
+        ParamicsCommunicator pc = null;
+        pc = new ParamicsCommunicator("config/testConfig/paramics_communicator_config.properties");
         ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
         pc.setGUI(theGUI);
Index: /trunk/config/paramics_communicator_logging.properties
===================================================================
--- /trunk/config/paramics_communicator_logging.properties	(revision 21)
+++ /trunk/config/paramics_communicator_logging.properties	(revision 52)
@@ -18,5 +18,5 @@
 
 # Set properties for 2016 --jd
-LogFile=C:\\paramics_communicator.log
+LogFile=paramics_communicator.log
 # Ethernet cable in operator room
 #CADSimulatorHost=192.168.251.119
Index: /trunk/scripts/system_test_script.xml
===================================================================
--- /trunk/scripts/system_test_script.xml	(revision 45)
+++ /trunk/scripts/system_test_script.xml	(revision 52)
@@ -349,9 +349,9 @@
 			<CAD_INCIDENT_EVENT>
 				<UNIT UnitNum="14-14" Status="ENRT" Primary="true" Active="true"/>
-				<AUDIO Length = "25" Path = "187/18701.wav" />	
+				<AUDIO Length = "25" Path = "187/18701.mp3" />	
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		        
 		
-		<CHP_RADIO RadioFile="18701.wav">
+		<CHP_RADIO RadioFile="18701.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">14-14 Santa Lucia</LINE>				
@@ -379,9 +379,9 @@
 			<CAD_INCIDENT_EVENT>		
 				<DETAIL>CELLULAR 911 RPT DOT HT, 2ND VEH OVER THE SIDE, UNVERIFIED</DETAIL>
-				<AUDIO Length = "26" Path = "187/18702.wav" />
+				<AUDIO Length = "26" Path = "187/18702.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18702.wav">
+		<CHP_RADIO RadioFile="18702.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">14-14 Santa Lucia</LINE>				
@@ -425,5 +425,5 @@
 				<DETAIL>2ND VEH LANDED NB 405 BELOW, LG COLLISION OCCUR. REQ 2 1141 CODE 2 UNITS ASSIST</DETAIL>
 				<UNIT UnitNum="14-14" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "42" Path = "187/18703.wav" />
+				<AUDIO Length = "42" Path = "187/18703.mp3" />
 				
 				<PARAMICS LocationID="187_N_405_ML">
@@ -450,5 +450,5 @@
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18703.wav">
+		<CHP_RADIO RadioFile="18703.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-14</LINE>				
@@ -492,9 +492,9 @@
 				<UNIT UnitNum="14-17" Status="ENRT" Primary="false" Active="true"/>
 				<UNIT UnitNum="14-9" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "40" Path = "187/18704.wav" />
+				<AUDIO Length = "40" Path = "187/18704.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18704.wav">
+		<CHP_RADIO RadioFile="18704.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">14-17, 14-9 Santa Lucia</LINE>
@@ -528,10 +528,10 @@
 				<DETAIL>DOT DRIVER UNINJURED, #2,3 LNS BLCKD SB 55.</DETAIL>
 				<DETAIL>14-14 MVNG TO 405 ASSESS DMG</DETAIL>
-				<AUDIO Length = "29" Path = "187/18705.wav" />
+				<AUDIO Length = "29" Path = "187/18705.mp3" />
 			</CAD_INCIDENT_EVENT>
 			
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18705.wav">
+		<CHP_RADIO RadioFile="18705.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-14</LINE>				
@@ -644,9 +644,9 @@
 				<DETAIL>9-9 ENRT FRM I405 @ IRVINE CTR</DETAIL>
 				<UNIT UnitNum="9-9" Status="ENRT" Primary="true" Active="true"/>
-				<AUDIO Length = "25" Path = "188/18801.wav" />
+				<AUDIO Length = "25" Path = "188/18801.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18801.wav">
+		<CHP_RADIO RadioFile="18801.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">9-9 Santa Lucia</LINE>				
@@ -699,9 +699,9 @@
 				<DETAIL>14-14 1097, MULTIPLE 1144 NB 405 AT 55 OVERPASS, 6 VEH TC</DETAIL>
 				<DETAIL>BLOCKING 3 INSIDE LNS NB 405. DRVR AND PSSNGR IN VEH 1144, 2 OTHER FATALS, MULT INJR, REQ CRNR AND SIGALERT</DETAIL>
-				<AUDIO Length = "46" Path = "187/18706.wav" />
+				<AUDIO Length = "46" Path = "187/18706.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18706.wav">
+		<CHP_RADIO RadioFile="18706.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-14</LINE>				
@@ -769,9 +769,9 @@
 				<DETAIL>14-17 1097, PARAMEDICS 1097. 1184 SB 55 FOR DOT 1125</DETAIL>
 				<UNIT UnitNum="14-17" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "46" Path = "187/18707.wav" />	
+				<AUDIO Length = "46" Path = "187/18707.mp3" />	
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18707.wav">
+		<CHP_RADIO RadioFile="18707.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-17</LINE>				
@@ -800,9 +800,9 @@
 				<DETAIL>TRCK ON FIRE, REQ CT CLNUP, UNITS 1184</DETAIL>
 				<UNIT UnitNum="9-9" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "39" Path = "188/18802.wav" />
+				<AUDIO Length = "39" Path = "188/18802.mp3" />
 			</CAD_INCIDENT_EVENT>
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18802.wav">
+		<CHP_RADIO RadioFile="18802.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9</LINE>
@@ -843,9 +843,9 @@
 				<DETAIL>REQ MAIT, REQ 14-S UNIT, REQ TMT</DETAIL>
 				<UNIT UnitNum="14-S3" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "34" Path = "187/18708.wav" />
+				<AUDIO Length = "34" Path = "187/18708.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18708.wav">
+		<CHP_RADIO RadioFile="18708.mp3">
 			<DIALOG>
 				<LINE Role="Field">	Santa Lucia 14-14</LINE>				
@@ -907,9 +907,9 @@
 				<DETAIL>14-9 1097, ASSIST 1184</DETAIL>
 				<UNIT UnitNum="14-9" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "22" Path = "187/18709.wav" />
+				<AUDIO Length = "22" Path = "187/18709.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18709.wav">
+		<CHP_RADIO RadioFile="18709.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-9.</LINE>				
@@ -930,9 +930,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>TRAFFIC BACKING SB 55 REQ TMT MEDIUM DUTY 1185</DETAIL>
-				<AUDIO Length = "24" Path = "187/18710.wav" />
+				<AUDIO Length = "24" Path = "187/18710.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18710.wav">
+		<CHP_RADIO RadioFile="18710.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-17.</LINE>
@@ -954,9 +954,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>4 1144'S, 2 1180'S, 4 1181'S</DETAIL>
-				<AUDIO Length = "20" Path = "187/18711.wav" />
+				<AUDIO Length = "20" Path = "187/18711.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18711.wav">
+		<CHP_RADIO RadioFile="18711.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-14</LINE>		
@@ -995,9 +995,9 @@
 				<UNIT UnitNum="9-15" Status="ENRT" Primary="false" Active="true"/>
 				<UNIT UnitNum="9-19" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "38" Path = "188/18803.wav" />
+				<AUDIO Length = "38" Path = "188/18803.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18803.wav">
+		<CHP_RADIO RadioFile="18803.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">9-15, 9-19 Santa Lucia</LINE>				
@@ -1032,9 +1032,9 @@
 				<DETAIL>1039 SABLAN TOWING</DETAIL>
 				<TOW Company="SABLAN TOWING" ConfNum="(949)555-2468" PubNum="(949)555-8899" Beat=""/>
-				<AUDIO Length = "18" Path = "187/18712.wav" />
+				<AUDIO Length = "18" Path = "187/18712.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18712.wav">
+		<CHP_RADIO RadioFile="18712.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">	14-17 Santa Lucia information.</LINE>				
@@ -1055,9 +1055,9 @@
 				<DETAIL>MAIT ETA 15</DETAIL>
 				<UNIT UnitNum="14-S3" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "26" Path = "187/18713.wav" />
+				<AUDIO Length = "26" Path = "187/18713.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>			
 
-		<CHP_RADIO RadioFile="18713.wav">
+		<CHP_RADIO RadioFile="18713.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3</LINE>				
@@ -1079,9 +1079,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1141 1097, TRCK STLL FIRE, 2 1180 IN VEH, UNK IN TRCK</DETAIL>
-				<AUDIO Length = "32" Path = "188/18804.wav" />
+				<AUDIO Length = "32" Path = "188/18804.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18804.wav">
+		<CHP_RADIO RadioFile="18804.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1125,10 +1125,10 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>REQUEST 1185 BIG RIG AND 1185 ROT, ISSUE SIG ALERT</DETAIL>
-				<AUDIO Length = "23" Path = "188/18805.wav" />
+				<AUDIO Length = "23" Path = "188/18805.mp3" />
 			</CAD_INCIDENT_EVENT>
 		</CAD_DATA>			
 		
 
-		<CHP_RADIO RadioFile="18805.wav">
+		<CHP_RADIO RadioFile="18805.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>
@@ -1171,9 +1171,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CRNR 1097, INJURED TRANSPORTED</DETAIL>
-				<AUDIO Length = "17" Path = "187/18714.wav" />
+				<AUDIO Length = "17" Path = "187/18714.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18714.wav">
+		<CHP_RADIO RadioFile="18714.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>
@@ -1198,9 +1198,9 @@
 				<DETAIL>9-15 1097, ADVS PD TO DIRECT TRAFFIC OFF AT LAKE FOREST </DETAIL>
 				<UNIT UnitNum="9-15" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "26" Path = "188/18806.wav" />
+				<AUDIO Length = "26" Path = "188/18806.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18806.wav">
+		<CHP_RADIO RadioFile="18806.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-15.</LINE>				
@@ -1252,9 +1252,9 @@
 				<TOW Company="College Oak" ConfNum="(949)555-2990" PubNum="(949)555-5758" Beat=""/>
 				<TOW Company="Cycle" ConfNum="(949)555-2281" PubNum="(949)555-7162" Beat=""/>
-				<AUDIO Length = "20" Path = "188/18807.wav" />
+				<AUDIO Length = "20" Path = "188/18807.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18807.wav">
+		<CHP_RADIO RadioFile="18807.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">9-9 Santa Lucia information</LINE>				
@@ -1275,9 +1275,9 @@
 				<DETAIL>9-19 1097 ASSISTNG 1184</DETAIL>
 				<UNIT UnitNum="9-19" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "20" Path = "188/18808.wav" />
+				<AUDIO Length = "20" Path = "188/18808.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18808.wav">
+		<CHP_RADIO RadioFile="18808.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-19</LINE>
@@ -1296,9 +1296,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAIT 1097 STARTING INVESTIGATION SB SR55</DETAIL>
-				<AUDIO Length = "22" Path = "187/18715.wav" />
+				<AUDIO Length = "22" Path = "187/18715.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="187/18715.wav">
+		<CHP_RADIO RadioFile="187/18715.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -1340,9 +1340,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MED DUTY 1185 1097, AWAIT FINISH MAIT BEFORE TOW VEH</DETAIL>
-				<AUDIO Length = "25" Path = "187/18716.wav" />
+				<AUDIO Length = "25" Path = "187/18716.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18716.wav">
+		<CHP_RADIO RadioFile="18716.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-17.</LINE>				
@@ -1364,9 +1364,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1039 PD, SENDING 2 UNITS ASST 1184</DETAIL>
-				<AUDIO Length = "17" Path = "188/18809.wav" />
+				<AUDIO Length = "17" Path = "188/18809.mp3" />
 			</CAD_INCIDENT_EVENT>
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18809.wav">
+		<CHP_RADIO RadioFile="18809.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">9-9 Santa Lucia information.</LINE>				
@@ -1397,9 +1397,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CRNR CONFIRMED FOUR FATAL, PREP TO TRANSPORT</DETAIL>
-				<AUDIO Length = "19" Path = "187/18717.wav" />
+				<AUDIO Length = "19" Path = "187/18717.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18717.wav">
+		<CHP_RADIO RadioFile="18717.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -1420,9 +1420,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1180S TRANSPORTED</DETAIL>
-				<AUDIO Length = "14" Path = "188/18810.wav" />
+				<AUDIO Length = "14" Path = "188/18810.mp3" />
 			</CAD_INCIDENT_EVENT>
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18810.wav">
+		<CHP_RADIO RadioFile="18810.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>
@@ -1442,9 +1442,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>9-9 FIRE OUT</DETAIL>
-				<AUDIO Length = "14" Path = "188/18811.wav" />
+				<AUDIO Length = "14" Path = "188/18811.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18811.wav">
+		<CHP_RADIO RadioFile="18811.mp3">
 			<DIALOG>
 				<LINE Role="Field">	Santa Lucia 9-9.</LINE>				
@@ -1472,9 +1472,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>LAKE FOREST ONRAMP CLOSED, DIRECTING TRAFFIC OFF LAKE FOREST OFFRAMP</DETAIL>
-				<AUDIO Length = "23" Path = "188/18812.wav" />
+				<AUDIO Length = "23" Path = "188/18812.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18812.wav">
+		<CHP_RADIO RadioFile="18812.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-15.</LINE>				
@@ -1506,9 +1506,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAIT FINISHED W/ INVESTIGATION SB SR-55 AT I-405, PREP DOT TRCK FOR TOW</DETAIL>
-				<AUDIO Length = "24" Path = "187/18718.wav" />
+				<AUDIO Length = "24" Path = "187/18718.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18718.wav">
+		<CHP_RADIO RadioFile="18718.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-17.</LINE>				
@@ -1530,9 +1530,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1 1144 IN TRCK, REQ CRNR</DETAIL>
-				<AUDIO Length = "18" Path = "188/18813.wav" />
+				<AUDIO Length = "18" Path = "188/18813.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18813.wav">
+		<CHP_RADIO RadioFile="18813.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1573,9 +1573,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>9-9 1039 CRNR, ETA 15</DETAIL>
-				<AUDIO Length = "16" Path = "188/18814.wav" />
+				<AUDIO Length = "16" Path = "188/18814.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18814.wav">
+		<CHP_RADIO RadioFile="18814.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">	9-9 Santa Lucia</LINE>				
@@ -1605,9 +1605,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CT 1097, STRTNG CLNUP OF TOMATOES</DETAIL>
-				<AUDIO Length = "18" Path = "188/18815.wav" />
+				<AUDIO Length = "18" Path = "188/18815.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18815.wav">
+		<CHP_RADIO RadioFile="18815.mp3">
 			<DIALOG>
 				<LINE Role="Field">	Santa Lucia 9-9.</LINE>				
@@ -1646,9 +1646,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1185 ROT 1097</DETAIL>
-				<AUDIO Length = "15" Path = "188/18816.wav" />
+				<AUDIO Length = "15" Path = "188/18816.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18816.wav">
+		<CHP_RADIO RadioFile="18816.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1676,9 +1676,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAIT STARTING INVESTIGATION NB 405 TO TAKE 30 MIN</DETAIL>
-				<AUDIO Length = "23" Path = "187/18719.wav" />
+				<AUDIO Length = "23" Path = "187/18719.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18719.wav">
+		<CHP_RADIO RadioFile="18719.mp3">
 			<DIALOG>
 				<LINE Role="Field">	Santa Lucia 14-S3.</LINE>				
@@ -1700,9 +1700,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CLNUP NRLY FNSHD DOT RDY TO BE TWD, SB SR-55 LNS OPN IN 5</DETAIL>
-				<AUDIO Length = "25" Path = "187/18720.wav" />
+				<AUDIO Length = "25" Path = "187/18720.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18720.wav">
+		<CHP_RADIO RadioFile="18720.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-17.</LINE>				
@@ -1725,9 +1725,9 @@
 				<DETAIL>WTNSSES, JOHN/BETTY JONES SAW TOMATO TRUCK LOSE CONTROL, FLIP OVER, VEH HIT, TRCK IMM CAUGHT FIRE</DETAIL>
 				<WITNESS Name="John/Betty Jones" Address="101 Lowland Dr." PhoneNum="(949)555-8375"/>
-				<AUDIO Length = "27" Path = "188/18817.wav" />
+				<AUDIO Length = "27" Path = "188/18817.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18817.wav">
+		<CHP_RADIO RadioFile="18817.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1757,9 +1757,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>BIG RIG 1185 1097</DETAIL>
-				<AUDIO Length = "16" Path = "188/18818.wav" />
+				<AUDIO Length = "16" Path = "188/18818.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18818.wav">
+		<CHP_RADIO RadioFile="18818.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1794,5 +1794,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>14-17 1097 DOT TRCK TWD, SB SR-55 OPN</DETAIL>
-				<AUDIO Length = "21" Path = "187/18721.wav" />
+				<AUDIO Length = "21" Path = "187/18721.mp3" />
 				
 				<PARAMICS LocationID="187_S_55_ML">
@@ -1802,5 +1802,5 @@
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18721.wav">
+		<CHP_RADIO RadioFile="18721.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-17.</LINE>				
@@ -1834,9 +1834,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAIT PARTIAL CMPLT, PICS TKN, NEED MSRMNTS, INTERVIEWS</DETAIL>
-				<AUDIO Length = "25" Path = "187/18722.wav" />
+				<AUDIO Length = "25" Path = "187/18722.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18722.wav">
+		<CHP_RADIO RadioFile="18722.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -1859,9 +1859,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CT #3 LN ALMOST CLEARED OF TOMATOES</DETAIL>
-				<AUDIO Length = "17" Path = "188/18819.wav" />
+				<AUDIO Length = "17" Path = "188/18819.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18819.wav">
+		<CHP_RADIO RadioFile="18819.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1888,9 +1888,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CRNR 1097</DETAIL>
-				<AUDIO Length = "14" Path = "188/18820.wav" />
+				<AUDIO Length = "14" Path = "188/18820.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="31520.wav">
+		<CHP_RADIO RadioFile="31520.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1935,9 +1935,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>REQ 6 ROT 1185</DETAIL>
-				<AUDIO Length = "17" Path = "187/18723.wav" />
+				<AUDIO Length = "17" Path = "187/18723.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18723.wav">
+		<CHP_RADIO RadioFile="18723.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -1956,5 +1956,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>VEH TOWED, #3 LN CLEARED, OPENING</DETAIL>
-				<AUDIO Length = "18" Path = "188/18821.wav" />
+				<AUDIO Length = "18" Path = "188/18821.mp3" />
 				
 				<PARAMICS LocationID="188_N_5_ML">
@@ -1968,5 +1968,5 @@
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18821.wav">
+		<CHP_RADIO RadioFile="18821.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -1988,9 +1988,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAIT NEARLY COMPLETE, FINISHING INTERVIEWS, TOW ETA 10</DETAIL>
-				<AUDIO Length = "29" Path = "187/18724.wav" />
+				<AUDIO Length = "29" Path = "187/18724.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18724.wav">
+		<CHP_RADIO RadioFile="18724.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -2017,9 +2017,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1144 CNFRMD, #3 LN OPN, FULL OPNNG 20 MIN</DETAIL>
-				<AUDIO Length = "21" Path = "188/18822.wav" />
+				<AUDIO Length = "21" Path = "188/18822.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18822.wav">
+		<CHP_RADIO RadioFile="18822.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -2061,9 +2061,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CT NRLY FNSHD CLNUP, TRCK BEING PRPRD FOR 1185</DETAIL>
-				<AUDIO Length = "18" Path = "188/18823.wav" />
+				<AUDIO Length = "18" Path = "188/18823.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18823.wav">
+		<CHP_RADIO RadioFile="18823.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -2097,9 +2097,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAIT FINISHED INVESTIGATION 1098, START CLEANUP WHEN 1185S ARRIVE</DETAIL>
-				<AUDIO Length = "23" Path = "187/18725.wav" />
+				<AUDIO Length = "23" Path = "187/18725.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18725.wav">
+		<CHP_RADIO RadioFile="18725.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -2128,9 +2128,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1185 1097 PARTIAL OPENING IN 15</DETAIL>
-				<AUDIO Length = "21" Path = "187/18726.wav" />
+				<AUDIO Length = "21" Path = "187/18726.mp3" />
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18726.wav">
+		<CHP_RADIO RadioFile="18726.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3</LINE>				
@@ -2149,9 +2149,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CT 98 TOMATOES, LNS OPN IN 10</DETAIL>
-				<AUDIO Length = "17" Path = "188/18824.wav" />
+				<AUDIO Length = "17" Path = "188/18824.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18824.wav">
+		<CHP_RADIO RadioFile="18824.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -2246,5 +2246,5 @@
 				<DETAIL>1039 IRV PD, PD ENRT, 28-24 ENRT FROM I-405 @ IRVINE CNTR.</DETAIL>
 				<UNIT UnitNum="28-24" Status="ENRT" Primary="true" Active="true"/>
-				<AUDIO Length = "23" Path = "189/18901.wav" />
+				<AUDIO Length = "23" Path = "189/18901.mp3" />
 			</CAD_INCIDENT_EVENT>		
 			
@@ -2263,5 +2263,5 @@
 		</GENERAL_INFO>
 
-		<CHP_RADIO RadioFile="18901.wav">
+		<CHP_RADIO RadioFile="18901.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">28-24 Santa Lucia.</LINE>				
@@ -2290,9 +2290,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>TRCK TWD, FD SPRYNG LNS, LNS OPN IN 5</DETAIL>
-				<AUDIO Length = "21" Path = "188/18825.wav" />
+				<AUDIO Length = "21" Path = "188/18825.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18825.wav">
+		<CHP_RADIO RadioFile="18825.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-9.</LINE>				
@@ -2333,9 +2333,9 @@
 				<DETAIL>28-24 1097, PD 1097</DETAIL>
 				<UNIT UnitNum="28-24" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "18" Path = "189/18902.wav" />
+				<AUDIO Length = "18" Path = "189/18902.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18902.wav">
+		<CHP_RADIO RadioFile="18902.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-24.</LINE>				
@@ -2361,9 +2361,9 @@
 				<UNIT UnitNum="28-19" Status="ENRT" Primary="false" Active="true"/>
 				<UNIT UnitNum="28-13" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "44" Path = "189/18903.wav" />
+				<AUDIO Length = "44" Path = "189/18903.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18903.wav">
+		<CHP_RADIO RadioFile="18903.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">28-19 Santa Lucia.</LINE>				
@@ -2393,5 +2393,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>OPN #2,3 LNS, FULL OPN IN 5</DETAIL>
-				<AUDIO Length = "20" Path = "187/18727.wav" />				
+				<AUDIO Length = "20" Path = "187/18727.mp3" />				
 				
 				<PARAMICS LocationID="187_N_405_ML">
@@ -2403,5 +2403,5 @@
 		</CAD_DATA>
 
-		<CHP_RADIO RadioFile="18727.wav">
+		<CHP_RADIO RadioFile="18727.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -2451,5 +2451,5 @@
 				<UNIT UnitNum="9-15" Status="1098" Primary="false" Active="false"/>
 				<UNIT UnitNum="9-19" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "25" Path = "188/18827.wav" />
+				<AUDIO Length = "25" Path = "188/18827.mp3" />
 				
 				<PARAMICS LocationID="188_N_5_ML">
@@ -2459,5 +2459,5 @@
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="18827.wav">
+		<CHP_RADIO RadioFile="18827.mp3">
 			<DIALOG> 
 				<LINE Role="Field">Santa Lucia 9-9</LINE>
@@ -2489,9 +2489,9 @@
 				<UNIT UnitNum="28-11" Status="ENRT" Primary="false" Active="true"/>
 				<UNIT UnitNum="28-07" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "45" Path = "189/18904.wav" />
+				<AUDIO Length = "45" Path = "189/18904.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18904.wav">
+		<CHP_RADIO RadioFile="18904.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">	28-11 Santa Lucia.</LINE>
@@ -2540,9 +2540,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>PD CLOSING JEFFREY AND UNIV DR, SENDING NEGOTIATOR, REQ SIGALERT</DETAIL>
-				<AUDIO Length = "30" Path = "189/18905.wav" />
+				<AUDIO Length = "30" Path = "189/18905.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="18905.wav">
+		<CHP_RADIO RadioFile="18905.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-24.</LINE>				
@@ -2590,5 +2590,5 @@
 				<UNIT UnitNum="14-9" Status="1098" Primary="false" Active="false"/>
 				<UNIT UnitNum="14-S3" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "23" Path = "187/18728.wav" />
+				<AUDIO Length = "23" Path = "187/18728.mp3" />
 				
 				<PARAMICS LocationID="187_N_405_ML">
@@ -2602,5 +2602,5 @@
 		</CAD_DATA>
 		
-		<CHP_RADIO RadioFile="18728.wav">
+		<CHP_RADIO RadioFile="18728.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 14-S3.</LINE>				
@@ -2658,9 +2658,9 @@
 				<DETAIL>28-13 1097, 10-23 28-19 B4 CLOSING NB LNS, 1039 DOT FOR SIGN TRUCKS</DETAIL>
 				<UNIT UnitNum="28-13" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "33" Path = "189/18906.wav" />
+				<AUDIO Length = "33" Path = "189/18906.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18906.wav">
+		<CHP_RADIO RadioFile="18906.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-13.</LINE>				
@@ -2692,5 +2692,5 @@
 				<DETAIL>28-11 1097, CLSNG DWN SB LNS AT CULVER DR OFFR</DETAIL>
 				<UNIT UnitNum="28-11" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "21" Path = "189/18907.wav" />
+				<AUDIO Length = "21" Path = "189/18907.mp3" />
 				
 				<PARAMICS LocationID="189_S_405_ML">
@@ -2711,5 +2711,5 @@
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18907.wav">
+		<CHP_RADIO RadioFile="18907.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-11.</LINE>				
@@ -2764,5 +2764,5 @@
 				<DETAIL>28-13, 28-19 SHUTTING DWN NB 405 LNS AT SAND CYN ST OFFR</DETAIL>
 				<UNIT UnitNum="28-19" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "30" Path = "189/18908.wav" />
+				<AUDIO Length = "30" Path = "189/18908.mp3" />
 				
 				<PARAMICS LocationID="189_N_405_ML">
@@ -2784,5 +2784,5 @@
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18908.wav">
+		<CHP_RADIO RadioFile="18908.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-19.</LINE>				
@@ -2852,9 +2852,9 @@
 				<DETAIL>28-07 1097 ASSTNG 28-11 CLSNG SB LNS AT CULVER OFFR</DETAIL>
 				<UNIT UnitNum="28-07" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "23" Path = "189/18909.wav" />
+				<AUDIO Length = "23" Path = "189/18909.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18909.wav">
+		<CHP_RADIO RadioFile="18909.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-07.</LINE>				
@@ -2882,9 +2882,9 @@
 				<DETAIL>28-S4 1097 I5 JEFFREY AVE ASSIST</DETAIL>
 				<UNIT UnitNum="28-S4" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "19" Path = "189/18910.wav" />
+				<AUDIO Length = "19" Path = "189/18910.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18910.wav">
+		<CHP_RADIO RadioFile="18910.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -2913,9 +2913,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>PD STTNG DETOURS, SB TRFFC OFF AT CULVER AVE, NB TRFFC OFF AT SAND CYN</DETAIL>
-				<AUDIO Length = "22" Path = "189/18911.wav" />
+				<AUDIO Length = "22" Path = "189/18911.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18911.wav">
+		<CHP_RADIO RadioFile="18911.mp3">
 			<DIALOG>
 				<LINE Role="Field">	Santa Lucia 28-S4.</LINE>				
@@ -2953,9 +2953,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>NEGOTIATOR 1097</DETAIL>
-				<AUDIO Length = "20" Path = "189/18912.wav" />
+				<AUDIO Length = "20" Path = "189/18912.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18912.wav">
+		<CHP_RADIO RadioFile="18912.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -2988,9 +2988,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>NB LNS SHUT DOWN</DETAIL>
-				<AUDIO Length = "16" Path = "189/18913.wav" />
+				<AUDIO Length = "16" Path = "189/18913.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18913.wav">
+		<CHP_RADIO RadioFile="18913.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-19.</LINE>				
@@ -3010,9 +3010,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>SUSP WON'T ALLOW NEGOTIATOR NEAR HIM</DETAIL>
-				<AUDIO Length = "22" Path = "189/18914.wav" />
+				<AUDIO Length = "22" Path = "189/18914.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="18914.wav">
+		<CHP_RADIO RadioFile="18914.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -3038,9 +3038,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>28-07 SB LNS SHUT DOWN</DETAIL>
-				<AUDIO Length = "19" Path = "189/18915.wav" />
+				<AUDIO Length = "19" Path = "189/18915.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18915.wav">
+		<CHP_RADIO RadioFile="18915.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-07.</LINE>				
@@ -3062,9 +3062,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>SUSP IS CALMING DOWN.  BOMB SQD 1097</DETAIL>
-				<AUDIO Length = "18" Path = "189/18916.wav" />
+				<AUDIO Length = "18" Path = "189/18916.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18916.wav">
+		<CHP_RADIO RadioFile="18916.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>
@@ -3156,10 +3156,10 @@
 				<DETAIL>9-22 ENRT FROM 57 @ CHAPMAN</DETAIL>
 				<UNIT UnitNum="9-22" Status="ENRT" Primary="true" Active="true"/>
-				<AUDIO Length = "24" Path = "190/19001.wav" />
+				<AUDIO Length = "24" Path = "190/19001.mp3" />
 				
 			</CAD_INCIDENT_EVENT>					
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="19001.wav">
+		<CHP_RADIO RadioFile="19001.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">9-22 Santa Lucia.</LINE>				
@@ -3209,9 +3209,9 @@
 				<DETAIL>UNID LIQUID LEAKING FROM TNKR, NEED TO CLOSE NB LANES, REQ UNITS</DETAIL>
 				<UNIT UnitNum="9-22" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "37" Path = "190/19002.wav" />		
+				<AUDIO Length = "37" Path = "190/19002.mp3" />		
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="19002.wav">
+		<CHP_RADIO RadioFile="19002.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -3261,9 +3261,9 @@
 				<UNIT UnitNum="9-23" Status="ENRT" Primary="false" Active="true"/>
 				<UNIT UnitNum="9-26" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "41" Path = "190/19003.wav" />		
+				<AUDIO Length = "41" Path = "190/19003.mp3" />		
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="19003.wav">
+		<CHP_RADIO RadioFile="19003.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">9-23, 9-26 Santa Lucia.</LINE>				
@@ -3288,5 +3288,5 @@
 			<CAD_INCIDENT_EVENT>			
 				<DETAIL>1141, FD 1097, TRCK DRVR 1180 UNCONCIOUS, 2 1181S, LIQUID LEAKING INTO #2 LN. #2,3,4 BLKD AT THIS TIME</DETAIL>
-				<AUDIO Length = "35" Path = "190/19004.wav" />		
+				<AUDIO Length = "35" Path = "190/19004.mp3" />		
 				
 				<PARAMICS LocationID="190_N_5_ML">
@@ -3301,5 +3301,5 @@
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="19004.wav">
+		<CHP_RADIO RadioFile="19004.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -3354,9 +3354,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>NEGOTIATOR MAKING PROGRESS, SUSP MAY SURRENDER</DETAIL>
-				<AUDIO Length = "21" Path = "189/18919.wav" />
+				<AUDIO Length = "21" Path = "189/18919.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="18919.wav">
+		<CHP_RADIO RadioFile="18919.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -3379,9 +3379,9 @@
 				<DETAIL>DONT HAVE TO SHUT THE FWY, LIQUID ID'D AS MILK.  #1 LN WILL REMAIN OPEN.</DETAIL>
 				<DETAIL>ATTEMPTING TO CONTROL THE LEAK. REQ BIG RIG AND ROT 1185</DETAIL>
-				<AUDIO Length = "27" Path = "190/19005.wav" />
+				<AUDIO Length = "27" Path = "190/19005.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="19005.wav">
+		<CHP_RADIO RadioFile="19005.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>
@@ -3473,9 +3473,9 @@
 				<DETAIL>9-23 1097, REQ TMT, TRAFFIC BACKING</DETAIL>
 				<UNIT UnitNum="9-23" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "21" Path = "190/19006.wav" />
+				<AUDIO Length = "21" Path = "190/19006.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="19006.wav">
+		<CHP_RADIO RadioFile="19006.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-23.</LINE>				
@@ -3512,9 +3512,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>MAN TRIED TO DETONATE THE DEVICE, BOMB DIDNT ACTIVATE, PD APPRHNDNG</DETAIL>
-				<AUDIO Length = "23" Path = "189/18921.wav" />
+				<AUDIO Length = "23" Path = "189/18921.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>			
 		
-		<CHP_RADIO RadioFile="18921.wav">
+		<CHP_RADIO RadioFile="18921.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -3536,9 +3536,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>SUSP IN CUSTODY, BOMB SQD INSPECTING BOMB</DETAIL>
-				<AUDIO Length = "20" Path = "189/18922.wav" />
+				<AUDIO Length = "20" Path = "189/18922.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18922.wav">
+		<CHP_RADIO RadioFile="18922.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -3567,9 +3567,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>PREPARING TO TRANSPORT VICTIMS, #1 LN OPN</DETAIL>
-				<AUDIO Length = "15" Path = "190/19007.wav" />
+				<AUDIO Length = "15" Path = "190/19007.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="19007.wav">
+		<CHP_RADIO RadioFile="19007.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -3621,9 +3621,9 @@
 				<DETAIL>9-26 1097 VICTIMS TRANSPORTED</DETAIL>
 				<UNIT UnitNum="9-26" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "15" Path = "190/19008.wav" />
+				<AUDIO Length = "15" Path = "190/19008.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19008.wav">
+		<CHP_RADIO RadioFile="19008.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-26.</LINE>				
@@ -3655,5 +3655,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>CODE A, BOMB DEFUSED, LNS BEING OPENED</DETAIL>
-				<AUDIO Length = "19" Path = "189/18923.wav" />
+				<AUDIO Length = "19" Path = "189/18923.mp3" />
 				
 				<PARAMICS LocationID="189_N_405_ML">
@@ -3676,5 +3676,5 @@
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="18923.wav">
+		<CHP_RADIO RadioFile="18923.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -3719,9 +3719,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>HOLE IN TANKER PLUGGED, FD WASHING DOWN RDWY</DETAIL>
-				<AUDIO Length = "20" Path = "190/19009.wav" />
+				<AUDIO Length = "20" Path = "190/19009.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="19009.wav">
+		<CHP_RADIO RadioFile="19009.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -3746,9 +3746,9 @@
 				<UNIT UnitNum="28-11" Status="1098" Primary="false" Active="false"/>
 				<UNIT UnitNum="28-07" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "21" Path = "189/18924.wav" />
+				<AUDIO Length = "21" Path = "189/18924.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18924.wav">
+		<CHP_RADIO RadioFile="18924.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-07.</LINE>				
@@ -3861,9 +3861,9 @@
 				<UNIT UnitNum="28-13" Status="1098" Primary="false" Active="false"/>
 				<UNIT UnitNum="28-19" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "22" Path = "189/18925.wav" />
+				<AUDIO Length = "22" Path = "189/18925.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="18925.wav">
+		<CHP_RADIO RadioFile="18925.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-19.</LINE>
@@ -3903,9 +3903,9 @@
 				<UNIT UnitNum="28-24" Status="1098" Primary="true" Active="false"/>
 				<UNIT UnitNum="28-S4" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "24" Path = "189/18926.wav" />
+				<AUDIO Length = "24" Path = "189/18926.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="18926.wav">
+		<CHP_RADIO RadioFile="18926.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 28-S4.</LINE>				
@@ -3930,10 +3930,10 @@
 				<DETAIL>17-14 ENRT FROM 405 AT EUCLID</DETAIL>
 				<UNIT UnitNum="17-14" Status="ENRT" Primary="true" Active="true"/>
-				<AUDIO Length = "24" Path = "191/19101.wav" />
+				<AUDIO Length = "24" Path = "191/19101.mp3" />
 				
 			</CAD_INCIDENT_EVENT>	
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19101.wav">
+		<CHP_RADIO RadioFile="19101.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">17-14 Santa Lucia.</LINE>				
@@ -3965,9 +3965,9 @@
 				<DETAIL>1185 ROT 1097</DETAIL>
 				<TOW Company="Martins" ConfNum="(949)555-2031" PubNum="(949)555-9067" Beat=""/>
-				<AUDIO Length = "16" Path = "190/19010.wav" />
+				<AUDIO Length = "16" Path = "190/19010.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="19010.wav">
+		<CHP_RADIO RadioFile="19010.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -3987,9 +3987,9 @@
 				<DETAIL>BIG RIG 1185 1097, ONCE FD IS DONE, WILL START CLEANUP</DETAIL>
 				<TOW Company="Imperial" ConfNum="(949)555-1128" PubNum="(949)555-1520" Beat=""/>
-				<AUDIO Length = "22" Path = "190/19011.wav" />
+				<AUDIO Length = "22" Path = "190/19011.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 
-		<CHP_RADIO RadioFile="19011.wav">
+		<CHP_RADIO RadioFile="19011.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4061,5 +4061,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>FD DONE, OPENING #2, STARTING CLEANUP</DETAIL>
-				<AUDIO Length = "19" Path = "190/19012.wav" />
+				<AUDIO Length = "19" Path = "190/19012.mp3" />
 				
 				<PARAMICS LocationID="190_N_5_ML">
@@ -4073,5 +4073,5 @@
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="19012.wav">
+		<CHP_RADIO RadioFile="19012.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4093,9 +4093,9 @@
 				<DETAIL>RV ON FIRE ON RS, 2 1181S, PARAMEDICS 1097, REQ UNIT TO ASSIST</DETAIL>
 				<UNIT UnitNum="17-14" Status="1097" Primary="true" Active="true"/>
-				<AUDIO Length = "42" Path = "191/19102.wav" />
+				<AUDIO Length = "42" Path = "191/19102.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="19102.wav">
+		<CHP_RADIO RadioFile="19102.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4130,10 +4130,10 @@
 				<DETAIL>17-16 ENRT FROM S-405 @ EUCLID TO ASSIST 17-14</DETAIL>
 				<UNIT UnitNum="17-16" Status="ENRT" Primary="false" Active="true"/>
-				<AUDIO Length = "20" Path = "191/19103.wav" />
+				<AUDIO Length = "20" Path = "191/19103.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
 		
-		<CHP_RADIO RadioFile="19103.wav">
+		<CHP_RADIO RadioFile="19103.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">17-16 Santa Lucia.</LINE>				
@@ -4163,5 +4163,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>FD 1097, CLOSING RT LN, REQ TMT, TRAFFIC ADVISORY</DETAIL>
-				<AUDIO Length = "24" Path = "191/19104.wav" />
+				<AUDIO Length = "24" Path = "191/19104.mp3" />
 				
 				<PARAMICS LocationID="191_S_73_ML">
@@ -4173,5 +4173,5 @@
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="19104.wav">
+		<CHP_RADIO RadioFile="19104.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4215,9 +4215,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>#2 LN OPN, FULL CLNUP IN 20</DETAIL>
-				<AUDIO Length = "18" Path = "190/19013.wav" />
+				<AUDIO Length = "18" Path = "190/19013.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19013.wav">
+		<CHP_RADIO RadioFile="19013.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4293,9 +4293,9 @@
 				<DETAIL>17-14 1097</DETAIL>
 				<UNIT UnitNum="17-16" Status="1097" Primary="false" Active="true"/>
-				<AUDIO Length = "24" Path = "191/19105.wav" />
+				<AUDIO Length = "24" Path = "191/19105.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19105.wav">
+		<CHP_RADIO RadioFile="19105.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-16</LINE>				
@@ -4322,9 +4322,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>VEH READY TO BE TOWED, TRCK AND TNKR BEING UPRIGHTED</DETAIL>
-				<AUDIO Length = "19" Path = "190/19014.wav" />
+				<AUDIO Length = "19" Path = "190/19014.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 
-		<CHP_RADIO RadioFile="19014.wav">
+		<CHP_RADIO RadioFile="19014.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4345,9 +4345,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>VICTIMS TRANSPORTED, PASSERS BY RESCUED VICTIMS</DETAIL>
-				<AUDIO Length = "24" Path = "191/19106.wav" />
+				<AUDIO Length = "24" Path = "191/19106.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19106.wav">
+		<CHP_RADIO RadioFile="19106.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4397,9 +4397,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>FIRE IS OUT, FD INVESTIGATING CAUSE OF FIRE</DETAIL>
-				<AUDIO Length = "19" Path = "191/19107.wav" />
+				<AUDIO Length = "19" Path = "191/19107.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19107.wav">
+		<CHP_RADIO RadioFile="19107.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4420,9 +4420,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>VEH TOWED, TNKR UPRGHT, FULL OPENING IN 10</DETAIL>
-				<AUDIO Length = "20" Path = "190/19015.wav" />
+				<AUDIO Length = "20" Path = "190/19015.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19015.wav">
+		<CHP_RADIO RadioFile="19015.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4460,9 +4460,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>REQ FLAT BED 1185, FD 98 IN 15</DETAIL>
-				<AUDIO Length = "22" Path = "191/19108.wav" />
+				<AUDIO Length = "22" Path = "191/19108.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19108.wav">
+		<CHP_RADIO RadioFile="19108.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4507,9 +4507,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>1039 1185 ENRT, ETA 10</DETAIL>
-				<AUDIO Length = "18" Path = "191/19109.wav" />
+				<AUDIO Length = "18" Path = "191/19109.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19109.wav">
+		<CHP_RADIO RadioFile="19109.mp3">
 			<DIALOG>
 				<LINE Role="Dispatch">17-14 Santa Lucia information.</LINE>				
@@ -4538,9 +4538,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>TANKER READY FOR TOW, FINISHING CLEANUP</DETAIL>
-				<AUDIO Length = "18" Path = "190/19016.wav" />
+				<AUDIO Length = "18" Path = "190/19016.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19016.wav">
+		<CHP_RADIO RadioFile="19016.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4569,5 +4569,5 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>TANKER TOWED, RDWY CLR, OPENING LANES</DETAIL>
-				<AUDIO Length = "20" Path = "190/19017.wav" />
+				<AUDIO Length = "20" Path = "190/19017.mp3" />
 				
 				<PARAMICS LocationID="190_N_5_ML">
@@ -4577,5 +4577,5 @@
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19017.wav">
+		<CHP_RADIO RadioFile="19017.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4628,9 +4628,9 @@
 				<DETAIL>1185 1097, INVESTIGATION NEARLY COMPLETE</DETAIL>
 				<TOW Company="Martins" ConfNum="(949)555-2031" PubNum="(949)555-9067" Beat=""/>
-				<AUDIO Length = "21" Path = "191/19111.wav" />
+				<AUDIO Length = "21" Path = "191/19111.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19111.wav">
+		<CHP_RADIO RadioFile="19111.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4655,9 +4655,9 @@
 				<UNIT UnitNum="9-23" Status="1098" Primary="false" Active="false"/>
 				<UNIT UnitNum="9-26" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "21" Path = "190/19018.wav" />
+				<AUDIO Length = "21" Path = "190/19018.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
 		
-		<CHP_RADIO RadioFile="19018.wav">
+		<CHP_RADIO RadioFile="19018.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 9-22.</LINE>				
@@ -4676,9 +4676,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>FD INVESTIGATION COMPLETE, SPRAYING RS, FIRE CAUSED BY KITCHEN FIRE</DETAIL>
-				<AUDIO Length = "20" Path = "191/19112.wav" />
+				<AUDIO Length = "20" Path = "191/19112.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19112.wav">
+		<CHP_RADIO RadioFile="19112.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4723,8 +4723,8 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>RV READY FOR 1185, LN OPN IN 10</DETAIL>
-				<AUDIO Length = "21" Path = "191/19113.wav" />
+				<AUDIO Length = "21" Path = "191/19113.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>	
-		<CHP_RADIO RadioFile="19113.wav">
+		<CHP_RADIO RadioFile="19113.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4758,9 +4758,9 @@
 			<CAD_INCIDENT_EVENT>
 				<DETAIL>RV TOWED, LANES OPEN IN 5</DETAIL>
-				<AUDIO Length = "17" Path = "191/19114.wav" />
+				<AUDIO Length = "17" Path = "191/19114.mp3" />
 			</CAD_INCIDENT_EVENT>		
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19114.wav">
+		<CHP_RADIO RadioFile="19114.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-14.</LINE>				
@@ -4803,5 +4803,5 @@
 				<UNIT UnitNum="17-14" Status="1098" Primary="true" Active="false"/>
 				<UNIT UnitNum="17-16" Status="1098" Primary="false" Active="false"/>
-				<AUDIO Length = "19" Path = "191/19115.wav" />
+				<AUDIO Length = "19" Path = "191/19115.mp3" />
 				
 				<PARAMICS LocationID="191_S_73_ML">
@@ -4811,5 +4811,5 @@
 		</CAD_DATA>		
 		
-		<CHP_RADIO RadioFile="19115.wav">
+		<CHP_RADIO RadioFile="19115.mp3">
 			<DIALOG>
 				<LINE Role="Field">Santa Lucia 17-16.</LINE>
Index: /trunk/src/tmcsim/application.properties
===================================================================
--- /trunk/src/tmcsim/application.properties	(revision 51)
+++ /trunk/src/tmcsim/application.properties	(revision 52)
@@ -1,5 +1,5 @@
-#Sun, 03 Jul 2016 06:56:35 -0700
+#Sun, 03 Jul 2016 08:10:42 -0700
 
-Application.revision=49
+Application.revision=51
 
-Application.buildnumber=20
+Application.buildnumber=21
Index: /trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java
===================================================================
--- /trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 47)
+++ /trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 52)
@@ -1,6 +1,4 @@
 package tmcsim.paramicscommunicator;
 
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
 import java.io.EOFException;
 import java.io.File;
@@ -22,8 +20,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import tmcsim.common.CADProtocol.PARAMICS_ACTIONS;
 import tmcsim.common.CADProtocol.PARAMICS_COMM_TAGS;
@@ -60,9 +56,8 @@
  * @version $Date: 2009/04/17 16:27:46 $ $Revision: 1.7
  */
-public class ParamicsCommunicator extends Observable implements Observer, Runnable
+public class ParamicsCommunicator extends Observable implements Observer
 {
 
-    private static final String CONFIG_FILE_NAME = "paramics_communicator_config.properties";
-	/**
+    /**
      * Error logger.
      */
@@ -78,6 +73,5 @@
 
         SOCKET_PORT("SocketPort"),
-        WORKING_DIR("WorkingDirectory"),
-        GUI_VISIBLE("GUIvisible");
+        WORKING_DIR("WorkingDirectory");
         public String name;
 
@@ -122,5 +116,9 @@
      * The view class for the ParamicsCommunicator.
      */
-    private ParamicsCommunicatorGUI theGUI;
+    private static ParamicsCommunicatorGUI theGUI;
+    /**
+     * The thread used to initialize the socket connection with the CADSimulator
+     */
+    Thread initThread;
 
     /**
@@ -140,13 +138,7 @@
     public ParamicsCommunicator(String propertiesFile)
     {
-        paramLogger.logp(Level.INFO, "ParamicsCommunicator", "Constructor",
-                "Entering ");
-
         writers = new TreeMap<String, ParamicsFileWriter>();
         readers = new TreeMap<String, ParamicsFileReader>();
 
-        theGUI = new ParamicsCommunicatorGUI();
-        addObserver(theGUI);
-        theGUI.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         try
         {
@@ -160,5 +152,6 @@
                         "Invalid Configuration", JOptionPane.ERROR_MESSAGE);
                 System.exit(0);
-            } else if (paramicsCommProp.getProperty(PROPERTIES.WORKING_DIR.name) == null
+            }
+            else if (paramicsCommProp.getProperty(PROPERTIES.WORKING_DIR.name) == null
                     || paramicsCommProp.getProperty(PROPERTIES.WORKING_DIR.name).length() == 0)
             {
@@ -176,5 +169,6 @@
                         if (workingDir == null)
                         {
-                        } else if (!new File(workingDir).exists())
+                        }
+                        else if (!new File(workingDir).exists())
                         {
                             JOptionPane.showMessageDialog(null,
@@ -183,5 +177,6 @@
 
                             workingDir = null;
-                        } else if (!new File(workingDir).isDirectory())
+                        }
+                        else if (!new File(workingDir).isDirectory())
                         {
                             JOptionPane.showMessageDialog(null,
@@ -217,24 +212,47 @@
         }
 
-        // Should we display the GUI?
-        String visibleProp = paramicsCommProp.getProperty(PROPERTIES.GUI_VISIBLE.name);
-        // If no property was given, or if it was given and says True
-        if (visibleProp == null || (visibleProp.toLowerCase().equals("true")))
-        {
-            theGUI = new ParamicsCommunicatorGUI(); // it sets itself visible
-            addObserver(theGUI);
-            theGUI.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
-        }
-
-        try
-        {
-            initializeSockets(Integer.parseInt(paramicsCommProp.getProperty(
-                    PROPERTIES.SOCKET_PORT.name).trim()));
-        } catch (Exception e)
-        {
-            paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Constructor",
-                    "Exception in initializing sockets.", e);
-        }
-
+        Integer desiredPort = Integer.parseInt(paramicsCommProp.getProperty(
+                PROPERTIES.SOCKET_PORT.name).trim());
+        /* Start a thread to initialize the sockets that talk to CADsimulator */
+        initThread = new Thread(new SocketStarter(desiredPort));
+        initThread.start();
+    }
+
+    /**
+     * For testing, we want to be able to provide a non-visible instance of the
+     * GUI to be used. (As main won't be called).
+     *
+     * @param viewer
+     */
+    public void setGUI(ParamicsCommunicatorGUI viewer)
+    {
+        theGUI = viewer;
+        addObserver(theGUI);
+    }
+
+    /**
+     * Start the thread that does the main work of the communicator. This method
+     * waits until the initial thread has opened the needed sockets to connect
+     * to the CADSimulator, then it starts the socket reader thread, which runs
+     * until the application is terminated. Usage: Normally this method is
+     * called immediately after constructing this object, but for testing
+     * purposes it is available to be invoked by the test harness after the
+     * Simulation Manager initiates a connection.
+     */
+    public void startReading()
+    {
+        while (initThread.isAlive())
+        {
+            try
+            {
+                Thread.sleep(1000);
+            } catch (InterruptedException ex)
+            {
+                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "runstarter",
+                        "Sleep interrupted.");
+            }
+        }
+        Runnable sr = new SocketReader();
+        new Thread(sr).start();
     }
 
@@ -276,84 +294,88 @@
     }
 
-    /**
-     * Runnable method. While this thread is not interrupted, read in an object
-     * from the socket input stream. If an object exists, call doMessage() to
-     * parse and perform the received action in the message.
-     */
-    public void run()
-    {
-
-        while (true)
-        {
-            try
-            {
-                doMessage((Document) in.readObject());
-            } catch (SocketTimeoutException ste)
-            {
-                //just try again
-            } catch (EOFException eofe)
-            {
-                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                        "run", "EOF Exception in reading data from the socket.", eofe);
+    private class SocketReader implements Runnable
+    {
+
+        /**
+         * Runnable method. While this thread is not interrupted, read in an
+         * object from the socket input stream. If an object exists, call
+         * doMessage() to parse and perform the received action in the message.
+         */
+        public void run()
+        {
+
+            while (true)
+            {
+                try
+                {
+                    doMessage((Document) in.readObject());
+                } catch (SocketTimeoutException ste)
+                {
+                    //just try again
+                } catch (EOFException eofe)
+                {
+                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
+                            "run", "EOF Exception in reading data from the socket.", eofe);
+                } catch (Exception e)
+                {
+                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
+                            "run", "Exception in reading data from the socket.", e);
+
+                    JOptionPane.showMessageDialog(theGUI,
+                            "Connection has been lost to the CAD Simulator.  "
+                            + "Paramics Communicator will now shutdown.",
+                            "Dropped Connection", JOptionPane.ERROR_MESSAGE);
+                    break;
+                }
+                try
+                {
+                    // Sleep for a second while waiting in this infinite loop
+                    // to yield to other threads run by test harness.
+                    Thread.sleep(1000);
+                } catch (InterruptedException ex)
+                {
+                    paramLogger.logp(Level.INFO, "ParamicsCommunicator",
+                            "run", "Exception in reading data from the socket.", ex);
+                }
+            }
+
+
+            try
+            {
+                in.close();
             } catch (Exception e)
             {
-                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                        "run", "Exception in reading data from the socket.", e);
-
-                JOptionPane.showMessageDialog(theGUI,
-                        "Connection has been lost to the CAD Simulator.  "
-                        + "Paramics Communicator will now shutdown.",
-                        "Dropped Connection", JOptionPane.ERROR_MESSAGE);
-                break;
-            }
-            try
-            {
-                Thread.sleep(2000);
-                paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                        "run", "sleeping.");
-            } catch (InterruptedException ex)
-            {
-                paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                        "run", "Exception in reading data from the socket.", ex);
-            }
-        }
-
-
-        try
-        {
-            in.close();
-        } catch (Exception e)
-        {
-        }
-        try
-        {
-            out.close();
-        } catch (Exception e)
-        {
-        }
-        try
-        {
-            serverSocket.close();
-        } catch (Exception e)
-        {
-        }
-        try
-        {
-            paramicsSocket.close();
-        } catch (Exception e)
-        {
-        }
-
-    }
-
-    /**
-     * Perform the action represented in XML document message received from the
-     * CAD Simulator. First determine if the action is from a READER, WRITER,
-     * and RESET. If the paramics action is REGISTER, add a new
-     * ParamicsFileReader/Writer to the local list of readers/writers and update
-     * the GUI with a FileRegUpdate object. If the paramics action is
-     * UNREGISTER, remove the ParamicsFileReader/Writer from the local list of
-     * readers/writers and update the GUI with a FileRegUpdate object. If RESET
-     * is received, clear all readers and writers.
+            }
+            try
+            {
+                out.close();
+            } catch (Exception e)
+            {
+            }
+            try
+            {
+                serverSocket.close();
+            } catch (Exception e)
+            {
+            }
+            try
+            {
+                paramicsSocket.close();
+            } catch (Exception e)
+            {
+            }
+
+        }
+    }
+
+    /**
+     * Perform the action represented in the received XML document message.
+     * First determine if the action is from a READER, WRITER, and RESET. If the
+     * paramics action is REGISTER, add a new ParamicsFileReader/Writer to the
+     * local list of readers/writers and update the GUI with a FileRegUpdate
+     * object. If the paramics action is UNREGISTER, remove the
+     * ParamicsFileReader/Writer from the local list of readers/writers and
+     * update the GUI with a FileRegUpdate object. If RESET is received, clear
+     * all readers and writers.
      *
      * @param mess Received XML document message.
@@ -437,69 +459,87 @@
     }
 
-    /**
-     * Method waits to accept a socket connection from the CAD Simulator. When a
-     * connection has been established the method exits. The input and output
-     * streams are created on the new socket.
-     *
-     * @param socketPort Socket port to use for establishing Socket
-     * communication.
-     * @throws IOException if there is an exception in establishing Socket
-     * communication.
-     */
-    private void initializeSockets(Integer socketPort) throws IOException
-    {
-
-        boolean waiting = true;
-
-        try
-        {
-            serverSocket = new ServerSocket(socketPort);
-            //delay for accept timeout(milliseconds)
-            serverSocket.setSoTimeout(10 * 1000);
-        } catch (IOException ioe)
-        {
-            throw new IOException("Exception in creating "
-                    + "the server socket on port " + socketPort);
-        }
-
-        while (waiting)
-        {
-            try
-            {
-                paramicsSocket = serverSocket.accept();
-                waiting = false;
-            } catch (SocketTimeoutException ste)
-            {
-                System.out.println("...waiting...");
+    private class SocketStarter implements Runnable
+    {
+
+        Integer socketPort;
+
+        /**
+         * Method waits to accept a socket connection from the CAD Simulator.
+         * When a connection has been established the method exits. The input
+         * and output streams are created on the new socket.
+         *
+         * @param socketPort Socket port to use for establishing Socket
+         * communication.
+         * @throws IOException if there is an exception in establishing Socket
+         * communication.
+         */
+        //private void initializeSockets(Integer socketPort) throws IOException
+        public SocketStarter(Integer socketPort)
+        {
+            this.socketPort = socketPort;
+        }
+
+        public void run()
+        {
+
+            boolean waiting = true;
+
+            try
+            {
+                serverSocket = new ServerSocket(socketPort);
+                //delay for accept timeout(milliseconds)
+                serverSocket.setSoTimeout(10 * 1000);
+            } catch (IOException ioe)
+            {
+                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
+                        "initializeSockets", "Exception in creating "
+                        + "the server socket on port " + socketPort + ", terminating.");
+                System.exit(1);
+            }
+
+            while (waiting)
+            {
                 try
                 {
-                    Thread.sleep(2000);
-                    paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                            "initializeSockets", "sleeping.");
-                } catch (InterruptedException ex)
-                {
-                    paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                            "initializeSockets", "Exception exiting for socket.", ex);
+                    paramicsSocket = serverSocket.accept();
+                    waiting = false;
+                } catch (SocketTimeoutException ste)
+                {
+                    System.out.println("...waiting...");
+                    try
+                    {
+                        Thread.sleep(2000);
+                        paramLogger.logp(Level.INFO, "ParamicsCommunicator",
+                                "initializeSockets", "sleeping.");
+                    } catch (InterruptedException ex)
+                    {
+                        paramLogger.logp(Level.INFO, "ParamicsCommunicator",
+                                "initializeSockets", "Exception exiting for socket.", ex);
+                    }
+                } catch (IOException ioe)
+                {
+                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
+                            "initializeSockets", "Exception in creating "
+                            + "the receiving socket on port " + socketPort + ", terminating.");
+                    System.exit(1);
                 }
+
+            }
+
+
+            //** out must be performed before in to unlock for connecting socket **//
+            try
+            {
+                out = new ObjectOutputStream(paramicsSocket.getOutputStream());
+                in = new ObjectInputStream(paramicsSocket.getInputStream());
             } catch (IOException ioe)
             {
-                throw new IOException("Exception in creating "
-                        + "the receiving socket on port " + socketPort);
-            }
-
-        }
-
-
-        //** out must be performed before in to unlock for connecting socket **//
-        try
-        {
-            out = new ObjectOutputStream(paramicsSocket.getOutputStream());
-            in = new ObjectInputStream(paramicsSocket.getInputStream());
-        } catch (IOException ioe)
-        {
-            throw new IOException("Exception in creating input "
-                    + "and output streams on socket.");
-        }
-
+                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
+                        "initializeSockets", "Exception in creating "
+                        + "input and output streams on socket, terminating.");
+                System.exit(1);
+            }
+
+        }
     }
 
@@ -510,15 +550,27 @@
      * @param args Command line arguments.
      */
-    public static void main(String[] args) {
-    	if(System.getProperty("CONFIG_DIR") == null){
-        	System.setProperty("CONFIG_DIR", "config");
-        }
-    	
-        try{
-
-        	UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new Thread(new ParamicsCommunicator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME)).start();
-        
-        } catch (Exception e) {
+    public static void main(String[] args)
+    {
+        System.setProperty("PARAMICS_COMM_PROPERTIES", "config/paramics_communicator_config.properties");
+
+        try
+        {
+            if (System.getProperty("PARAMICS_COMM_PROPERTIES") != null)
+            {
+                ParamicsCommunicator pc = new ParamicsCommunicator(System.getProperty("PARAMICS_COMM_PROPERTIES"));
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+                theGUI = new ParamicsCommunicatorGUI();
+                pc.addObserver(theGUI);
+                theGUI.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                theGUI.setVisible(true);
+                pc.startReading();
+
+            }
+            else
+            {
+                throw new Exception("PARAMICS_COMM_PROPERTIES system property not defined.");
+            }
+        } catch (Exception e)
+        {
             paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Main",
                     "Error occured initializing application", e);
Index: unk/src/tmcsim/paramicscommunicator/PComm.java
===================================================================
--- /trunk/src/tmcsim/paramicscommunicator/PComm.java	(revision 47)
+++ 	(revision )
@@ -1,586 +1,0 @@
-package tmcsim.paramicscommunicator;
-
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.util.Observable;
-import java.util.Observer;
-import java.util.Properties;
-import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import tmcsim.common.CADProtocol.PARAMICS_ACTIONS;
-import tmcsim.common.CADProtocol.PARAMICS_COMM_TAGS;
-import tmcsim.paramicscommunicator.FileIOUpdate.IO_TYPE;
-import tmcsim.paramicscommunicator.FileRegUpdate.REG_TYPE;
-import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
-
-/**
- * ParamicsCommunicator is the main class for this module. The Paramics
- * Communicator is used to provide communication between the CAD Simulator and
- * the Paramics traffic modeler. While the application is running, data is
- * received on a socket from the CAD Simulator. Transmitted data are XML
- * documents containing information and action commands. The CAD Simulator
- * registers readers and writers with the ParamicsCommunicator. Any data read by
- * a ParamicsReader is sent back to the CAD Simulator. All data to be written by
- * a ParamicsWriter is received through the socket.<br><br>
- * The properties file for the ParamicsCommunicator class contains the following
- * data.<br>
- * <code>
- * -----------------------------------------------------------------------------<br>
- * Socket Port The port number to use for socket communication.<br>
- * Working Directory The working directory use for Paramics file
- * communication.<br>
- * Error File The target file to use for error logging.<br>
- * -----------------------------------------------------------------------------<br>
- * Example File: <br>
- * SocketPort = 4450 <br>
- * WorkingDirectory = c:\\tmc_simulator\\ <br>
- * ErrorFile = sim_mgr_error.xml <br>
- * -----------------------------------------------------------------------------<br>
- * </code>
- *
- * @author Matthew Cechini (mcechini@calpoly.edu)
- * @version $Date: 2009/04/17 16:27:46 $ $Revision: 1.7
- */
-public class PComm extends Observable implements Observer
-{
-
-    /**
-     * Error logger.
-     */
-    private static Logger paramLogger = Logger.getLogger("tmcsim.paramicscommunicator");
-
-    /**
-     * Enumeration containing property names.
-     *
-     * @author Matthew Cechini
-     */
-    private static enum PROPERTIES
-    {
-
-        SOCKET_PORT("SocketPort"),
-        WORKING_DIR("WorkingDirectory");
-        public String name;
-
-        private PROPERTIES(String n)
-        {
-            name = n;
-        }
-    }
-    /**
-     * Properties object.
-     */
-    private Properties paramicsCommProp = null;
-    /**
-     * Current working directory where files will be read and written
-     */
-    private String workingDirectory = null;
-    /**
-     * Socket used to create socket communication with the CAD Simulator.
-     */
-    private ServerSocket serverSocket = null;
-    /**
-     * Soccket used to communicate with CAD Simulator.
-     */
-    private Socket paramicsSocket = null;
-    /**
-     * Input Stream for reading data from the CAD Simulator.
-     */
-    private ObjectInputStream in = null;
-    /**
-     * Output Stream for writing data to the CAD Simulator.
-     */
-    private ObjectOutputStream out = null;
-    /**
-     * Map of all current ParamicsFileWriters referenced by I/O ID.
-     */
-    private TreeMap<String, ParamicsFileWriter> writers = null;
-    /**
-     * Map of all current ParamicsFileReaders referenced by I/O ID.
-     */
-    private TreeMap<String, ParamicsFileReader> readers = null;
-    /**
-     * The view class for the ParamicsCommunicator.
-     */
-    private static ParamicsCommunicatorGUI theGUI;
-    /**
-     * The thread used to initialize the socket connection with the CADSimulator
-     */
-    Thread initThread;
-
-    /**
-     * Constructor. Read in the property values. If the properties file does not
-     * contain a value for the working directory, open a dialog to prompt the
-     * user for the path of the Paramics working directory. An empty string is
-     * not accepted. A null signifies that the user pressed cancel. Prompt the
-     * user to accept the cancel and exit the application if confirmed. Continue
-     * until a valid directory has been entered, that exists, and append a '\'
-     * to the end of the directory if necessary.
-     *
-     * Initialize the Sockets and begin communication.
-     *
-     * @param propertiesFilePath File Path of ParamicsCommunicator properties
-     * file.
-     */
-    public PComm(String propertiesFile)
-    {
-        writers = new TreeMap<String, ParamicsFileWriter>();
-        readers = new TreeMap<String, ParamicsFileReader>();
-
-        try
-        {
-            paramicsCommProp = new Properties();
-            paramicsCommProp.load(new FileInputStream(propertiesFile));
-
-            if (paramicsCommProp.getProperty(PROPERTIES.SOCKET_PORT.name) == null)
-            {
-                JOptionPane.showMessageDialog(theGUI,
-                        "Properties file missing CAD Simulator Port information.",
-                        "Invalid Configuration", JOptionPane.ERROR_MESSAGE);
-                System.exit(0);
-            }
-            else if (paramicsCommProp.getProperty(PROPERTIES.WORKING_DIR.name) == null
-                    || paramicsCommProp.getProperty(PROPERTIES.WORKING_DIR.name).length() == 0)
-            {
-
-                try
-                {
-                    String workingDir = null;
-
-                    while (workingDir == null || workingDir.length() == 0)
-                    {
-                        workingDir = JOptionPane.showInputDialog(null,
-                                "Please set the output directory for Paramics communication.",
-                                "Paramics Working Directory", JOptionPane.QUESTION_MESSAGE);
-
-                        if (workingDir == null)
-                        {
-                        }
-                        else if (!new File(workingDir).exists())
-                        {
-                            JOptionPane.showMessageDialog(null,
-                                    "Directory does not exist.",
-                                    "Invalid Working Directory", JOptionPane.WARNING_MESSAGE);
-
-                            workingDir = null;
-                        }
-                        else if (!new File(workingDir).isDirectory())
-                        {
-                            JOptionPane.showMessageDialog(null,
-                                    workingDir + " is not a directory.",
-                                    "Invalid Working Directory", JOptionPane.WARNING_MESSAGE);
-
-                            workingDir = null;
-                        }
-                    }
-
-                    if (workingDir.lastIndexOf("\\") != workingDir.length() - 1)
-                    {
-                        workingDir = workingDir + "\\";
-                    }
-
-                    paramicsCommProp.setProperty(PROPERTIES.WORKING_DIR.name, workingDir);
-                    paramicsCommProp.store(new FileOutputStream(propertiesFile), "");
-                } catch (IOException ioe)
-                {
-                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Constructor",
-                            "Exception in writing properties file.", ioe);
-                }
-
-            }
-
-            workingDirectory = paramicsCommProp.getProperty(
-                    PROPERTIES.WORKING_DIR.name).trim();
-
-        } catch (Exception e)
-        {
-            paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Constructor",
-                    "Exception in reading properties file.", e);
-        }
-
-        Integer desiredPort = Integer.parseInt(paramicsCommProp.getProperty(
-                PROPERTIES.SOCKET_PORT.name).trim());
-        /* Start a thread to initialize the sockets that talk to CADsimulator */
-        initThread = new Thread(new SocketStarter(desiredPort));
-        initThread.start();
-    }
-
-    /**
-     * For testing, we want to be able to provide a non-visible instance of the
-     * GUI to be used. (As main won't be called).
-     *
-     * @param viewer
-     */
-    public void setGUI(ParamicsCommunicatorGUI viewer)
-    {
-        theGUI = viewer;
-        addObserver(theGUI);
-    }
-
-    /**
-     * Start the thread that does the main work of the communicator. This method
-     * waits until the initial thread has opened the needed sockets to connect
-     * to the CADSimulator, then it starts the socket reader thread, which runs
-     * until the application is terminated. Usage: Normally this method is
-     * called immediately after constructing this object, but for testing
-     * purposes it is available to be invoked by the test harness after the
-     * Simulation Manager initiates a connection.
-     */
-    public void startReading()
-    {
-        while (initThread.isAlive())
-        {
-            try
-            {
-                Thread.sleep(1000);
-            } catch (InterruptedException ex)
-            {
-                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "runstarter",
-                        "Sleep interrupted.");
-            }
-        }
-        Runnable sr = new SocketReader();
-        new Thread(sr).start();
-    }
-
-    /**
-     * Transmits a message XML document object to the CAD Simulator.
-     *
-     * @param mess The ParamicsCommMessage to be transmitted.
-     */
-    private void write(Document mess)
-    {
-
-        synchronized (paramicsSocket)
-        {
-            try
-            {
-                out.writeObject(mess);
-                out.flush();
-            } catch (Exception e)
-            {
-                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "write",
-                        "Exception in writing to the socket.", e);
-            }
-        }
-    }
-
-    /**
-     * Observer/Observable update method. The Paramics Communicator observers
-     * registered ParamicsReaders. When messages are to be sent, they are sent
-     * through this method. All messages are ParamicsCommMessage objects. Send
-     * these messages to the write() method for transmission on the socket.
-     */
-    public void update(Observable o, Object arg)
-    {
-
-        if (arg instanceof Document)
-        {
-            write((Document) arg);
-        }
-    }
-
-    private class SocketReader implements Runnable
-    {
-
-        /**
-         * Runnable method. While this thread is not interrupted, read in an
-         * object from the socket input stream. If an object exists, call
-         * doMessage() to parse and perform the received action in the message.
-         */
-        public void run()
-        {
-
-            while (true)
-            {
-                try
-                {
-                    doMessage((Document) in.readObject());
-                } catch (SocketTimeoutException ste)
-                {
-                    //just try again
-                } catch (EOFException eofe)
-                {
-                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                            "run", "EOF Exception in reading data from the socket.", eofe);
-                } catch (Exception e)
-                {
-                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                            "run", "Exception in reading data from the socket.", e);
-
-                    JOptionPane.showMessageDialog(theGUI,
-                            "Connection has been lost to the CAD Simulator.  "
-                            + "Paramics Communicator will now shutdown.",
-                            "Dropped Connection", JOptionPane.ERROR_MESSAGE);
-                    break;
-                }
-                try
-                {
-                    // Sleep for a second while waiting in this infinite loop
-                    // to yield to other threads run by test harness.
-                    Thread.sleep(1000);
-                } catch (InterruptedException ex)
-                {
-                    paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                            "run", "Exception in reading data from the socket.", ex);
-                }
-            }
-
-
-            try
-            {
-                in.close();
-            } catch (Exception e)
-            {
-            }
-            try
-            {
-                out.close();
-            } catch (Exception e)
-            {
-            }
-            try
-            {
-                serverSocket.close();
-            } catch (Exception e)
-            {
-            }
-            try
-            {
-                paramicsSocket.close();
-            } catch (Exception e)
-            {
-            }
-
-        }
-    }
-
-    /**
-     * Perform the action represented in the received XML document message.
-     * First determine if the action is from a READER, WRITER, and RESET. If the
-     * paramics action is REGISTER, add a new ParamicsFileReader/Writer to the
-     * local list of readers/writers and update the GUI with a FileRegUpdate
-     * object. If the paramics action is UNREGISTER, remove the
-     * ParamicsFileReader/Writer from the local list of readers/writers and
-     * update the GUI with a FileRegUpdate object. If RESET is received, clear
-     * all readers and writers.
-     *
-     * @param mess Received XML document message.
-     */
-    private void doMessage(Document mess)
-    {
-
-        Element rootElement = mess.getDocumentElement();
-
-        String id = null;
-        String action = null;
-
-        switch (PARAMICS_COMM_TAGS.fromString(rootElement.getNodeName()))
-        {
-            case READER:
-                id = rootElement.getAttribute(PARAMICS_COMM_TAGS.ID.tag);
-                action = rootElement.getAttribute(PARAMICS_COMM_TAGS.ACTION.tag);
-
-                switch (PARAMICS_ACTIONS.fromString(action))
-                {
-                    case REGISTER:
-                        Integer interval = Integer.parseInt(rootElement.getChildNodes().item(0).getTextContent());
-                        String targetFile = rootElement.getChildNodes().item(1).getTextContent();
-
-                        readers.put(id, new ParamicsFileReader(workingDirectory, id,
-                                interval, targetFile));
-                        readers.get(id).addObserver(this);
-                        readers.get(id).addObserver(theGUI);
-
-                        setChanged();
-                        notifyObservers(new FileRegUpdate(IO_TYPE.READ,
-                                REG_TYPE.REGISTER, id, targetFile, interval));
-                        break;
-                    case UNREGISTER:
-                        readers.get(id).deleteObserver(this);
-                        readers.get(id).deleteObserver(theGUI);
-                        readers.remove(id);
-
-                        setChanged();
-                        notifyObservers(new FileRegUpdate(IO_TYPE.READ,
-                                REG_TYPE.UNREGISTER, id, null, null));
-                        break;
-                }
-                break;
-            case WRITER:
-                id = rootElement.getAttribute(PARAMICS_COMM_TAGS.ID.tag);
-                action = rootElement.getAttribute(PARAMICS_COMM_TAGS.ACTION.tag);
-
-                switch (PARAMICS_ACTIONS.fromString(action))
-                {
-                    case REGISTER:
-                        String targetFile = rootElement.getChildNodes().item(0).getTextContent();
-
-                        writers.put(id, new ParamicsFileWriter(id,
-                                workingDirectory, targetFile));
-                        writers.get(id).addObserver(theGUI);
-
-                        setChanged();
-                        notifyObservers(new FileRegUpdate(IO_TYPE.WRITE,
-                                REG_TYPE.REGISTER, id, targetFile, null));
-                        break;
-                    case UNREGISTER:
-                        writers.remove(id);
-
-                        writers.get(id).deleteObserver(theGUI);
-
-                        setChanged();
-                        notifyObservers(new FileRegUpdate(IO_TYPE.WRITE,
-                                REG_TYPE.UNREGISTER, id, null, null));
-                        break;
-                    case WRITE_FILE:
-                        writers.get(id).writeMessage((Element) rootElement.getChildNodes().item(0));
-                        break;
-                }
-                break;
-            case RESET:
-                readers.clear();
-                writers.clear();
-                break;
-        }
-    }
-
-    private class SocketStarter implements Runnable
-    {
-
-        Integer socketPort;
-
-        /**
-         * Method waits to accept a socket connection from the CAD Simulator.
-         * When a connection has been established the method exits. The input
-         * and output streams are created on the new socket.
-         *
-         * @param socketPort Socket port to use for establishing Socket
-         * communication.
-         * @throws IOException if there is an exception in establishing Socket
-         * communication.
-         */
-        //private void initializeSockets(Integer socketPort) throws IOException
-        public SocketStarter(Integer socketPort)
-        {
-            this.socketPort = socketPort;
-        }
-
-        public void run()
-        {
-
-            boolean waiting = true;
-
-            try
-            {
-                serverSocket = new ServerSocket(socketPort);
-                //delay for accept timeout(milliseconds)
-                serverSocket.setSoTimeout(10 * 1000);
-            } catch (IOException ioe)
-            {
-                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                        "initializeSockets", "Exception in creating "
-                        + "the server socket on port " + socketPort + ", terminating.");
-                System.exit(1);
-            }
-
-            while (waiting)
-            {
-                try
-                {
-                    paramicsSocket = serverSocket.accept();
-                    waiting = false;
-                } catch (SocketTimeoutException ste)
-                {
-                    System.out.println("...waiting...");
-                    try
-                    {
-                        Thread.sleep(2000);
-                        paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                                "initializeSockets", "sleeping.");
-                    } catch (InterruptedException ex)
-                    {
-                        paramLogger.logp(Level.INFO, "ParamicsCommunicator",
-                                "initializeSockets", "Exception exiting for socket.", ex);
-                    }
-                } catch (IOException ioe)
-                {
-                    paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                            "initializeSockets", "Exception in creating "
-                            + "the receiving socket on port " + socketPort + ", terminating.");
-                    System.exit(1);
-                }
-
-            }
-
-
-            //** out must be performed before in to unlock for connecting socket **//
-            try
-            {
-                out = new ObjectOutputStream(paramicsSocket.getOutputStream());
-                in = new ObjectInputStream(paramicsSocket.getInputStream());
-            } catch (IOException ioe)
-            {
-                paramLogger.logp(Level.SEVERE, "ParamicsCommunicator",
-                        "initializeSockets", "Exception in creating "
-                        + "input and output streams on socket, terminating.");
-                System.exit(1);
-            }
-
-        }
-    }
-
-    /**
-     * Construct the ParamicsCommunicator with the properties file path, either
-     * from the command line arguments or default.
-     *
-     * @param args Command line arguments.
-     */
-    public static void main(String[] args)
-    {
-        System.setProperty("PARAMICS_COMM_PROPERTIES", "config/paramics_communicator_config.properties");
-
-        try
-        {
-            if (System.getProperty("PARAMICS_COMM_PROPERTIES") != null)
-            {
-                PComm pc = new PComm(System.getProperty("PARAMICS_COMM_PROPERTIES"));
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-                theGUI = new ParamicsCommunicatorGUI();
-                pc.addObserver(theGUI);
-                theGUI.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                theGUI.setVisible(true);
-                pc.startReading();
-
-            }
-            else
-            {
-                throw new Exception("PARAMICS_COMM_PROPERTIES system property not defined.");
-            }
-        } catch (Exception e)
-        {
-            paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Main",
-                    "Error occured initializing application", e);
-
-            JOptionPane.showMessageDialog(null, e.getMessage(),
-                    "Error - Program Exiting", JOptionPane.ERROR_MESSAGE);
-
-            System.exit(-1);
-        }
-
-
-    }
-}