Index: branches/FEPSimulator/nbproject/project.xml
===================================================================
--- branches/fep_rpc_client/nbproject/project.xml	(revision 77)
+++ branches/FEPSimulator/nbproject/project.xml	(revision 80)
@@ -4,5 +4,5 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>fep_rpc_client</name>
+            <name>FEPSimulator</name>
             <c-extensions>c</c-extensions>
             <cpp-extensions>cpp</cpp-extensions>
Index: branches/FEPSimulator/nbproject/Makefile-Debug.mk
===================================================================
--- branches/fep_rpc_client/nbproject/Makefile-Debug.mk	(revision 77)
+++ branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 80)
@@ -36,4 +36,5 @@
 # Object Files
 OBJECTFILES= \
+	${OBJECTDIR}/DataPacker.o \
 	${OBJECTDIR}/FEPClient.o \
 	${OBJECTDIR}/NetworkReader.o \
@@ -56,5 +57,5 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/libtinyxml.a
+LDLIBSOPTIONS=tinyxml/tinyxml.a
 
 # Build Targets
@@ -62,9 +63,14 @@
 	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: tinyxml/libtinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: tinyxml/tinyxml.a
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
+	${MKDIR} -p ${OBJECTDIR}
+	${RM} "$@.d"
+	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
 ${OBJECTDIR}/FEPClient.o: FEPClient.cpp 
Index: branches/FEPSimulator/nbproject/configurations.xml
===================================================================
--- branches/fep_rpc_client/nbproject/configurations.xml	(revision 77)
+++ branches/FEPSimulator/nbproject/configurations.xml	(revision 80)
@@ -5,4 +5,5 @@
                    displayName="Header Files"
                    projectFiles="true">
+      <itemPath>DataPacker.h</itemPath>
       <itemPath>FEPClient.h</itemPath>
       <itemPath>NetworkReader.h</itemPath>
@@ -17,4 +18,5 @@
                    displayName="Source Files"
                    projectFiles="true">
+      <itemPath>DataPacker.cpp</itemPath>
       <itemPath>FEPClient.cpp</itemPath>
       <itemPath>NetworkReader.cpp</itemPath>
@@ -50,8 +52,12 @@
         <linkerTool>
           <linkerLibItems>
-            <linkerLibFileItem>tinyxml/libtinyxml.a</linkerLibFileItem>
+            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
           </linkerLibItems>
         </linkerTool>
       </compileType>
+      <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="DataPacker.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="FEPClient.cpp" ex="false" tool="1" flavor2="0">
       </item>
@@ -91,4 +97,8 @@
         </asmTool>
       </compileType>
+      <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="DataPacker.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="FEPClient.cpp" ex="false" tool="1" flavor2="0">
       </item>
Index: branches/FEPSimulator/nbproject/private/configurations.xml
===================================================================
--- branches/fep_rpc_client/nbproject/private/configurations.xml	(revision 78)
+++ branches/FEPSimulator/nbproject/private/configurations.xml	(revision 80)
@@ -14,6 +14,4 @@
           <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
         </gdb_interceptlist>
-        <gdb_signals>
-        </gdb_signals>
         <gdb_options>
           <DebugOptions>
Index: branches/FEPSimulator/nbproject/private/private.xml
===================================================================
--- branches/fep_rpc_client/nbproject/private/private.xml	(revision 78)
+++ branches/FEPSimulator/nbproject/private/private.xml	(revision 80)
@@ -8,9 +8,12 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/andrew/tmcsim/branches/fep_rpc_client/NetworkReader.h</file>
-            <file>file:/home/andrew/tmcsim/branches/fep_rpc_client/FEPClient.cpp</file>
-            <file>file:/home/andrew/tmcsim/branches/fep_rpc_client/network.h</file>
-            <file>file:/home/andrew/tmcsim/branches/fep_rpc_client/fep.h</file>
-            <file>file:/home/andrew/tmcsim/branches/fep_rpc_client/NetworkReader.cpp</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/NetworkReader.cpp</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/NetworkReader.h</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/network.h</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/FEPClient.cpp</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/fep.h</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/DataPacker.h</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/DataPacker.cpp</file>
+            <file>file:/home/andrew/tmcsimulator/branches/fep_rpc_client/FEPClient.h</file>
         </group>
     </open-files>
Index: branches/FEPSimulator/nbproject/Makefile-Release.mk
===================================================================
--- branches/fep_rpc_client/nbproject/Makefile-Release.mk	(revision 77)
+++ branches/FEPSimulator/nbproject/Makefile-Release.mk	(revision 80)
@@ -36,4 +36,5 @@
 # Object Files
 OBJECTFILES= \
+	${OBJECTDIR}/DataPacker.o \
 	${OBJECTDIR}/FEPClient.o \
 	${OBJECTDIR}/NetworkReader.o \
@@ -65,4 +66,9 @@
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
+	${MKDIR} -p ${OBJECTDIR}
+	${RM} "$@.d"
+	$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
 ${OBJECTDIR}/FEPClient.o: FEPClient.cpp 
