diff --git a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Development.sln b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Development.sln
index 0bf79aad..e9ee29ea 100644
--- a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Development.sln	
+++ b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Development.sln	
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BACnet Stack Library", "BACnet Stack Library\BACnet Stack Library.vcxproj", "{E9A65567-B028-4278-881D-674604B2E126}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BACnet Object Definitions", "BACnet Object Definitions\BACnet Object Definitions.vcxproj", "{6A8668E1-F08E-496B-B624-D6C05001806D}"
diff --git a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Library/BACnet Stack Library.vcxproj b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Library/BACnet Stack Library.vcxproj
index 227c56dd..277d92b4 100644
--- a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Library/BACnet Stack Library.vcxproj	
+++ b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/BACnet Stack Library/BACnet Stack Library.vcxproj	
@@ -41,6 +41,7 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Documents and Settings\skordi1a\My Documents\_Wattstopper\bacnet-stack\include;C:\Documents and Settings\skordi1a\My Documents\_Wattstopper\bacnet-stack\demo\object;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -71,6 +72,9 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\demo\handler\h_rr.c" />
+    <ClCompile Include="..\..\..\..\demo\handler\h_upt.c" />
+    <ClCompile Include="..\..\..\..\demo\handler\h_wpm.c" />
     <ClCompile Include="..\..\..\..\src\abort.c" />
     <ClCompile Include="..\..\..\..\src\address.c" />
     <ClCompile Include="..\..\..\..\src\apdu.c" />
@@ -133,6 +137,7 @@
     <ClCompile Include="..\..\..\..\demo\handler\objects.c" />
     <ClCompile Include="..\..\..\..\src\ptransfer.c" />
     <ClCompile Include="..\..\..\..\src\rd.c" />
+    <ClCompile Include="..\..\..\..\src\readrange.c" />
     <ClCompile Include="..\..\..\..\src\reject.c" />
     <ClCompile Include="..\..\..\..\src\ringbuf.c" />
     <ClCompile Include="..\..\..\..\src\rp.c" />
@@ -161,6 +166,7 @@
     <ClCompile Include="..\..\..\..\src\whohas.c" />
     <ClCompile Include="..\..\..\..\src\whois.c" />
     <ClCompile Include="..\..\..\..\src\wp.c" />
+    <ClCompile Include="..\..\..\..\src\wpm.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\net.h" />
diff --git a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Server/Server.vcxproj b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Server/Server.vcxproj
index bb5fa28d..b84930c1 100644
--- a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Server/Server.vcxproj	
+++ b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Server/Server.vcxproj	
@@ -43,6 +43,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Documents and Settings\skordi1a\My Documents\_Wattstopper\bacnet-stack\demo\handler;C:\Documents and Settings\skordi1a\My Documents\_Wattstopper\bacnet-stack\demo\object;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Who-Is/Who-Is.vcxproj b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Who-Is/Who-Is.vcxproj
index 6261ab93..5eb29b02 100644
--- a/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Who-Is/Who-Is.vcxproj	
+++ b/bacnet-stack/ports/win32/Microsoft Visual Studio 2010/Who-Is/Who-Is.vcxproj	
@@ -43,6 +43,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Documents and Settings\skordi1a\My Documents\_Wattstopper\bacnet-stack\demo\object;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>