diff --git a/mesh.proto b/mesh.proto
index c25c95d..33c17e8 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -525,6 +525,12 @@ 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;
 }
 
 /*
@@ -881,6 +887,14 @@ enum CriticalErrorCode {
   RadioSpiBug = 11;
 }
 
+/*
+ * GroupInfo for group chats like #FoodFreaks and #CoolPeopleOnly
+ */
+message GroupInfo {
+  repeated string group = 1 [(nanopb).max_length = 16, (nanopb).max_count = 10];
+}
+
+
 /*
  * Unique local debugging info for this node
  * Note: we don't include position or the user info, because that will come in the
diff --git a/portnums.proto b/portnums.proto
index a9725d3..70509f1 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -92,6 +92,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
    * network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.