Index: trunk/src/tmcsim/cadsimulator/managers/MediaManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/managers/MediaManager.java	(revision 44)
+++ trunk/src/tmcsim/cadsimulator/managers/MediaManager.java	(revision 123)
@@ -19,5 +19,5 @@
 import tmcsim.cadsimulator.videocontrol.DVDStatusUpdate;
 import tmcsim.cadsimulator.videocontrol.DVDTitleUpdate;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.CCTVDirections;
 import tmcsim.common.CCTVInfo;
@@ -74,5 +74,5 @@
     
     /** Reference to the CADSimulatorModel. */
-    private CADSimulatorModel theModel;
+    private CADSimulatorState theModel;
 
     /** Properties object for the Media portion of the CAD. */
@@ -90,5 +90,5 @@
      */
     public MediaManager(String propertiesFile, ATMSManager theATMSManager, 
-            CADSimulatorModel model) {
+            CADSimulatorState model) {
         theDVD_DB   = new DVDPlayerDB();        
         theImage_DB = new StillImagesDB();
Index: trunk/src/tmcsim/cadsimulator/managers/SimulationClockManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/managers/SimulationClockManager.java	(revision 123)
+++ trunk/src/tmcsim/cadsimulator/managers/SimulationClockManager.java	(revision 123)
@@ -0,0 +1,91 @@
+package tmcsim.cadsimulator.managers;
+
+import java.rmi.RemoteException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import tmcsim.cadsimulator.Coordinator;
+import tmcsim.common.CADEnums.SCRIPT_STATUS;
+
+/** Manage the simulation clock, "the heartbeat of the simulation". */
+public class SimulationClockManager  {
+
+    /** 
+     * Define what happens every second.
+     */
+    private class ClockTask extends TimerTask {     
+        public void run() {
+            currentSimTime++;
+            theCoordinator.tick();
+        }
+    }
+    
+    /** The SimulationTimer used to keep track of simulation time. */
+    private Timer simTimer = null;
+    
+    /**  */
+    private Coordinator theCoordinator;
+    
+        /**
+     * Boolean flag to designate whether the simulation has been started or not.
+     */    
+    private boolean simulationStarted;
+    
+    /**
+     * Object used to count the number of seconds that the simulation has run.
+     * The value is initialized to 0, and is reset to 0 every time a new simulation
+     * is loaded, or the current simulation is stopped and reset.
+     */
+    private long currentSimTime;    
+    
+    
+    public SimulationClockManager(Coordinator coor) {
+        
+        theCoordinator    = coor;       
+        simulationStarted = false;
+        currentSimTime    = 0;    
+    }
+    
+    public boolean simulationStarted() {
+        return simulationStarted;
+    }
+    
+    public long getCurrentSimTime() {
+        return currentSimTime;
+    }
+    
+    public void gotoSimulationTime(long newSimTime) {
+        currentSimTime = newSimTime;
+    }
+    
+    public void startSimulation() {
+        /** Start the clock running */    
+        simTimer = new Timer();     
+        simTimer.scheduleAtFixedRate(new ClockTask(), 0, 1000);
+        
+        simulationStarted = true;   
+        
+        theCoordinator.setScriptStatus(SCRIPT_STATUS.SCRIPT_RUNNING);
+    }
+    
+    public void pauseSimulation() {  
+        
+        if(simTimer != null)
+            simTimer.cancel();          
+            
+        simulationStarted = false;              
+        
+        theCoordinator.setScriptStatus(SCRIPT_STATUS.SCRIPT_PAUSED_STARTED);
+    }
+    
+    public void resetSimulation() throws RemoteException {      
+        
+        if(simTimer != null)
+            simTimer.cancel(); 
+         
+        currentSimTime = 0;              
+        
+        theCoordinator.setScriptStatus(SCRIPT_STATUS.SCRIPT_STOPPED_NOT_STARTED);
+    }
+    
+}
Index: trunk/src/tmcsim/cadsimulator/managers/IncidentManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/managers/IncidentManager.java	(revision 2)
+++ trunk/src/tmcsim/cadsimulator/managers/IncidentManager.java	(revision 123)
@@ -7,5 +7,5 @@
 import tmcsim.cadmodels.IncidentInquiryModel_obj;
 import tmcsim.cadmodels.IncidentSummaryModel_obj;
-import tmcsim.cadsimulator.CADSimulator;
+import tmcsim.cadsimulator.CADServer;
 import tmcsim.cadsimulator.Coordinator;
 import tmcsim.cadsimulator.SoundPlayer;
@@ -247,5 +247,5 @@
                 
             for(IncidentEvent event : inc.getCompletedEvents()) {
-                event.finalizeEvent(currentSimTime, CADSimulator.getCADTime());
+                event.finalizeEvent(currentSimTime, CADServer.getCADTime());
                 updateIncident(inc.getLogNumber(), event);
                 theCoordinator.updateIncidentInGUI(inc.getLogNumber(), event);
@@ -311,6 +311,6 @@
         if(targetIncident == null) {
             completedEvent.eventInfo.getHeader().logStatus    = "A";             
-            completedEvent.eventInfo.getHeader().incidentDate = CADSimulator.getCADDate().substring(0,4);  
-            completedEvent.eventInfo.getHeader().incidentTime = CADSimulator.getCADTime();
+            completedEvent.eventInfo.getHeader().incidentDate = CADServer.getCADDate().substring(0,4);  
+            completedEvent.eventInfo.getHeader().incidentTime = CADServer.getCADTime();
             
             targetIncident = new IncidentInquiryModel_obj(completedEvent.eventInfo);
Index: trunk/src/tmcsim/cadsimulator/managers/SimulationControlManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/managers/SimulationControlManager.java	(revision 2)
+++ 	(revision )
@@ -1,90 +1,0 @@
-package tmcsim.cadsimulator.managers;
-
-import java.rmi.RemoteException;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import tmcsim.cadsimulator.Coordinator;
-import tmcsim.common.CADEnums.SCRIPT_STATUS;
-
-public class SimulationControlManager  {
-
-    /** 
-     * 
-     */
-    private class ClockTask extends TimerTask {     
-        public void run() {
-            currentSimTime++;
-            theCoordinator.tick();
-        }
-    }
-    
-    /** The SimulationTimer used to keep track of simulation time. */
-    private Timer simTimer = null;
-    
-    /**  */
-    private Coordinator theCoordinator;
-    
-        /**
-     * Boolean flag to designate whether the simulation has been started or not.
-     */    
-    private boolean simulationStarted;
-    
-    /**
-     * Object used to count the number of seconds that the simulation has run.
-     * The value is initialized to 0, and is reset to 0 every time a new simulation
-     * is loaded, or the current simulation is stopped and reset.
-     */
-    private long currentSimTime;    
-    
-    
-    public SimulationControlManager(Coordinator coor) {
-        
-        theCoordinator    = coor;       
-        simulationStarted = false;
-        currentSimTime    = 0;    
-    }
-    
-    public boolean simulationStarted() {
-        return simulationStarted;
-    }
-    
-    public long getCurrentSimTime() {
-        return currentSimTime;
-    }
-    
-    public void gotoSimulationTime(long newSimTime) {
-        currentSimTime = newSimTime;
-    }
-    
-    public void startSimulation() {
-            
-        simTimer = new Timer();     
-        simTimer.scheduleAtFixedRate(new ClockTask(), 0, 1000);
-        
-        simulationStarted = true;   
-        
-        theCoordinator.setScriptStatus(SCRIPT_STATUS.SCRIPT_RUNNING);
-    }
-    
-    public void pauseSimulation() {  
-        
-        if(simTimer != null)
-            simTimer.cancel();          
-            
-        simulationStarted = false;              
-        
-        theCoordinator.setScriptStatus(SCRIPT_STATUS.SCRIPT_PAUSED_STARTED);
-    }
-    
-    public void resetSimulation() throws RemoteException {      
-        
-        if(simTimer != null)
-            simTimer.cancel(); 
-         
-        currentSimTime = 0;              
-        
-        theCoordinator.setScriptStatus(SCRIPT_STATUS.SCRIPT_STOPPED_NOT_STARTED);
-    }
-    
-}