diff --git a/mesh.options b/mesh.options
index 9599acc..4dc35c3 100644
--- a/mesh.options
+++ b/mesh.options
@@ -18,6 +18,13 @@
 
 *MyNodeInfo.region max_size:12
 
+*MyNodeInfo.air_period_tx       max_count:24
+*MyNodeInfo.air_period_rx       max_count:24
+
+*MyNodeInfo.router       max_count:4
+*MyNodeInfo.router_snr   max_count:4
+*MyNodeInfo.router_sec   max_count:4 int_size:16
+
 # Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256
 # here because we might need to fill with zeros for padding to encryption block size (16 bytes per block)
 *MeshPacket.encrypted max_size:256
@@ -36,6 +43,3 @@
 
 # MyMessage.name         max_size:40 
 # or fixed_length or fixed_count, or max_count
-
-*MyNodeInfo.air_period_tx       max_count:24
-*MyNodeInfo.air_period_rx       max_count:24
diff --git a/mesh.proto b/mesh.proto
index 24dc2f6..ffe6acb 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -1212,9 +1212,20 @@ message MyNodeInfo {
   float air_util_tx = 20;
 
   /*
-   * TODO: REPLACE
-   * FIXME - add more useful debugging state (queue depths etc)
+   * How many routers are we in range of?
    */
+  repeated uint32 router = 21;
+
+  /*
+   * What is the snr of the last router message?
+   */
+  repeated float router_snr = 22;
+
+  /*
+   * How long has it been since we last heard from the router?
+   */
+  repeated uint32 router_sec = 23;
+
 }
 
 /*