Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rb135150a91ea70889433dd23420fdbe91745fc91 -r479cebb3c254ed13bca26f361c8b5266f8eae408
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b135150a91ea70889433dd23420fdbe91745fc91)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 479cebb3c254ed13bca26f361c8b5266f8eae408)
@@ -19,11 +19,15 @@
 #include "FPGA.h"
 #include "TaskPriority.h"
 
+DATA_DECL( U32, MeasuredLoadCellA1, loadCellA1raw, 0, 0 );
+DATA_DECL( U32, MeasuredLoadCellA2, loadCellA2raw, 0, 0 );
+DATA_DECL( U32, MeasuredLoadCellB1, loadCellB1raw, 0, 0 );
+DATA_DECL( U32, MeasuredLoadCellB2, loadCellB2raw, 0, 0 );
 static F32 Load_cell_a1_ave;
 static F32 Load_cell_a2_ave;
 static F32 Load_cell_b1_ave;
 static F32 Load_cell_b2_ave;
- /**@}*/
+// /**@}*/
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb135150a91ea70889433dd23420fdbe91745fc91 -r479cebb3c254ed13bca26f361c8b5266f8eae408
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b135150a91ea70889433dd23420fdbe91745fc91)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 479cebb3c254ed13bca26f361c8b5266f8eae408)
@@ -1028,7 +1028,7 @@
     // handle any messages from other sub-systems
     switch ( msgID )
     {
-        case MSG_ID_TESTER_LOGIN_REQUEST:
+        case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
 
@@ -1038,23 +1038,23 @@
     }
 
     // handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
+    if ( ( msgID > MSG_ID_FIRST_DG_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
     {
         switch ( msgID )
         {
             case MSG_ID_DG_MESSAGE:
                 handleTestDGMessageRequest( message );
                 break;
 
-            case MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE:
+            case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE:
                 handleTestWatchdogCheckInStateOverrideRequest( message );
                 break;
 
             case MSG_ID_ALARM_STATE_OVERRIDE:
                 handleTestAlarmStateOverrideRequest( message );
                 break;
 
-            case MSG_ID_SET_RTC_DATE_TIME:
+            case MSG_ID_DG_SET_RTC_DATE_TIME:
                 handleSetRTCTimestamp( message );
                 break;
 
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rb135150a91ea70889433dd23420fdbe91745fc91 -r479cebb3c254ed13bca26f361c8b5266f8eae408
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision b135150a91ea70889433dd23420fdbe91745fc91)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 479cebb3c254ed13bca26f361c8b5266f8eae408)
@@ -22,44 +22,6 @@
 
 // ********** public definitions **********
 
-typedef enum Msg_IDs
-{   // normal CAN messages
-    MSG_ID_UNUSED = 0,
-    MSG_ID_OFF_BUTTON_PRESS,                    // 1
-    MSG_ID_ALARM_STATUS,                        // 2
-    MSG_ID_ALARM_TRIGGERED,                     // 3
-    MSG_ID_ALARM_CLEARED,                       // 4
-    MSG_ID_BLOOD_FLOW_DATA,                     // 5
-    MSG_ID_DG_CHECK_IN,                         // 6
-    MSG_ID_UI_CHECK_IN,                         // 7
-    MSG_ID_DIALYSATE_FLOW_DATA,                 // 8
-    MSG_ID_PRESSURE_OCCLUSION_DATA,             // 9
-    MSG_ID_RTC_EPOCH,                           // 10
-    MSG_ID_DIALYSATE_OUT_FLOW_DATA,             // 11
-    MSG_ID_LOAD_CELL_READINGS,                  // 12
-    MSG_ID_TREATMENT_TIME,                      // 13
-    XXXXX,
-#ifdef CAN_TEST
-    MSG_ID_HD_CAN_TEST_1_LARGE_FREQ,            // 15
-    MSG_ID_DG_CAN_TEST_1_LARGE_FREQ,            // 16
-    YYYYY,
-#endif
-
-    // service/test CAN messages
-
-    MSG_ID_FIRST_TESTER_MESSAGE = 0xA000,                       // 0xA000
-    MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,
-    MSG_ID_DG_MESSAGE,                                          // 0xA001
-    MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,                      // 0xA002
-    MSG_ID_ALARM_STATE_OVERRIDE,                                // 0xA003
-    MSG_ID_SET_RTC_DATE_TIME,                                   // 0xA004
-    MSG_ID_LOAD_CELL_A1_OVERRIDE,                               // 0xA005
-    MSG_ID_LOAD_CELL_A2_OVERRIDE,                               // 0xA006
-    MSG_ID_LOAD_CELL_B1_OVERRIDE,                               // 0xA007
-    MSG_ID_LOAD_CELL_B2_OVERRIDE,                               // 0xA008
-    END_OF_MSG_IDS
-} MSG_ID_T;
-
 // ********** public function prototypes **********
 
 // ACK MSG