diff --git a/bacnet-stack/bip.c b/bacnet-stack/bip.c
index c20ff8d4..e6dddd27 100644
--- a/bacnet-stack/bip.c
+++ b/bacnet-stack/bip.c
@@ -311,7 +311,7 @@ void bip_get_my_address(BACNET_ADDRESS *my_address)
   return;
 }
 
-void bip_set_broadcast_address(
+void bip_get_broadcast_address(
   BACNET_ADDRESS *dest)  // destination address
 {
   int i = 0; // counter
diff --git a/bacnet-stack/bip.h b/bacnet-stack/bip.h
index 939f6737..a99f9e71 100644
--- a/bacnet-stack/bip.h
+++ b/bacnet-stack/bip.h
@@ -46,7 +46,7 @@
 bool bip_valid(void);
 void bip_cleanup(void);
 bool bip_init(void);
-void bip_set_broadcast_address(
+void bip_get_broadcast_address(
   BACNET_ADDRESS *dest);  // destination address
 void bip_get_my_address(BACNET_ADDRESS *my_address);
 
diff --git a/bacnet-stack/config.h b/bacnet-stack/config.h
index 8df36e03..344d464f 100644
--- a/bacnet-stack/config.h
+++ b/bacnet-stack/config.h
@@ -22,8 +22,8 @@
 
 // Use only one data link layer
 //#define BACDL_ARCNET
-#define BACDL_ETHERNET
+//#define BACDL_ETHERNET
 //#define BACDL_MSTP
-//#define BACDL_BIP
+#define BACDL_BIP
 
 #endif
diff --git a/bacnet-stack/handlers.c b/bacnet-stack/handlers.c
index e8c13098..24dbc6ac 100644
--- a/bacnet-stack/handlers.c
+++ b/bacnet-stack/handlers.c
@@ -82,6 +82,8 @@ void UnrecognizedServiceHandler(
   BACNET_ADDRESS src;
   int pdu_len = 0;
   
+  (void)service_request;
+  (void)service_len;
   bacdl_get_my_address(&src);
 
   // encode the NPDU portion of the packet
@@ -147,6 +149,7 @@ void WhoIsHandler(
   int32_t low_limit = 0;
   int32_t high_limit = 0;
 
+  (void)src;
   fprintf(stderr,"Received Who-Is Request!\n");
   len = whois_decode_service_request(
     service_request,
@@ -157,8 +160,8 @@ void WhoIsHandler(
     I_Am_Request = true;
   else if (len != -1)
   { 
-    if ((Device_Object_Instance_Number() >= low_limit) && 
-        (Device_Object_Instance_Number() <= high_limit))
+    if ((Device_Object_Instance_Number() >= (uint32_t)low_limit) && 
+        (Device_Object_Instance_Number() <= (uint32_t)high_limit))
       I_Am_Request = true;
   }
 
@@ -176,6 +179,8 @@ void IAmHandler(
   int segmentation = 0;
   uint16_t vendor_id = 0;
 
+  (void)src;
+  (void)service_len;
   len = iam_decode_service_request(
     service_request,
     &device_id,
diff --git a/bacnet-stack/ports/rtos32/main.c b/bacnet-stack/ports/rtos32/main.c
index 6ec90f03..dd55b299 100644
--- a/bacnet-stack/ports/rtos32/main.c
+++ b/bacnet-stack/ports/rtos32/main.c
@@ -55,450 +55,14 @@
 #include <stdio.h>
 #include "config.h"
 #include "bacdef.h"
-#include "bacdcode.h"
 #include "npdu.h"
 #include "apdu.h"
 #include "device.h"
-#include "ai.h"
-#include "rp.h"
-#include "wp.h"
-#include "iam.h"
-#include "whois.h"
-#include "reject.h"
-#include "abort.h"
-#include "bacerror.h"
+#include "handlers.h"
 #include "bip.h"
 
 // buffers used for transmit and receive
-static uint8_t Tx_Buf[MAX_MPDU] = {0};
 static uint8_t Rx_Buf[MAX_MPDU] = {0};
-static uint8_t Temp_Buf[MAX_APDU] = {0};
-
-// flag to send an I-Am
-bool I_Am_Request = true;
-
-void UnrecognizedServiceHandler(
-  uint8_t *service_request,
-  uint16_t service_len,
-  BACNET_ADDRESS *dest,
-  BACNET_CONFIRMED_SERVICE_DATA *service_data)
-{
-  BACNET_ADDRESS src;
-  int pdu_len = 0;
-  
-  (void)service_request;
-  (void)service_len;
-  bip_get_my_address(&src);
-
-  // encode the NPDU portion of the packet
-  pdu_len = npdu_encode_apdu(
-    &Tx_Buf[0],
-    dest,
-    &src,
-    false,  // true for confirmed messages
-    MESSAGE_PRIORITY_NORMAL);
-  
-  // encode the APDU portion of the packet
-  pdu_len += reject_encode_apdu(
-    &Tx_Buf[pdu_len], 
-    service_data->invoke_id,
-    REJECT_REASON_UNRECOGNIZED_SERVICE);
-
-  (void)bip_send_pdu(
-    dest,  // destination address
-    &Tx_Buf[0],
-    pdu_len); // number of bytes of data
-  fprintf(stderr,"Sent Reject!\n");
-}
-
-// FIXME: if we handle multiple ports, then a port neutral version
-// of this would be nice. Then it could be moved into iam.c
-void Send_IAm(void)
-{
-  int pdu_len = 0;
-  BACNET_ADDRESS dest;
-
-  // I-Am is a global broadcast
-  bip_set_broadcast_address(&dest);
-
-  // encode the NPDU portion of the packet
-  pdu_len = npdu_encode_apdu(
-    &Tx_Buf[0],
-    &dest,
-    NULL,
-    false,  // true for confirmed messages
-    MESSAGE_PRIORITY_NORMAL);
-
-  // encode the APDU portion of the packet
-  pdu_len += iam_encode_apdu(
-    &Tx_Buf[pdu_len], 
-    Device_Object_Instance_Number(),
-    MAX_APDU,
-    SEGMENTATION_NONE,
-    Device_Vendor_Identifier());
-
-  (void)bip_send_pdu(
-    &dest,  // destination address
-    &Tx_Buf[0],
-    pdu_len); // number of bytes of data
-  fprintf(stderr,"Sent I-Am Request!\n");
-}
-
-void WhoIsHandler(
-  uint8_t *service_request,
-  uint16_t service_len,
-  BACNET_ADDRESS *src)
-{
-  int len = 0;
-  int32_t low_limit = 0;
-  int32_t high_limit = 0;
-
-  (void)src;
-  fprintf(stderr,"Received Who-Is Request!\n");
-  len = whois_decode_service_request(
-    service_request,
-    service_len,
-    &low_limit,
-    &high_limit);
-  if (len == 0)
-    I_Am_Request = true;
-  else if (len != -1)
-  { 
-    if ((Device_Object_Instance_Number() >= (uint32_t)low_limit) && 
-        (Device_Object_Instance_Number() <= (uint32_t)high_limit))
-      I_Am_Request = true;
-  }
-  else 
-    fprintf(stderr,"Who-Is Not for Me!\n");
-
-  return;  
-}
-
-void IAmHandler(
-  uint8_t *service_request,
-  uint16_t service_len,
-  BACNET_ADDRESS *src)
-{
-  int len = 0;
-  uint32_t device_id = 0;
-  unsigned max_apdu = 0;
-  int segmentation = 0;
-  uint16_t vendor_id = 0;
-
-  (void)src;
-  (void)service_len;
-  len = iam_decode_service_request(
-    service_request,
-    &device_id,
-    &max_apdu,
-    &segmentation,
-    &vendor_id);
-  if (len != -1)
-    fprintf(stderr,"Received I-Am Request from %u!\n",device_id);
-
-  return;  
-}
-
-void ReadPropertyHandler(
-  uint8_t *service_request,
-  uint16_t service_len,
-  BACNET_ADDRESS *src,
-  BACNET_CONFIRMED_SERVICE_DATA *service_data)
-{
-  BACNET_READ_PROPERTY_DATA rp_data;
-  int len = 0;
-  int pdu_len = 0;
-  BACNET_OBJECT_TYPE object_type;
-  uint32_t object_instance;
-  BACNET_PROPERTY_ID object_property;
-  int32_t array_index;
-  BACNET_ADDRESS my_address;
-  bool send = false;
-
-  len = rp_decode_service_request(
-    service_request,
-    service_len,
-    &object_type,
-    &object_instance,
-    &object_property,
-    &array_index);
-  fprintf(stderr,"Received Read-Property Request!\n");
-  if (len > 0)
-    fprintf(stderr,"type=%u instance=%u property=%u index=%d\n",
-      object_type,
-      object_instance,
-      object_property,
-      array_index);
-  else
-    fprintf(stderr,"Unable to decode Read-Property Request!\n");
-  // prepare a reply
-  bip_get_my_address(&my_address);
-  // encode the NPDU portion of the packet
-  pdu_len = npdu_encode_apdu(
-    &Tx_Buf[0],
-    src,
-    &my_address,
-    false,  // true for confirmed messages
-    MESSAGE_PRIORITY_NORMAL);
-  // bad decoding - send an abort
-  if (len == -1)
-  {
-    pdu_len += abort_encode_apdu(
-      &Tx_Buf[pdu_len],
-      service_data->invoke_id,
-      ABORT_REASON_OTHER);
-    fprintf(stderr,"Sent Abort!\n");
-    send = true;
-  }
-  else if (service_data->segmented_message)
-  {
-    pdu_len += abort_encode_apdu(
-      &Tx_Buf[pdu_len],
-      service_data->invoke_id,
-      ABORT_REASON_SEGMENTATION_NOT_SUPPORTED);
-    fprintf(stderr,"Sent Abort!\n");
-    send = true;
-  }
-  else
-  {
-    switch (object_type)
-    {
-      case OBJECT_DEVICE:
-        // FIXME: probably need a length limitation sent with encode
-        // FIXME: might need to return error codes
-        if (object_instance == Device_Object_Instance_Number())
-        {
-          len = Device_Encode_Property_APDU(
-            &Temp_Buf[0],
-            object_property,
-            array_index);
-          if (len > 0)
-          {
-            // encode the APDU portion of the packet
-            rp_data.object_type = object_type;
-            rp_data.object_instance = object_instance;
-            rp_data.object_property = object_property;
-            rp_data.array_index = array_index;
-            rp_data.application_data = &Temp_Buf[0];
-            rp_data.application_data_len = len;
-            // FIXME: probably need a length limitation sent with encode
-            pdu_len += rp_ack_encode_apdu(
-              &Tx_Buf[pdu_len],
-              service_data->invoke_id,
-              &rp_data);
-            fprintf(stderr,"Sent Read Property Ack!\n");
-            send = true;
-          }
-          else
-          {
-            pdu_len += bacerror_encode_apdu(
-              &Tx_Buf[pdu_len],
-              service_data->invoke_id,
-              SERVICE_CONFIRMED_READ_PROPERTY,
-              ERROR_CLASS_PROPERTY,
-              ERROR_CODE_UNKNOWN_PROPERTY);
-            fprintf(stderr,"Sent Unknown Property Error!\n");
-            send = true;
-          }
-        }
-        else
-        {
-          pdu_len += bacerror_encode_apdu(
-            &Tx_Buf[pdu_len],
-            service_data->invoke_id,
-            SERVICE_CONFIRMED_READ_PROPERTY,
-            ERROR_CLASS_OBJECT,
-            ERROR_CODE_UNKNOWN_OBJECT);
-          fprintf(stderr,"Sent Unknown Object Error!\n");
-          send = true;
-        }
-        break;
-      case OBJECT_ANALOG_INPUT:
-        if (Analog_Input_Valid_Instance(object_instance))
-        {
-          len = Analog_Input_Encode_Property_APDU(
-            &Temp_Buf[0],
-            object_instance,
-            object_property,
-            array_index);
-          if (len > 0)
-          {
-            // encode the APDU portion of the packet
-            rp_data.object_type = object_type;
-            rp_data.object_instance = object_instance;
-            rp_data.object_property = object_property;
-            rp_data.array_index = array_index;
-            rp_data.application_data = &Temp_Buf[0];
-            rp_data.application_data_len = len;
-            // FIXME: probably need a length limitation sent with encode
-            pdu_len += rp_ack_encode_apdu(
-              &Tx_Buf[pdu_len],
-              service_data->invoke_id,
-              &rp_data);
-            fprintf(stderr,"Sent Read Property Ack!\n");
-            send = true;
-          }
-          else
-          {
-            pdu_len += bacerror_encode_apdu(
-              &Tx_Buf[pdu_len],
-              service_data->invoke_id,
-              SERVICE_CONFIRMED_READ_PROPERTY,
-              ERROR_CLASS_PROPERTY,
-              ERROR_CODE_UNKNOWN_PROPERTY);
-            fprintf(stderr,"Sent Unknown Property Error!\n");
-            send = true;
-          }
-        }
-        else
-        {
-          pdu_len += bacerror_encode_apdu(
-            &Tx_Buf[pdu_len],
-            service_data->invoke_id,
-            SERVICE_CONFIRMED_READ_PROPERTY,
-            ERROR_CLASS_OBJECT,
-            ERROR_CODE_UNKNOWN_OBJECT);
-          fprintf(stderr,"Sent Unknown Object Error!\n");
-          send = true;
-        }
-        break;
-      default:
-        pdu_len += bacerror_encode_apdu(
-          &Tx_Buf[pdu_len],
-          service_data->invoke_id,
-          SERVICE_CONFIRMED_READ_PROPERTY,
-          ERROR_CLASS_OBJECT,
-          ERROR_CODE_UNKNOWN_OBJECT);
-        fprintf(stderr,"Sent Unknown Object Error!\n");
-        send = true;
-        break;
-    }
-  }
-  if (send)
-  {
-    (void)bip_send_pdu(
-      src,  // destination address
-      &Tx_Buf[0],
-      pdu_len); // number of bytes of data
-  }
-
-  return;
-}
-
-void WritePropertyHandler(
-  uint8_t *service_request,
-  uint16_t service_len,
-  BACNET_ADDRESS *src,
-  BACNET_CONFIRMED_SERVICE_DATA *service_data)
-{
-  BACNET_WRITE_PROPERTY_DATA wp_data;
-  int len = 0;
-  int pdu_len = 0;
-  BACNET_ADDRESS my_address;
-  bool send = false;
-  BACNET_ERROR_CLASS error_class;
-  BACNET_ERROR_CODE error_code;
-
-  // decode the service request only
-  len = wp_decode_service_request(
-    service_request,
-    service_len,
-    &wp_data);
-  fprintf(stderr,"Received Write-Property Request!\n");
-  if (len > 0)
-    fprintf(stderr,"type=%u instance=%u property=%u index=%d\n",
-      wp_data.object_type,
-      wp_data.object_instance,
-      wp_data.object_property,
-      wp_data.array_index);
-  else
-    fprintf(stderr,"Unable to decode Write-Property Request!\n");
-  // prepare a reply
-  bip_get_my_address(&my_address);
-  // encode the NPDU portion of the packet
-  pdu_len = npdu_encode_apdu(
-    &Tx_Buf[0],
-    src,
-    &my_address,
-    false,  // true for confirmed messages
-    MESSAGE_PRIORITY_NORMAL);
-  // bad decoding - send an abort
-  if (len == -1)
-  {
-    pdu_len += abort_encode_apdu(
-      &Tx_Buf[pdu_len],
-      service_data->invoke_id,
-      ABORT_REASON_OTHER);
-    fprintf(stderr,"Sent Abort!\n");
-    send = true;
-  }
-  else if (service_data->segmented_message)
-  {
-    pdu_len += abort_encode_apdu(
-      &Tx_Buf[pdu_len],
-      service_data->invoke_id,
-      ABORT_REASON_SEGMENTATION_NOT_SUPPORTED);
-    fprintf(stderr,"Sent Abort!\n");
-    send = true;
-  }
-  else
-  {
-    switch (wp_data.object_type)
-    {
-      case OBJECT_DEVICE:
-        if (Device_Write_Property(&wp_data,&error_class,&error_code))
-        {
-          pdu_len = encode_simple_ack(
-            &Tx_Buf[pdu_len],
-            service_data->invoke_id,
-            SERVICE_CONFIRMED_WRITE_PROPERTY);
-          fprintf(stderr,"Sent Write Property Simple Ack!\n");
-          send = true;
-        }
-        else
-        {
-          pdu_len += bacerror_encode_apdu(
-            &Tx_Buf[pdu_len],
-            service_data->invoke_id,
-            SERVICE_CONFIRMED_WRITE_PROPERTY,
-            error_class,
-            error_code);
-          fprintf(stderr,"Sent Write Property Error!\n");
-          send = true;
-        }
-        break;
-      case OBJECT_ANALOG_INPUT:
-        pdu_len += bacerror_encode_apdu(
-          &Tx_Buf[pdu_len],
-          service_data->invoke_id,
-          SERVICE_CONFIRMED_WRITE_PROPERTY,
-          ERROR_CLASS_PROPERTY,
-          ERROR_CODE_WRITE_ACCESS_DENIED);
-        fprintf(stderr,"Sent Write Access Error!\n");
-        send = true;
-        break;
-      default:
-        pdu_len += bacerror_encode_apdu(
-          &Tx_Buf[pdu_len],
-          service_data->invoke_id,
-          SERVICE_CONFIRMED_WRITE_PROPERTY,
-          ERROR_CLASS_OBJECT,
-          ERROR_CODE_UNKNOWN_OBJECT);
-        fprintf(stderr,"Sent Unknown Object Error!\n");
-        send = true;
-        break;
-    }
-  }
-  if (send)
-  {
-    (void)bip_send_pdu(
-      src,  // destination address
-      &Tx_Buf[0],
-      pdu_len); // number of bytes of data
-  }
-
-  return;
-}
 
 static void Init_Device_Parameters(void)
 {
diff --git a/bacnet-stack/ports/rtos32/makefile.mak b/bacnet-stack/ports/rtos32/makefile.mak
index 00b7652f..f816b787 100644
--- a/bacnet-stack/ports/rtos32/makefile.mak
+++ b/bacnet-stack/ports/rtos32/makefile.mak
@@ -22,6 +22,7 @@ PRODUCT_RTB = $(PRODUCT).rtb
 PRODUCT_EXE = $(PRODUCT).exe
 
 SRCS = init.c main.c \
+       ..\..\handlers.c  \
        ..\..\bip.c  \
        ..\..\bacdcode.c \
        ..\..\bigend.c \
@@ -117,6 +118,7 @@ $(PRODUCT_EXE) : $(OBJS)
 clean :
 	@echo Deleting obj files, $(PRODUCT_EXE), $(PRODUCT_RTB) and map files.
 	del *.obj
+	del ..\..\*.obj
 	del $(PRODUCT_EXE)
 	del $(PRODUCT_RTB)
 	del *.map