Index: branches/FEPSimulator/nbproject/Makefile-Debug.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 174)
+++ branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 185)
@@ -38,6 +38,6 @@
 	${OBJECTDIR}/DataPacker.o \
 	${OBJECTDIR}/FEPSim.o \
+	${OBJECTDIR}/HighwaysParser.o \
 	${OBJECTDIR}/Main.o \
-	${OBJECTDIR}/NetworkReader.o \
 	${OBJECTDIR}/fep_clnt.o \
 	${OBJECTDIR}/fep_xdr.o
@@ -58,11 +58,9 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/tinyxml.a
+LDLIBSOPTIONS=
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
 	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
-
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
@@ -80,13 +78,13 @@
 	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
+${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp 
+	${MKDIR} -p ${OBJECTDIR}
+	${RM} "$@.d"
+	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
+
 ${OBJECTDIR}/Main.o: Main.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
-
-${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp
 
 ${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
Index: branches/FEPSimulator/nbproject/configurations.xml
===================================================================
--- branches/FEPSimulator/nbproject/configurations.xml	(revision 174)
+++ branches/FEPSimulator/nbproject/configurations.xml	(revision 185)
@@ -20,6 +20,6 @@
       <itemPath>DataPacker.cpp</itemPath>
       <itemPath>FEPSim.cpp</itemPath>
+      <itemPath>HighwaysParser.cpp</itemPath>
       <itemPath>Main.cpp</itemPath>
-      <itemPath>NetworkReader.cpp</itemPath>
       <itemPath>fep_clnt.c</itemPath>
       <itemPath>fep_xdr.c</itemPath>
@@ -51,9 +51,4 @@
           </incDir>
         </ccTool>
-        <linkerTool>
-          <linkerLibItems>
-            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
-          </linkerLibItems>
-        </linkerTool>
       </compileType>
       <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0">
@@ -65,7 +60,7 @@
       <item path="FEPSim.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0">
+      </item>
       <item path="Main.cpp" ex="false" tool="1" flavor2="0">
-      </item>
-      <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0">
       </item>
       <item path="NetworkReader.h" ex="false" tool="3" flavor2="0">
@@ -108,7 +103,7 @@
       <item path="FEPSim.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0">
+      </item>
       <item path="Main.cpp" ex="false" tool="1" flavor2="0">
-      </item>
-      <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0">
       </item>
       <item path="NetworkReader.h" ex="false" tool="3" flavor2="0">
Index: branches/FEPSimulator/nbproject/private/private.xml
===================================================================
--- branches/FEPSimulator/nbproject/private/private.xml	(revision 184)
+++ branches/FEPSimulator/nbproject/private/private.xml	(revision 185)
@@ -8,10 +8,5 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file>
         </group>
     </open-files>