diff --git a/mesh.proto b/mesh.proto
index 14d1bc6..e08da59 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -543,6 +543,11 @@ message Data {
    * a message a heart or poop emoji.
    */
   bool is_tapback = 8;
+  /*
+   * Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
+   * a message a heart or poop emoji.
+   */
+  uint32 group_id = 9;
 }
 
 /*
diff --git a/portnums.proto b/portnums.proto
index a9725d3..fc1f223 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -91,6 +91,11 @@ enum PortNum {
    */
   IP_TUNNEL_APP = 33;
 
+  /*
+   * Used for managing chat groups
+   */
+  GROUP_APP = 34;
+
   /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.
    * Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic