diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.dsp b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
index 6ced4a8e..79f5b436 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.dsp
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
@@ -113,6 +113,10 @@ SOURCE=..\..\..\arf.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\bacapp.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\bacdcode.c
 # End Source File
 # Begin Source File
@@ -125,6 +129,10 @@ SOURCE=..\..\..\bacfile.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\bacstr.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\bactext.c
 # End Source File
 # Begin Source File
@@ -225,6 +233,10 @@ SOURCE=..\..\..\arcnet.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\bacapp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\bacdcode.h
 # End Source File
 # Begin Source File
@@ -241,6 +253,10 @@ SOURCE=..\..\..\bacerror.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\bacstr.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\bigend.h
 # End Source File
 # Begin Source File
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.ncb b/bacnet-stack/ports/win32/bacnet/bacnet.ncb
index 43f68495..3487fd33 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.ncb and b/bacnet-stack/ports/win32/bacnet/bacnet.ncb differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.opt b/bacnet-stack/ports/win32/bacnet/bacnet.opt
index 0a49b61e..37413f28 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.opt and b/bacnet-stack/ports/win32/bacnet/bacnet.opt differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.plg b/bacnet-stack/ports/win32/bacnet/bacnet.plg
index cd9bba56..3b9cca2e 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.plg
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.plg
@@ -6,13 +6,41 @@
 --------------------Configuration: bacnet - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC4.tmp" with contents
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1585.tmp" with contents
 [
 /nologo /MLd /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\code\bacnet-stack\abort.c"
+"C:\code\bacnet-stack\address.c"
+"C:\code\bacnet-stack\ai.c"
+"C:\code\bacnet-stack\ao.c"
+"C:\code\bacnet-stack\apdu.c"
+"C:\code\bacnet-stack\arf.c"
+"C:\code\bacnet-stack\bacdcode.c"
+"C:\code\bacnet-stack\bacerror.c"
+"C:\code\bacnet-stack\bacfile.c"
+"C:\code\bacnet-stack\bactext.c"
+"C:\code\bacnet-stack\bigend.c"
+"C:\code\bacnet-stack\ports\win32\bip-init.c"
+"C:\code\bacnet-stack\bip.c"
+"C:\code\bacnet-stack\crc.c"
+"C:\code\bacnet-stack\datalink.c"
 "C:\code\bacnet-stack\device.c"
+"C:\code\bacnet-stack\handlers.c"
+"C:\code\bacnet-stack\iam.c"
+"C:\code\bacnet-stack\indtext.c"
+"C:\code\bacnet-stack\ports\win32\main.c"
+"C:\code\bacnet-stack\npdu.c"
+"C:\code\bacnet-stack\reject.c"
+"C:\code\bacnet-stack\ringbuf.c"
+"C:\code\bacnet-stack\rp.c"
+"C:\code\bacnet-stack\tsm.c"
+"C:\code\bacnet-stack\whois.c"
+"C:\code\bacnet-stack\wp.c"
+"C:\code\bacnet-stack\bacstr.c"
+"C:\code\bacnet-stack\bacapp.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC4.tmp" 
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC5.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1585.tmp" 
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1586.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept 
 ".\Debug\abort.obj"
@@ -24,12 +52,16 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\bacdcode.obj"
 ".\Debug\bacerror.obj"
 ".\Debug\bacfile.obj"
+".\Debug\bactext.obj"
 ".\Debug\bigend.obj"
+".\Debug\bip-init.obj"
+".\Debug\bip.obj"
 ".\Debug\crc.obj"
 ".\Debug\datalink.obj"
 ".\Debug\device.obj"
 ".\Debug\handlers.obj"
 ".\Debug\iam.obj"
+".\Debug\indtext.obj"
 ".\Debug\main.obj"
 ".\Debug\npdu.obj"
 ".\Debug\reject.obj"
@@ -38,17 +70,58 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\tsm.obj"
 ".\Debug\whois.obj"
 ".\Debug\wp.obj"
-".\Debug\bip-init.obj"
-".\Debug\bip.obj"
-".\Debug\bactext.obj"
-".\Debug\indtext.obj"
+".\Debug\bacstr.obj"
+".\Debug\bacapp.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC5.tmp"
+Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1586.tmp"
 <h3>Output Window</h3>
 Compiling...
+abort.c
+address.c
+ai.c
+c:\code\bacnet-stack\ai.c(76) : warning C4305: 'initializing' : truncation from 'const double ' to 'float '
+ao.c
+c:\code\bacnet-stack\ao.c(157) : warning C4305: 'initializing' : truncation from 'const double ' to 'float '
+apdu.c
+arf.c
+bacdcode.c
+bacerror.c
+bacfile.c
+bactext.c
+bigend.c
+bip-init.c
+bip.c
+crc.c
+datalink.c
 device.c
+handlers.c
+iam.c
+indtext.c
+main.c
+c:\code\bacnet-stack\ports\win32\net.h(30) : warning C4005: 'STRICT' : macro redefinition
+        c:\program files\microsoft visual studio\vc98\include\windef.h(15) : see previous definition of 'STRICT'
+Generating Code...
+c:\code\bacnet-stack\handlers.c(194) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\handlers.c(271) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\device.c(601) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\device.c(614) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\device.c(627) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\bacfile.c(285) : warning C4761: integral size mismatch in argument; conversion supplied
+Compiling...
+npdu.c
+reject.c
+ringbuf.c
+rp.c
+tsm.c
+whois.c
+wp.c
+bacstr.c
+bacapp.c
+Generating Code...
+c:\code\bacnet-stack\wp.c(129) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\npdu.c(332) : warning C4761: integral size mismatch in argument; conversion supplied
 Linking...
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC6.tmp" with contents
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1588.tmp" with contents
 [
 /nologo /o"Debug/bacnet.bsc" 
 ".\Debug\abort.sbr"
@@ -60,12 +133,16 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC6.tmp" with content
 ".\Debug\bacdcode.sbr"
 ".\Debug\bacerror.sbr"
 ".\Debug\bacfile.sbr"
+".\Debug\bactext.sbr"
 ".\Debug\bigend.sbr"
+".\Debug\bip-init.sbr"
+".\Debug\bip.sbr"
 ".\Debug\crc.sbr"
 ".\Debug\datalink.sbr"
 ".\Debug\device.sbr"
 ".\Debug\handlers.sbr"
 ".\Debug\iam.sbr"
+".\Debug\indtext.sbr"
 ".\Debug\main.sbr"
 ".\Debug\npdu.sbr"
 ".\Debug\reject.sbr"
@@ -74,18 +151,16 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC6.tmp" with content
 ".\Debug\tsm.sbr"
 ".\Debug\whois.sbr"
 ".\Debug\wp.sbr"
-".\Debug\bip-init.sbr"
-".\Debug\bip.sbr"
-".\Debug\bactext.sbr"
-".\Debug\indtext.sbr"]
-Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSPC6.tmp"
+".\Debug\bacstr.sbr"
+".\Debug\bacapp.sbr"]
+Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1588.tmp"
 Creating browse info file...
 <h3>Output Window</h3>
 
 
 
 <h3>Results</h3>
-bacnet.exe - 0 error(s), 0 warning(s)
+bacnet.exe - 0 error(s), 11 warning(s)
 </pre>
 </body>
 </html>