Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r9799e3d83970fc263a1d8efe8cd9ca44d6b76d94
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9799e3d83970fc263a1d8efe8cd9ca44d6b76d94)
@@ -28,6 +28,7 @@
 #include "SystemCommMessages.h"
 #include "Utilities.h"
 #include "SystemComm.h"
+#include "RTC.h"
 
 // ********** private definitions **********
 
@@ -390,6 +391,30 @@
     return result;
 }
 
+BOOL broadcastRTCEpoch( U32 epoch )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U32 msgSize;
+    U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_RTC_EPOCH;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &epoch, sizeof( U32 ) );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding)
+    msgSize = serializeMessage( msg, data );
+
+    // add serialized message data to appropriate comm buffer
+    result = addToCommBuffer( COMM_BUFFER_OUT_CAN_HD_BROADCAST, data, msgSize );
+
+    return result;
+}
+
 /*************************************************************************
  * @brief handleDGCheckIn
  * The handleDGCheckIn function handles a check-in from the DG.
@@ -557,6 +582,26 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+
+void handleSetRTCTimestamp( MESSAGE_T *message )
+{
+    BOOL result;
+    U08 seconds = message->payload[0];
+    U08 minutes = message->payload[1];
+    U08 hours   = message->payload[2];
+    U08 days    = message->payload[3];
+    U08 months  = message->payload[4];
+    U16 years   = message->payload[5];
+
+    // TODO: Change setRTCTimestamp to return a boolean for this
+    result = TRUE;
+
+    setRTCTimestamp( seconds, minutes, hours, days, months, years );
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*************************************************************************
  * @brief handleTestOffButtonStateOverrideRequest
  * The handleTestOffButtonStateOverrideRequest function handles a request to \n
@@ -809,4 +854,3 @@
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC( U32, handleTestDialFlowBroadcastIntervalOverrideRequest, testSetDialInFlowDataPublishIntervalOverride, testResetDialInFlowDataPublishIntervalOverride )
 
-