Index: trunk/src/atmsdriver/ATMSDriver.java
===================================================================
--- trunk/src/atmsdriver/ATMSDriver.java	(revision 88)
+++ trunk/src/atmsdriver/ATMSDriver.java	(revision 103)
@@ -2,8 +2,5 @@
 
 import atmsdriver.model.Highways;
-import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -25,6 +22,4 @@
      */
     private static Logger ATMSDriverLogger = Logger.getLogger("atmsdriver");
-
-    private static final String CONFIG_FILE_NAME = "atms_driver_config.properties";
 
     /**
@@ -95,9 +90,9 @@
 
     public ATMSDriver(String propertiesFile) {
-
+        // verify properties file
         if (!verifyProperties(propertiesFile)) {
             System.exit(0);
         }
-
+        // create the highways model
         highways = new Highways(
                 ATMSDriverProperties.getProperty(
@@ -110,8 +105,14 @@
                 Integer.parseInt(ATMSDriverProperties.getProperty(
                                 PROPERTIES.FEP_WRITER_PORT.name)));
-        
+        // create the exchange reader
         exchangeReader = new ExchangeReader();
     }
-
+    
+    /**
+     * Verifies that the properties file has all necessary properties.
+     * 
+     * @param propertiesFile
+     * @return 
+     */
     private boolean verifyProperties(String propertiesFile) {
         // Load the properties file.
@@ -133,6 +134,12 @@
         try {
             if (System.getProperty("ATMSDRIVER_PROPERTIES") != null) {
-                new Thread(new ATMSDriver(System.getProperty(
-                        "ATMSDRIVER_PROPERTIES"))).start();
+                // Create and run the ATMSDriver thread
+                ATMSDriver atmsDriver = new ATMSDriver(System.getProperty("ATMSDRIVER_PROPERTIES"));
+                Thread ATMSDriverThread = new Thread(atmsDriver);
+                ATMSDriverThread.start();
+                
+                // run the console driver, pass it the atmsDriver highways model
+                ConsoleDriver driver = new ConsoleDriver(atmsDriver.highways);
+                
             } else {
                 throw new Exception("ATMSDRIVER_PROPERTIES system property not defined.");