Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd62cad9611841e592b4b46b1170e4beb57c1d153 -rc7cb089bd32c2b5aa8593549bb7eaa7d1a0323c2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d62cad9611841e592b4b46b1170e4beb57c1d153)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c7cb089bd32c2b5aa8593549bb7eaa7d1a0323c2)
@@ -1444,14 +1444,14 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
+    DG_VALVE_SETTING_CMD_REQUEST_T valveCmd;
 
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( U32 );
+    msg.hdr.payloadLen = sizeof( DG_VALVE_SETTING_CMD_REQUEST_T );
 
-    memcpy( payloadPtr, &valveSettingCmd, sizeof( U32 ) );
+    memcpy( &msg.payload, &valveCmd, sizeof( DG_VALVE_SETTING_CMD_REQUEST_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -1474,19 +1474,18 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
+    DG_FILL_CMD_T fillPayload;
 
+    fillPayload.fillToVolMl = fillToVolumeMl;
+    fillPayload.cmd = cmd;
+    fillPayload.targetFlowRateLPM = targetFlowRateLPM;
+
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_FILL_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( F32 );
+    msg.hdr.payloadLen = sizeof( DG_FILL_CMD_T );
+    memcpy( &msg.payload, &fillPayload, sizeof( DG_FILL_CMD_T ) );
 
-    memcpy( payloadPtr, &fillToVolumeMl, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &cmd, sizeof( U32 ) );
-    payloadPtr += sizeof( F32 );
-    memcpy( payloadPtr, &targetFlowRateLPM, sizeof( F32 ) );
-
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
 
@@ -1534,14 +1533,16 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
+    DG_START_STOP_TX_CMD_REQUEST_T cmd;
 
+    cmd.start = start;
+
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( BOOL );
+    msg.hdr.payloadLen = sizeof( DG_START_STOP_TX_CMD_REQUEST_T );
 
-    memcpy( payloadPtr, &start, sizeof( BOOL ) );
+    memcpy( &msg.payload, &cmd, sizeof( DG_START_STOP_TX_CMD_REQUEST_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -1563,14 +1564,16 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
+    DG_START_STOP_TRIMMER_HEATER_CMD_T cmd;
 
+    cmd.start = start;
+
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( BOOL );
+    msg.hdr.payloadLen = sizeof( DG_START_STOP_TRIMMER_HEATER_CMD_T );
 
-    memcpy( payloadPtr, &start, sizeof( BOOL ) );
+    memcpy( &msg.payload, &cmd, sizeof( DG_START_STOP_TRIMMER_HEATER_CMD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -1595,9 +1598,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( U32 );
+    msg.hdr.payloadLen = sizeof( SAMPLE_WATER_CMD_T );
 
-    memcpy( msg.payload, &cmd, sizeof( U32 ) );
+    memcpy( &msg.payload, &cmd, sizeof( SAMPLE_WATER_CMD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -1712,13 +1715,16 @@
 {
     BOOL result;
     MESSAGE_T msg;
+    DG_FLUSH_MODE_CMD_T cmd;
 
+    cmd.start = start;
+
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( BOOL );
+    msg.hdr.payloadLen = sizeof( DG_FLUSH_MODE_CMD_T );
 
-    memcpy( msg.payload, &start, sizeof( BOOL ) );
+    memcpy( &msg.payload, &cmd, sizeof( DG_FLUSH_MODE_CMD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -1741,13 +1747,16 @@
 {
     BOOL result;
     MESSAGE_T msg;
+    DG_HEAT_DISINFECTION_MODE_CMD_T cmd;
 
+    cmd.start = start;
+
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( BOOL );
+    msg.hdr.payloadLen = sizeof( DG_HEAT_DISINFECTION_MODE_CMD_T );
 
-    memcpy( msg.payload, &start, sizeof( BOOL ) );
+    memcpy( &msg.payload, &cmd, sizeof( DG_HEAT_DISINFECTION_MODE_CMD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -1774,9 +1783,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_START_STOP_CHEM_DISINFECT;
-    msg.hdr.payloadLen = sizeof( BOOL );
+    msg.hdr.payloadLen = sizeof( DG_CHEM_DISINFECTION_MODE_CMD_T );
 
-    memcpy( msg.payload, &start, sizeof( BOOL ) );
+    memcpy( &msg.payload, &start, sizeof( DG_CHEM_DISINFECTION_MODE_CMD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );