diff --git a/src/plugins/esp32/StoreForwardPlugin.cpp b/src/plugins/esp32/StoreForwardPlugin.cpp
index 6c3263432..8c8740cfd 100644
--- a/src/plugins/esp32/StoreForwardPlugin.cpp
+++ b/src/plugins/esp32/StoreForwardPlugin.cpp
@@ -5,6 +5,7 @@
 #include "Router.h"
 #include "configuration.h"
 #include "mesh-pb-constants.h"
+#include "mesh/generated/storeforward.pb.h"
 #include "plugins/PluginDev.h"
 #include <Arduino.h>
 #include <map>
@@ -223,6 +224,8 @@ void StoreForwardPlugin::sendMessage(NodeNum dest, char *str)
 
 
     service.sendToMesh(p);
+    
+    //HardwareMessage_init_default
 }
 
 ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
@@ -232,6 +235,14 @@ ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
 
         DEBUG_MSG("--- S&F Received something\n");
 
+        StoreAndForwardMessage sfm = StoreAndForwardMessage_init_default;
+
+        switch(sfm.rr) {
+            
+
+        }
+
+
         auto &p = mp.decoded;
 
         // The router node should not be sending messages as a client.
@@ -258,6 +269,8 @@ ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
                     storeForwardPlugin->historyAdd(mp);
                 }
 
+            } else if (mp.decoded.portnum == PortNum_STORE_FORWARD_APP) {
+
             } else {
                 DEBUG_MSG("Packet came from an unknown port %u\n", mp.decoded.portnum);
             }
diff --git a/src/plugins/esp32/StoreForwardPlugin.h b/src/plugins/esp32/StoreForwardPlugin.h
index 3df640778..e841ff4ac 100644
--- a/src/plugins/esp32/StoreForwardPlugin.h
+++ b/src/plugins/esp32/StoreForwardPlugin.h
@@ -2,6 +2,8 @@
 
 #include "SinglePortPlugin.h"
 #include "concurrency/OSThread.h"
+#include "mesh/generated/storeforward.pb.h"
+
 #include "configuration.h"
 #include <Arduino.h>
 #include <functional>
@@ -53,7 +55,10 @@ class StoreForwardPlugin : public SinglePortPlugin, private concurrency::OSThrea
     void sendPayload(NodeNum dest = NODENUM_BROADCAST, uint32_t packetHistory_index = 0);
     void sendMessage(NodeNum dest, char *str);
     virtual MeshPacket *allocReply();
-    virtual bool wantPortnum(PortNum p) { return true; };
+    /*
+      Override the wantPortnum method.
+      */
+    virtual bool wantPortnum(PortNum p) { return true; }; 
 
   private:
     void populatePSRAM();