Index: /branches/FEPSimulator/runFEPSim
===================================================================
--- /branches/FEPSimulator/runFEPSim	(revision 99)
+++ /branches/FEPSimulator/runFEPSim	(revision 182)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./dist/Debug/GNU-MacOSX/fepsimulator 192.168.251.27 103121 32 8080
+./dist/Debug/GNU-Linux/fepsimulator 192.168.251.27 103121 32 8080
Index: /branches/FEPSimulator/FEPSim.h
===================================================================
--- /branches/FEPSimulator/FEPSim.h	(revision 170)
+++ /branches/FEPSimulator/FEPSim.h	(revision 182)
@@ -28,5 +28,5 @@
 
 // Forward declared dependencies
-class NetworkReader;
+class HighwaysParser;
 
 // Included dependencies
@@ -71,5 +71,5 @@
      * @param The recieved highway status xml.
      */
-    void updateATMS(char * xml);
+    void manageClientConnection(char * xml);
     
     /**
Index: /branches/FEPSimulator/NetworkReader.h
===================================================================
--- /branches/FEPSimulator/NetworkReader.h	(revision 86)
+++ /branches/FEPSimulator/NetworkReader.h	(revision 182)
@@ -58,5 +58,5 @@
 #include "DataPacker.h"
 
-class NetworkReader {
+class HighwaysParser {
 public:
     /**
@@ -64,10 +64,10 @@
      * @param xml Highway Status XML data
      */
-    NetworkReader(const char * xml);
+    HighwaysParser(const char * xml);
     
     /**
      * Destructor: no cleaning necessary
      */
-    ~NetworkReader();
+    ~HighwaysParser();
     
     /**