Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties	(revision 382)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties	(revision 523)
@@ -33,5 +33,5 @@
 platform.active=default_platform
 javac.compilerargs=
-main.class=tmcsim.cadsimulator.CADServer
+main.class=tmcsim.RunSim
 dist.jar=${dist.dir}/TMCSim.jar
 javac.test.processorpath=${javac.test.classpath}
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer.properties	(revision 523)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer.properties	(revision 523)
@@ -0,0 +1,1 @@
+main.class=tmcsim.cadsimulator.CADServer
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer_Console.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer_Console.properties	(revision 523)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer_Console.properties	(revision 523)
@@ -0,0 +1,3 @@
+$label=CADServer Console
+main.class=tmcsim.cadsimulator.CADServer
+run.jvmargs=-DPROP_FILE=cad_simulator_console_config.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Console.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Console.properties	(revision 59)
+++ 	(revision )
@@ -1,1 +1,0 @@
-run.jvmargs=-DCAD_SIM_PROPERTIES=config/cad_simulator_consoletest_config.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Paramics_Sim.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Paramics_Sim.properties	(revision 66)
+++ 	(revision )
@@ -1,3 +1,0 @@
-$label=Paramics Sim
-main.class=paramsim.paramicssimulator.ParamicsSimulator
-run.jvmargs=-DPARAMICS_SIM_PROPERTIES=config/paramics_simulator_config.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ConsoleDriverLocal.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ConsoleDriverLocal.properties	(revision 180)
+++ 	(revision )
@@ -1,2 +1,0 @@
-main.class=atmsdriver.ConsoleTrafficDriver
-run.jvmargs=-DATMSDRIVER_PROPERTIES=config/console_driver_config_local.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriverLocal.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriverLocal.properties	(revision 103)
+++ 	(revision )
@@ -1,2 +1,0 @@
-main.class=atmsdriver.ATMSDriver
-run.jvmargs=-DATMSDRIVER_PROPERTIES=config/atms_driver_config_local.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ParamicsComm.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ParamicsComm.properties	(revision 14)
+++ 	(revision )
@@ -1,2 +1,0 @@
-main.class=tmcsim.paramicscommunicator.ParamicsCommunicator
-run.jvmargs=-DPARAMICS_LOG_PROPERTIES=config/paramics_communicator_logging.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ConsoleDriver.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ConsoleDriver.properties	(revision 180)
+++ 	(revision )
@@ -1,2 +1,0 @@
-main.class=atmsdriver.ConsoleTrafficDriver
-run.jvmargs=-DATMSDRIVER_PROPERTIES=config/console_driver_config.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriver.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriver.properties	(revision 79)
+++ 	(revision )
@@ -1,2 +1,0 @@
-main.class=atmsdriver.ATMSDriver
-run.jvmargs=-DATMSDRIVER_PROPERTIES=config/atms_driver_config.properties
Index: trunk/src/tmcsim/RunSim.java
===================================================================
--- trunk/src/tmcsim/RunSim.java	(revision 523)
+++ trunk/src/tmcsim/RunSim.java	(revision 523)
@@ -0,0 +1,18 @@
+
+package tmcsim;
+
+/**
+ * Run the CAD Server, Client, and Simulation Manager together.
+ * Used for development and testing.
+ * @author jdalbey
+ */
+public class RunSim 
+{
+    public static void main(String[] args) 
+    {
+        tmcsim.cadsimulator.CADServer.main(args);
+        tmcsim.client.CADClient.main(args);
+        String[] scriptname ={"full_script_2016.xml"};
+        tmcsim.simulationmanager.SimulationManager.main(scriptname);
+    }
+}
Index: trunk/src/tmcsim/application.properties
===================================================================
--- trunk/src/tmcsim/application.properties	(revision 478)
+++ trunk/src/tmcsim/application.properties	(revision 523)
@@ -1,5 +1,5 @@
-#Fri, 23 Aug 2019 15:31:44 -0700
+#Tue, 12 Nov 2019 08:57:23 -0800
 
-Application.revision=475
+Application.revision=522
 
-Application.buildnumber=196
+Application.buildnumber=198