Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r24ccd2ca1586d0dd699d3cb0081ff18d5df4c5df -r26a1ca768a98655b83457493b4e2eeed104efeb5
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 24ccd2ca1586d0dd699d3cb0081ff18d5df4c5df)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 26a1ca768a98655b83457493b4e2eeed104efeb5)
@@ -292,27 +292,20 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    U32 e = (U32)event;
-    // Convert the two data types enums to U32. The enums are interpreted as a U08 by the compiler
-    U32 dataType1 = (U32)dat1.dataType;
-    U32 dataType2 = (U32)dat2.dataType;
+    EVENT_PAYLOAD_T eventStruct;
 
+    eventStruct.event     = (U32)event;
+    eventStruct.dataType1 = (U32)dat1.dataType;
+    eventStruct.data1     = dat1.data;
+    eventStruct.dataType2 = (U32)dat2.dataType;
+    eventStruct.data2     = dat2.data;
+
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_EVENT;
-    // The payload length is the event ID, 2 event datas and the events data types for each of the event data
-    msg.hdr.payloadLen = sizeof( U32 ) + 2 * sizeof( EVENT_DATAS_T ) + 2 * sizeof( U32 );
+    msg.hdr.msgID      = MSG_ID_DG_EVENT;
+    msg.hdr.payloadLen = sizeof( EVENT_PAYLOAD_T );
 
-    memcpy( payloadPtr, &e, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &dataType1, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &dat1.data, sizeof( EVENT_DATAS_T ) );
-    payloadPtr += sizeof( EVENT_DATAS_T );
-    memcpy( payloadPtr, &dataType2, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &dat2.data, sizeof( EVENT_DATAS_T ) );
+    memcpy( &msg.payload, &eventStruct, sizeof( EVENT_PAYLOAD_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_DG_2_UI, ACK_NOT_REQUIRED );