diff --git a/.gitmodules b/.gitmodules
index 717ffc71b4..2407532fa5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,11 @@
 [submodule "Loop"]
 	path = Loop
-	url = https://github.com/LoopKit/Loop.git
+	url = https://github.com/bjorninge-no-personal/LoopPebble.git
+	branch = smartwatch-manager-review
 [submodule "LoopKit"]
 	path = LoopKit
-	url = https://github.com/LoopKit/LoopKit.git
+	url = https://github.com/dabear/LoopKit.git
+	branch = smartwatch-manager-review
 [submodule "CGMBLEKit"]
 	path = CGMBLEKit
 	url = https://github.com/LoopKit/CGMBLEKit.git
@@ -73,3 +75,7 @@
 [submodule "RoundWhiteDiscKit"]
 	path = RoundWhiteDiscKit
 	url = https://github.com/airedev326/RoundWhiteDiscKit.git
+[submodule "LupedSmartwatchKit"]
+	path = LupedSmartwatchKit
+	url = https://github.com/dabear/LupedSmartwatchKit.git
+	branch = smartwatch-manager-review
diff --git a/Loop b/Loop
index 29928c1c5f..f532d3d29b 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit 29928c1c5feb69fb0e778fe94584bbd453d42c4c
+Subproject commit f532d3d29b5147ec092e66508086b12dbd9b3dfa
diff --git a/LoopConfigOverride.xcconfig b/LoopConfigOverride.xcconfig
index fac2d9ba08..5605c504eb 100644
--- a/LoopConfigOverride.xcconfig
+++ b/LoopConfigOverride.xcconfig
@@ -12,6 +12,9 @@
 // Set this to how many days you want to keep data locally on the phone
 //LOOP_LOCAL_CACHE_DURATION_DAYS = 90
 
+// Uncomment to build without the bluetooth-peripheral background mode that watch plugins need
+//INFOPLIST_PREPROCESSOR_DEFINITIONS =
+
 // Features
 SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) EXPERIMENTAL_FEATURES_ENABLED SIMULATORS_ENABLED ALLOW_ALGORITHM_EXPERIMENTS DEBUG_FEATURES_ENABLED
 
diff --git a/LoopKit b/LoopKit
index c6192c6e1d..826587db2f 160000
--- a/LoopKit
+++ b/LoopKit
@@ -1 +1 @@
-Subproject commit c6192c6e1dc343880aab33860707bc8845ad84e9
+Subproject commit 826587db2f56e9aa01294cf57f75bc3813e2b905
diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
index 1116bddf93..057d5260c9 100644
--- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata
+++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
@@ -132,6 +132,9 @@
    <FileRef
       location = "group:G7SensorKit/G7SensorKit.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:LupedSmartwatchKit/LupedSmartwatchKit.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:LibreTransmitter/LibreTransmitter.xcodeproj">
    </FileRef>
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
index dd0810d5ff..0e53ab1785 100644
--- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "3074fb13e969eeb07af13d2659671d107eac739de84ccaff57f73a4b6201e10f",
+  "originHash" : "4f012abb426e0a201e0484d769e08540f8897a224b27c26e9c9c1f233e02e75e",
   "pins" : [
     {
       "identity" : "amplitude-ios",
@@ -64,6 +64,15 @@
         "version" : "1.7.1"
       }
     },
+    {
+      "identity" : "elbbeptransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/dabear/elbbepTransport.git",
+      "state" : {
+        "revision" : "22a718082e975e393f189c56903da14b0244fd87",
+        "version" : "0.3.59"
+      }
+    },
     {
       "identity" : "json-logic-swift",
       "kind" : "remoteSourceControl",
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
index 256d8b57df..1e3804baf0 100644
--- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
+++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
@@ -314,6 +314,20 @@
                ReferencedContainer = "container:G7SensorKit/G7SensorKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9957C3874D28E7BE1F83FBD7"
+               BuildableName = "LupedSmartwatchPlugin.loopplugin"
+               BlueprintName = "LupedSmartwatchPlugin"
+               ReferencedContainer = "container:LupedSmartwatchKit/LupedSmartwatchKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/LupedSmartwatchKit b/LupedSmartwatchKit
new file mode 160000
index 0000000000..f84aa681fd
--- /dev/null
+++ b/LupedSmartwatchKit
@@ -0,0 +1 @@
+Subproject commit f84aa681fd41e08bcbef1020a297f307f77ff741