diff --git a/config.proto b/config.proto
index e4a372a..05bdb01 100644
--- a/config.proto
+++ b/config.proto
@@ -144,7 +144,7 @@ message Config {
     uint32 position_broadcast_secs = 1;
 
     /*
-     * We should send our position this often (but only if it has changed significantly)
+     * Disable adaptive position braoadcast, which is now the default.
      */
     bool position_broadcast_smart_disabled = 2;
 
@@ -155,11 +155,6 @@ message Config {
      */
     bool fixed_position = 3;
 
-    /*
-     * Should we disbale location sharing with other nodes (or the local phone)
-     */
-    bool location_share_disabled = 4;
-
     /*
      * Should the GPS be disabled for this node?
      */
diff --git a/deviceonly.proto b/deviceonly.proto
index 85ac638..58ea86a 100644
--- a/deviceonly.proto
+++ b/deviceonly.proto
@@ -5,6 +5,7 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/gomeshproto";
 
 import "channel.proto";
+import "config.proto";
 import "mesh.proto";
 
 option java_outer_classname = "DeviceOnly";
@@ -135,3 +136,34 @@ message OEMStore {
   string oem_text = 5;
 }
 
+message LocalConfig {
+  /*
+   * TODO: REPLACE
+   */
+  Config.DeviceConfig device = 1;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.PositionConfig position = 2;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.PowerConfig power = 3;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.WiFiConfig wifi = 4;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.DisplayConfig display = 5;
+
+  /*
+   * TODO: REPLACE
+   */
+  Config.LoRaConfig lora = 6;
+}
\ No newline at end of file