diff --git a/.gitmodules b/.gitmodules
index 6a7fb4a2a7..d3100d0780 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "OmniBLE"]
 	path = OmniBLE
 	url = https://github.com/LoopKit/OmniBLE.git
+[submodule "NightscoutAPIClient"]
+	path = NightscoutAPIClient
+	url = https://github.com/gestrich/NightscoutAPIClient.git 
diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata
index 8406eb1ced..d7f17bd74e 100644
--- a/Loop.xcworkspace/contents.xcworkspacedata
+++ b/Loop.xcworkspace/contents.xcworkspacedata
@@ -55,4 +55,7 @@
    <FileRef
       location = "group:OmniBLE/OmniBLE.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:NightscoutAPIClient/NightscoutAPIClient.xcodeproj">
+   </FileRef>
 </Workspace>
diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme
index dd841e868e..11132c17f8 100644
--- a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme	
+++ b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme	
@@ -230,6 +230,20 @@
                ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A9BAC72626CDB7A5001C9493"
+               BuildableName = "NightscoutAPIClientPlugin.loopplugin"
+               BlueprintName = "NightscoutAPIClientPlugin"
+               ReferencedContainer = "container:NightscoutAPIClient/NightscoutAPIClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/NightscoutAPIClient b/NightscoutAPIClient
new file mode 160000
index 0000000000..f65acc47d2
--- /dev/null
+++ b/NightscoutAPIClient
@@ -0,0 +1 @@
+Subproject commit f65acc47d21fd13aa14a5ffacf88e5327ca1e999
diff --git a/rileylink_ios b/rileylink_ios
index 385af671bd..db8a3e8765 160000
--- a/rileylink_ios
+++ b/rileylink_ios
@@ -1 +1 @@
-Subproject commit 385af671bd1bad32c9dbe649ed6b85f258620d6e
+Subproject commit db8a3e87658f3801c7f699ab5a00ff752bf0abe6