diff --git a/Cartfile b/Cartfile
index 406d88356..752c28b90 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" == 1.2.1
+github "LoopKit/LoopKit" == 1.3.0
 github "LoopKit/xDripG5" ~> 0.8.0
-github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
+github "i-schuetz/SwiftCharts" ~> 0.6.0
 github "mddub/dexcom-share-client-swift" == 0.2.1
 github "mddub/G4ShareSpy" == 0.3.2
-github "ps2/rileylink_ios" ~> 1.0
+github "ps2/rileylink_ios" == 1.1.0
 github "amplitude/Amplitude-iOS" ~> 3.8.5
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 6a490a054..2911b5559 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" "v1.2.1"
+github "LoopKit/LoopKit" "v1.3.0"
 github "LoopKit/xDripG5" "v0.8.0"
 github "amplitude/Amplitude-iOS" "v3.14.1"
-github "bharat/SwiftCharts" "9faad7c38762a177ae01382def605a77c0e61aba"
+github "i-schuetz/SwiftCharts" "0.6"
 github "mddub/G4ShareSpy" "v0.3.2"
 github "mddub/dexcom-share-client-swift" "v0.2.1"
-github "ps2/rileylink_ios" "v1.0"
+github "ps2/rileylink_ios" "v1.1.0"
diff --git a/Carthage/Build/.Amplitude-iOS.version b/Carthage/Build/.Amplitude-iOS.version
index ab436cc5e..f887ad548 100644
--- a/Carthage/Build/.Amplitude-iOS.version
+++ b/Carthage/Build/.Amplitude-iOS.version
@@ -2,12 +2,18 @@
   "commitish" : "v3.14.1",
   "iOS" : [
     {
-      "hash" : "6bc6866c140345d67c5e0a79d05d6f20baab401a7d3e31368ee53cc173a777c5",
+      "hash" : "d272791b1288fa80098d66adc4a855198ebcaa6c2c50b8487921c44d9d1e9e0e",
       "name" : "Amplitude"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "xcodeVersion" : "Xcode 8.3.2\nBuild version 8E2002",
   "watchOS" : [
 
+  ],
+  "tvOS" : [
+
+  ],
+  "Mac" : [
+
   ]
 }
\ No newline at end of file
diff --git a/Carthage/Build/.G4ShareSpy.version b/Carthage/Build/.G4ShareSpy.version
index a6dd5af71..b2942ea56 100644
--- a/Carthage/Build/.G4ShareSpy.version
+++ b/Carthage/Build/.G4ShareSpy.version
@@ -2,11 +2,11 @@
   "commitish" : "v0.3.2",
   "iOS" : [
     {
-      "hash" : "beef8d222643827ee443f618e7b67591ec6619103409d11c8ca77a1eb5c1719e",
+      "hash" : "db9044cc4f0523847cfdf9f53175f81aa10eaa34296f397561a239520c1a0f05",
       "name" : "G4ShareSpy"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "xcodeVersion" : "Xcode 8.3.2\nBuild version 8E2002",
   "watchOS" : [
 
   ],
diff --git a/Carthage/Build/.LoopKit.version b/Carthage/Build/.LoopKit.version
index a4ce8a8e5..d45d55923 100644
--- a/Carthage/Build/.LoopKit.version
+++ b/Carthage/Build/.LoopKit.version
@@ -1,24 +1,23 @@
 {
-  "commitish" : "v1.2.1",
   "iOS" : [
     {
-      "hash" : "47ff001fa15f5b07e5e92b5da214ef8c97cf5ff0a0cf447d16038e5ca622e66f",
+      "hash" : "ff17afa9c1bc6adb1a9097f10358f3109a2fad7f17a7427a99e3add19f8192c2",
       "name" : "GlucoseKit"
     },
     {
-      "hash" : "93e4e99f489c15030824abe073d20de926f4a90389c825cc7861203ae49909a8",
+      "hash" : "064098139c38ebe785c5882068d75604c9e5f862ef932765389593f4bc56dc92",
       "name" : "InsulinKit"
     },
     {
-      "hash" : "9122ad15208953233de1c473f208c26755d83addcd63ae6f87692d347d903b3f",
-      "name" : "CarbKit"
+      "hash" : "962b86c0793ced4741d32439a9ce836c054a2f2b58214279cfcfb634acea5757",
+      "name" : "LoopKit"
     },
     {
-      "hash" : "0ddbb7baab1a7ec512b45f485612c7aa1bb88ac916d06fab93720b78c0e5a383",
-      "name" : "LoopKit"
+      "hash" : "b93fe2ceaff06f8748e90e7a83d80b64d7d2b2c52a78ebe6fb59f9ea3eb270c5",
+      "name" : "CarbKit"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "commitish" : "v1.3.0",
   "watchOS" : [
 
   ],
diff --git a/Carthage/Build/.SwiftCharts.version b/Carthage/Build/.SwiftCharts.version
index b456dd04d..e333aa588 100644
--- a/Carthage/Build/.SwiftCharts.version
+++ b/Carthage/Build/.SwiftCharts.version
@@ -1,13 +1,22 @@
 {
-  "commitish" : "0.5.1-extension-api-safe",
+  "commitish" : "0.6",
   "iOS" : [
     {
-      "hash" : "62cbb97f5e728e49218735ab23408638315a3951e00b342cbe2ae33aedd99f9e",
+      "hash" : "326259aba63578ffb93455bb07d2a1919e68d92157e02941c1628fd7704e1efa",
       "name" : "SwiftCharts"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "xcodeVersion" : "Xcode 8.3.2\nBuild version 8E2002",
   "watchOS" : [
 
+  ],
+  "tvOS" : [
+    {
+      "hash" : "1449a06dc971aeecdf02272698471b91cb6988ea0ef25e474d9e3d3db1e949b3",
+      "name" : "SwiftCharts"
+    }
+  ],
+  "Mac" : [
+
   ]
 }
\ No newline at end of file
diff --git a/Carthage/Build/.dexcom-share-client-swift.version b/Carthage/Build/.dexcom-share-client-swift.version
index 84e836492..7df924b25 100644
--- a/Carthage/Build/.dexcom-share-client-swift.version
+++ b/Carthage/Build/.dexcom-share-client-swift.version
@@ -2,11 +2,11 @@
   "commitish" : "v0.2.1",
   "iOS" : [
     {
-      "hash" : "e3b9da87c4628e1edfb5405c50e38aa1fbfccae94a6913516d33bd7de848ec4e",
+      "hash" : "7a23bd73e6e8f0daee22d4df7ff6f410a40d21ebf83998e1adb12010a7ee902f",
       "name" : "ShareClient"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "xcodeVersion" : "Xcode 8.3.2\nBuild version 8E2002",
   "watchOS" : [
 
   ],
diff --git a/Carthage/Build/.rileylink_ios.version b/Carthage/Build/.rileylink_ios.version
index ddd43dc4a..2a8076c2d 100644
--- a/Carthage/Build/.rileylink_ios.version
+++ b/Carthage/Build/.rileylink_ios.version
@@ -1,29 +1,34 @@
 {
-  "commitish" : "v1.0",
   "iOS" : [
     {
-      "hash" : "a37facbada2a322e4075abf8e8cded5db28183c4fb8c1ff4b71b0e367c22f96b",
+      "hash" : "001a015c6f775b65568a03398b15a7ec016d5514945a004333b3ca2d7fe2c083",
       "name" : "Crypto"
     },
     {
-      "hash" : "a18b119321af918976043c720ecb0735d3fca28fc0e93ed410fc0c3ddfe6b709",
+      "hash" : "9ca95fb0daffb835a39d2403ac1da2ca6af12fdeaa2ddfc1a4676ca0db304896",
       "name" : "RileyLinkBLEKit"
     },
     {
-      "hash" : "9e655df79ad79588ee56a4a83546629e4215fdf3e0d37da2b97fe6a5e72f754f",
+      "hash" : "f58e47ea57693a5e37162f8e0d9e1b2057139b7019012fd25a7dc992c3629067",
       "name" : "NightscoutUploadKit"
     },
     {
-      "hash" : "300d0ec7faad316104dd93a70cd1bdc1212acb2478d043d6cb8e03e87ac242b8",
+      "hash" : "50b787e77565e49d65cbb7a7a6ddeae9a4d3c78afe524a6d3def56b73120c66b",
       "name" : "RileyLinkKit"
     },
     {
-      "hash" : "8064d27b4af52d920e554b3bd1ef0ca9a2fbfc717febd83fc4265382a938ecb3",
+      "hash" : "c9491ddea5895f23a4d15efe49bb1d44b80897145f1702b8ccdbe1b4660b21cc",
       "name" : "MinimedKit"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "commitish" : "v1.1.0",
   "watchOS" : [
 
+  ],
+  "tvOS" : [
+
+  ],
+  "Mac" : [
+
   ]
 }
\ No newline at end of file
diff --git a/Carthage/Build/.xDripG5.version b/Carthage/Build/.xDripG5.version
index 31de055c9..1dbbc164b 100644
--- a/Carthage/Build/.xDripG5.version
+++ b/Carthage/Build/.xDripG5.version
@@ -2,12 +2,18 @@
   "commitish" : "v0.8.0",
   "iOS" : [
     {
-      "hash" : "22ae8718045ac2980b4e93cfb0deb7baf2602d6683ece3571d61053ef79d51b1",
+      "hash" : "8568448b3acdbfa1da26b3a87e2b08db5b11e9b6625ccc61e159179f23ea951a",
       "name" : "xDripG5"
     }
   ],
-  "xcodeVersion" : "Xcode 8.3\nBuild version 8E162",
+  "xcodeVersion" : "Xcode 8.3.2\nBuild version 8E2002",
   "watchOS" : [
 
+  ],
+  "tvOS" : [
+
+  ],
+  "Mac" : [
+
   ]
 }
\ No newline at end of file
diff --git a/Carthage/Build/iOS/Amplitude.framework/Amplitude b/Carthage/Build/iOS/Amplitude.framework/Amplitude
index 892c68ceb..c22acf809 100755
Binary files a/Carthage/Build/iOS/Amplitude.framework/Amplitude and b/Carthage/Build/iOS/Amplitude.framework/Amplitude differ
diff --git a/Carthage/Build/iOS/Amplitude.framework/Info.plist b/Carthage/Build/iOS/Amplitude.framework/Info.plist
index 5ab0ffc90..0e584bcd7 100644
Binary files a/Carthage/Build/iOS/Amplitude.framework/Info.plist and b/Carthage/Build/iOS/Amplitude.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit b/Carthage/Build/iOS/CarbKit.framework/CarbKit
index a05188226..919512561 100755
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit and b/Carthage/Build/iOS/CarbKit.framework/CarbKit differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib
index 49a9698d4..658f53aa5 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib
index aa291d0dd..84f856e3c 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist
index 913d5f108..a017eca39 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib
index 35a7bf260..7cc65fd61 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib
index 1db8e7ffe..18b9046ce 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib
index c580698bc..e3cac9858 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h
index 21ee89a55..d37b46094 100644
--- a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h
+++ b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -188,6 +188,10 @@ SWIFT_CLASS("_TtC7CarbKit28CarbEntryTableViewController")
 @end
 
 
+@interface HKUnit (SWIFT_EXTENSION(CarbKit))
+@end
+
+
 @interface UITableViewCell (SWIFT_EXTENSION(CarbKit))
 @end
 
diff --git a/Carthage/Build/iOS/CarbKit.framework/Info.plist b/Carthage/Build/iOS/CarbKit.framework/Info.plist
index de5e9970a..c85ba8eb9 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Info.plist and b/Carthage/Build/iOS/CarbKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc
index 2da63c487..53399ffd7 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule
index 988a9ddc3..bf3f9f392 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc
index d61432606..6964d20c6 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule
index ab85e9b71..10759ae65 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc
index a4c8a67b4..ad3e27a92 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule
index dc84d2718..27a8b9b34 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc
index f7a536b62..79b4ece71 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule
index 900a7e79e..6f86f41f0 100644
Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/Crypto.framework/Crypto b/Carthage/Build/iOS/Crypto.framework/Crypto
index f70cfa509..fba6354ee 100755
Binary files a/Carthage/Build/iOS/Crypto.framework/Crypto and b/Carthage/Build/iOS/Crypto.framework/Crypto differ
diff --git a/Carthage/Build/iOS/Crypto.framework/Info.plist b/Carthage/Build/iOS/Crypto.framework/Info.plist
index 2a810c2a3..fcfa74313 100644
Binary files a/Carthage/Build/iOS/Crypto.framework/Info.plist and b/Carthage/Build/iOS/Crypto.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
index 55b475395..6572b6ae9 100755
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy and b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h
index c4269f528..1f2308d57 100644
--- a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h
+++ b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist
index 7a8940a01..857781b29 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist and b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc
index abcbb8df6..8bc0e68d2 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule
index 64a935ed1..373a9c9eb 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc
index 63da53a30..37c1ded5e 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule
index e4887ba6d..af5e5bc3c 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc
index e529e09b2..7726a921d 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule
index b1bfe146d..5c4188f04 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc
index 8fc01870c..440096a37 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule
index dcb0eedc9..d5e10818c 100644
Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
index 754c1e91b..6ffb4cbda 100755
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit and b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h
index a319be722..24dd4e637 100644
--- a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h
+++ b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -141,4 +141,8 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 @interface HKQuantitySample (SWIFT_EXTENSION(GlucoseKit))
 @end
 
+
+@interface HKUnit (SWIFT_EXTENSION(GlucoseKit))
+@end
+
 #pragma clang diagnostic pop
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist
index 4d478f466..98e3c9f12 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist and b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc
index 527822467..95d8c3747 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule
index 74a5a4c53..6e32b848d 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc
index 92f31128d..433712660 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule
index fbb66100d..839ed8cf4 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc
index 043ad185f..b467b74bd 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule
index e6eafc060..5b6f72620 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc
index b3d91737b..6fe4c0f89 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule
index 134d3eb02..5fa9f5b4a 100644
Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib
index c74e0212a..ab8776262 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib
index d942dde7c..85718388c 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h
index 3663550a1..556132d1d 100644
--- a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h
+++ b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -132,12 +132,17 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
 #endif
 #if defined(__has_feature) && __has_feature(modules)
+@import HealthKit;
 @import UIKit;
 @import Foundation;
 #endif
 
 #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
 #pragma clang diagnostic ignored "-Wduplicate-method-arg"
+
+@interface HKUnit (SWIFT_EXTENSION(InsulinKit))
+@end
+
 @class UITableView;
 @class UITableViewCell;
 @class NSBundle;
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Info.plist b/Carthage/Build/iOS/InsulinKit.framework/Info.plist
index 89f430d11..034613d54 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Info.plist and b/Carthage/Build/iOS/InsulinKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit
index 7ee0aca79..26a0edd38 100755
Binary files a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit and b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom
index dffdf5bcc..c6dc4515f 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom and b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist
index 340577f78..d99acdce8 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist and b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc
index 5490b83f2..595630565 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule
index c483dad44..102232b1c 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc
index 73dd6e98e..eb9c7e383 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule
index 0a701ad5a..39ca7bc5a 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc
index 7dde19a9c..002bd2f3f 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule
index 815a56b6c..c9a0fb50e 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc
index 2033c8ff1..83de2a99a 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule
index 82ad4c21d..138ae0406 100644
Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Assets.car b/Carthage/Build/iOS/LoopKit.framework/Assets.car
index 739997060..e6222fb50 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Assets.car and b/Carthage/Build/iOS/LoopKit.framework/Assets.car differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib
index 9aa9a6125..08de1385e 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib
index ef0ea2ca3..eef9000b3 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h
index 467bc41e1..21afcc3d2 100644
--- a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h
+++ b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -248,12 +248,6 @@ SWIFT_CLASS("_TtC7LoopKit39GlucoseRangeScheduleTableViewController")
 
 
 @interface HKUnit (SWIFT_EXTENSION(LoopKit))
-+ (HKUnit * _Nonnull)milligramsPerDeciliterUnit SWIFT_WARN_UNUSED_RESULT;
-+ (HKUnit * _Nonnull)millimolesPerLiterUnit SWIFT_WARN_UNUSED_RESULT;
-/// A formatting helper for determining the preferred decimal style for a given unit
-@property (nonatomic, readonly) NSInteger preferredFractionDigits;
-/// A presentation helper for the localized unit string
-@property (nonatomic, readonly, copy) NSString * _Nonnull glucoseUnitDisplayString;
 @end
 
 
diff --git a/Carthage/Build/iOS/LoopKit.framework/Info.plist b/Carthage/Build/iOS/LoopKit.framework/Info.plist
index 3374b0e4d..2825c4e20 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Info.plist and b/Carthage/Build/iOS/LoopKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/LoopKit b/Carthage/Build/iOS/LoopKit.framework/LoopKit
index d87fa9cfc..4c662b7ee 100755
Binary files a/Carthage/Build/iOS/LoopKit.framework/LoopKit and b/Carthage/Build/iOS/LoopKit.framework/LoopKit differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc
index baeda310c..ba630f7d7 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule
index 908b410dd..d8476a4e8 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc
index 9b166416d..d4b35bfa4 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule
index f3948c22a..515c36ff7 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc
index 2e4df1ae7..e7e483da5 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule
index 1e5f7ecea..22d846a32 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc
index d834021fa..4e99b57fd 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule
index 4e65b14f2..6610a89bd 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib
index af8182913..4db9214f9 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib differ
diff --git a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
index abeef4295..0cd51c1f4 100644
Binary files a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h
index c55217438..934e655a1 100644
--- a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h
+++ b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Info.plist b/Carthage/Build/iOS/MinimedKit.framework/Info.plist
index 2727260ea..3b532b77a 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Info.plist and b/Carthage/Build/iOS/MinimedKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit
index 2ac1b4899..d45284aba 100755
Binary files a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit and b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc
index cf5379ed6..a1098131e 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule
index 96368c994..191fb22d2 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc
index bd01cef47..cdd7a8dc2 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule
index 9c58748b3..22e5270ed 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc
index afb025ac2..3e4fc970b 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule
index 181a2c490..7183e34cb 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc
index dacc0282a..281fd3145 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule
index 8f428d2fd..ac734d5a9 100644
Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h
index 6ab37567a..269b50cbd 100644
--- a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h
+++ b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist
index ed036b7a7..a39a058ea 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc
index 524f95cb7..3ae4433b0 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule
index df01c035a..92159f33b 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc
index e9efe46f0..ac2f7f7b6 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule
index 00492a924..7c3a3b70e 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc
index 4da1ba59b..f39bad974 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule
index b8a30fe86..b33c37793 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc
index 4ededb9d5..43e5d2162 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule
index ae02ad7fc..056315b39 100644
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit
index 5fa94d163..08606c3c8 100755
Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit and b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit differ
diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/GetPacketCmd.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/GetPacketCmd.h
index 284efa8c4..ae43054d1 100644
--- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/GetPacketCmd.h
+++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/GetPacketCmd.h
@@ -13,6 +13,6 @@
 @interface GetPacketCmd : ReceivingPacketCmd
 
 @property (nonatomic, assign) uint8_t listenChannel;
-@property (nonatomic, assign) uint16_t timeoutMS;
+@property (nonatomic, assign) uint32_t timeoutMS;
 
 @end
diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h
index a21b9471f..3c7742275 100644
--- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h
+++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h
@@ -82,6 +82,8 @@ typedef NS_ENUM(NSUInteger, SubgRfspyVersionState) {
 
 @property (nonatomic) BOOL timerTickEnabled;
 
+@property (nonatomic) uint32_t idleTimeoutMS;
+
 /**
  Initializes the device with a specified peripheral
 
diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h
index b699c5ba9..39cec82cf 100644
--- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h
+++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h
@@ -27,17 +27,18 @@
 #define RILEYLINK_TIMER_TICK_UUID       @"6e6c7910-b89e-43a5-78af-50c5e2b86f7e"
 #define RILEYLINK_FIRMWARE_VERSION_UUID @"30d99dc9-7c91-4295-a051-0a104d238cf2"
 
+@class RileyLinkBLEDevice;
 
 @interface RileyLinkBLEManager : NSObject
 
-@property (nonatomic, nonnull, readonly, copy) NSArray *rileyLinkList;
+@property (nonatomic, nonnull, readonly, copy) NSArray<RileyLinkBLEDevice *> *rileyLinkList;
 
 - (void)connectPeripheral:(nonnull CBPeripheral *)peripheral;
 - (void)disconnectPeripheral:(nonnull CBPeripheral *)peripheral;
 
 + (nonnull instancetype)sharedManager;
 
-@property (nonatomic, nonnull, strong) NSSet *autoConnectIds;
+@property (nonatomic, nonnull, strong) NSSet<NSString *> *autoConnectIds;
 @property (nonatomic, getter=isScanningEnabled) BOOL scanningEnabled;
 
 /**
diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/SendAndListenCmd.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/SendAndListenCmd.h
index 1a9263f8a..9d5eca885 100644
--- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/SendAndListenCmd.h
+++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/SendAndListenCmd.h
@@ -17,7 +17,7 @@
 @property (nonatomic, assign) uint8_t repeatCount; // 0 = no repeat, i.e. only one packet.  1 repeat = 2 packets sent total.
 @property (nonatomic, assign) uint8_t msBetweenPackets;
 @property (nonatomic, assign) uint8_t listenChannel;
-@property (nonatomic, assign) uint16_t timeoutMS;
+@property (nonatomic, assign) uint32_t timeoutMS;
 @property (nonatomic, assign) uint8_t retryCount;
 
 @end
diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist
index 0dd51048e..00785f542 100644
Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
index 0fbcc699e..19a1b5e65 100755
Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h
index 9b1d9c679..314276333 100644
--- a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h
+++ b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist
index 967c49d8d..ab7b7ca3e 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc
index ce7754b57..fc88de76b 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule
index be3ada218..defc2b201 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc
index e527d30e7..143a6e8f4 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule
index f5103bf6e..d72e79d26 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc
index 6a73a55d8..8a86bc670 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule
index 160d0367d..a0e4dc112 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc
index ba10e1671..accc6219f 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule
index 40577c17d..c3f5dc787 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib
index db5e57244..a63f2489b 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
index 7f35911f5..7d8c26c69 100755
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit differ
diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib
index ab6d1b7d0..e61ec876b 100644
Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h
index c4269f528..1f2308d57 100644
--- a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h
+++ b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
diff --git a/Carthage/Build/iOS/ShareClient.framework/Info.plist b/Carthage/Build/iOS/ShareClient.framework/Info.plist
index 5578c4551..2c6fa192b 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Info.plist and b/Carthage/Build/iOS/ShareClient.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc
index abcbb8df6..8bc0e68d2 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule
index 5b0873a45..dcf5c2f44 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc
index 63da53a30..37c1ded5e 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule
index db1f8291f..1898d9630 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc
index e529e09b2..7726a921d 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule
index 30ff0708f..2f62da22d 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc
index 8fc01870c..440096a37 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule
index 1475f299d..d8103bfe7 100644
Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/ShareClient.framework/ShareClient b/Carthage/Build/iOS/ShareClient.framework/ShareClient
index 44af398d4..bbce83b2c 100755
Binary files a/Carthage/Build/iOS/ShareClient.framework/ShareClient and b/Carthage/Build/iOS/ShareClient.framework/ShareClient differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h
index c70beb91a..2bb34d2a4 100644
--- a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h
+++ b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -134,6 +134,7 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #if defined(__has_feature) && __has_feature(modules)
 @import UIKit;
 @import CoreGraphics;
+@import ObjectiveC;
 #endif
 
 #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
@@ -143,18 +144,24 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 
 SWIFT_CLASS("_TtC11SwiftCharts14ChartAreasView")
 @interface ChartAreasView : UIView
-- (nonnull instancetype)initWithPoints:(NSArray<NSValue *> * _Nonnull)points frame:(CGRect)frame color:(UIColor * _Nonnull)color animDuration:(float)animDuration animDelay:(float)animDelay OBJC_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)initWithPoints:(NSArray<NSValue *> * _Nonnull)points frame:(CGRect)frame colors:(NSArray<UIColor *> * _Nonnull)colors animDuration:(float)animDuration animDelay:(float)animDelay OBJC_DESIGNATED_INITIALIZER;
 - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
+@class UIPinchGestureRecognizer;
+@class UIPanGestureRecognizer;
+@class UITapGestureRecognizer;
 
 SWIFT_CLASS("_TtC11SwiftCharts9ChartView")
-@interface ChartView : UIView
+@interface ChartView : UIView <UIGestureRecognizerDelegate>
 - (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
 /// Initialization code shared between all initializers
 - (void)sharedInit;
+- (void)onPinch:(UIPinchGestureRecognizer * _Nonnull)sender;
+- (void)onPan:(UIPanGestureRecognizer * _Nonnull)sender;
+- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender;
 @end
 
 
@@ -176,12 +183,69 @@ SWIFT_CLASS("_TtC11SwiftCharts20ChartCandleStickView")
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
+
+SWIFT_CLASS("_TtC11SwiftCharts16ChartContentView")
+@interface ChartContentView : UIView
+- (void)drawRect:(CGRect)rect;
+- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
+@end
+
+
+/// Convenience class to store common properties and make protocol’s methods optional
+SWIFT_CLASS("_TtC11SwiftCharts14ChartLayerBase")
+@interface ChartLayerBase : NSObject
+- (void)update;
+- (void)zoom:(CGFloat)x y:(CGFloat)y centerX:(CGFloat)centerX centerY:(CGFloat)centerY;
+- (void)zoom:(CGFloat)scaleX scaleY:(CGFloat)scaleY centerX:(CGFloat)centerX centerY:(CGFloat)centerY;
+- (void)pan:(CGFloat)deltaX deltaY:(CGFloat)deltaY;
+- (BOOL)processPanWithLocation:(CGPoint)location deltaX:(CGFloat)deltaX deltaY:(CGFloat)deltaY isGesture:(BOOL)isGesture isDeceleration:(BOOL)isDeceleration SWIFT_WARN_UNUSED_RESULT;
+- (void)handlePanStart:(CGPoint)location;
+- (void)handlePanFinish;
+- (void)handleZoomFinish;
+- (void)handlePanEnd;
+- (void)handleZoomEnd;
+- (BOOL)processZoomWithDeltaX:(CGFloat)deltaX deltaY:(CGFloat)deltaY anchorX:(CGFloat)anchorX anchorY:(CGFloat)anchorY SWIFT_WARN_UNUSED_RESULT;
+- (id _Nullable)handleGlobalTap:(CGPoint)location SWIFT_WARN_UNUSED_RESULT;
+- (void)keepInBoundaries;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
+
+SWIFT_CLASS("_TtC11SwiftCharts21ChartCoordsSpaceLayer")
+@interface ChartCoordsSpaceLayer : ChartLayerBase
+- (CGPoint)modelLocToScreenLocWithX:(double)x y:(double)y SWIFT_WARN_UNUSED_RESULT;
+- (CGFloat)modelLocToScreenLocWithX:(double)x SWIFT_WARN_UNUSED_RESULT;
+- (CGFloat)modelLocToScreenLocWithY:(double)y SWIFT_WARN_UNUSED_RESULT;
+- (CGPoint)modelLocToContainerScreenLocWithX:(double)x y:(double)y SWIFT_WARN_UNUSED_RESULT;
+- (CGFloat)modelLocToContainerScreenLocWithX:(double)x SWIFT_WARN_UNUSED_RESULT;
+- (CGFloat)modelLocToContainerScreenLocWithY:(double)y SWIFT_WARN_UNUSED_RESULT;
+- (CGPoint)modelLocToGlobalScreenLocWithX:(double)x y:(double)y SWIFT_WARN_UNUSED_RESULT;
+- (CGFloat)modelLocToGlobalScreenLocWithX:(double)x SWIFT_WARN_UNUSED_RESULT;
+- (CGFloat)modelLocToGlobalScreenLocWithY:(double)y SWIFT_WARN_UNUSED_RESULT;
+- (double)scalarForScreenLocWithX:(CGFloat)x SWIFT_WARN_UNUSED_RESULT;
+- (double)scalarForScreenLocWithY:(CGFloat)y SWIFT_WARN_UNUSED_RESULT;
+- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+@end
+
+
+SWIFT_CLASS("_TtC11SwiftCharts18ChartDividersLayer")
+@interface ChartDividersLayer : ChartCoordsSpaceLayer
+@end
+
+
 @class UIBezierPath;
+@class CAShapeLayer;
 
 SWIFT_CLASS("_TtC11SwiftCharts14ChartLinesView")
 @interface ChartLinesView : UIView
-- (nonnull instancetype)initWithPath:(UIBezierPath * _Nonnull)path frame:(CGRect)frame lineColor:(UIColor * _Nonnull)lineColor lineWidth:(CGFloat)lineWidth animDuration:(float)animDuration animDelay:(float)animDelay dashPattern:(NSArray<NSNumber *> * _Nullable)dashPattern OBJC_DESIGNATED_INITIALIZER;
+@property (nonatomic, readonly, strong) UIColor * _Nonnull lineColor;
+@property (nonatomic, readonly) CGFloat lineWidth;
+@property (nonatomic, readonly) float animDuration;
+@property (nonatomic, readonly) float animDelay;
+@property (nonatomic, readonly, copy) NSArray<NSNumber *> * _Nullable dashPattern;
 - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
+- (CAShapeLayer * _Nonnull)generateLayerWithPath:(UIBezierPath * _Nonnull)path SWIFT_WARN_UNUSED_RESULT;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
@@ -230,7 +294,15 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointTextCircleView")
 
 SWIFT_CLASS("_TtC11SwiftCharts17ChartPointViewBar")
 @interface ChartPointViewBar : UIView
-- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration OBJC_DESIGNATED_INITIALIZER;
+@property (nonatomic, readonly) CGRect targetFrame;
+@property (nonatomic) BOOL isSelected;
+@property (nonatomic, copy) void (^ _Nullable tapHandler)(ChartPointViewBar * _Nonnull);
+@property (nonatomic, readonly) BOOL isHorizontal;
++ (CGRect)frame:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width SWIFT_WARN_UNUSED_RESULT;
+- (void)updateFrame:(CGPoint)p1 p2:(CGPoint)p2;
+- (void)enableTap;
+- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender;
+- (void)toggleSelection;
 - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
 - (void)didMoveToSuperview;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
@@ -241,15 +313,14 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarGreyOut")
 @interface ChartPointViewBarGreyOut : ChartPointViewBar
 - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
 - (void)didMoveToSuperview;
-- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration SWIFT_UNAVAILABLE;
 @end
 
 
 SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarStacked")
 @interface ChartPointViewBarStacked : ChartPointViewBar
+- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender;
 - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
-- (void)drawRect:(CGRect)rect;
-- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration SWIFT_UNAVAILABLE;
+- (void)didMoveToSuperview;
 @end
 
 
@@ -258,10 +329,10 @@ SWIFT_CLASS("_TtC11SwiftCharts13HandlingLabel")
 @interface HandlingLabel : UILabel
 @property (nonatomic, copy) void (^ _Nullable movedToSuperViewHandler)(void);
 @property (nonatomic, copy) void (^ _Nullable touchHandler)(void);
-- (void)didMoveToSuperview;
-- (void)touchesEnded:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
 - (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
+- (void)didMoveToSuperview;
+- (void)touchesEnded:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
 @end
 
 
@@ -278,10 +349,41 @@ SWIFT_CLASS("_TtC11SwiftCharts12HandlingView")
 
 SWIFT_CLASS("_TtC11SwiftCharts10InfoBubble")
 @interface InfoBubble : UIView
-- (nonnull instancetype)initWithFrame:(CGRect)frame arrowWidth:(CGFloat)arrowWidth arrowHeight:(CGFloat)arrowHeight bgColor:(UIColor * _Nonnull)bgColor arrowX:(CGFloat)arrowX OBJC_DESIGNATED_INITIALIZER;
+@property (nonatomic, readonly) CGFloat arrowWidth;
+@property (nonatomic, readonly) CGFloat arrowHeight;
+@property (nonatomic, readonly, strong) UIColor * _Nonnull bgColor;
+@property (nonatomic, readonly) CGFloat arrowX;
+@property (nonatomic, readonly) CGFloat arrowY;
+@property (nonatomic, readonly) CGFloat minSuperviewPadding;
+@property (nonatomic, readonly) CGFloat space;
+@property (nonatomic, readonly) CGPoint point;
+@property (nonatomic, copy) void (^ _Nullable tapHandler)(void);
+@property (nonatomic, readonly) BOOL inverted;
+@property (nonatomic, readonly) BOOL horizontal;
+- (nonnull instancetype)initWithPoint:(CGPoint)point size:(CGSize)size superview:(UIView * _Nonnull)superview arrowHeight:(CGFloat)arrowHeight contentView:(UIView * _Nonnull)contentView bgColor:(UIColor * _Nonnull)bgColor minSuperviewPadding:(CGFloat)minSuperviewPadding space:(CGFloat)space horizontal:(BOOL)horizontal;
+- (nonnull instancetype)initWithPoint:(CGPoint)point frame:(CGRect)frame arrowWidth:(CGFloat)arrowWidth arrowHeight:(CGFloat)arrowHeight contentView:(UIView * _Nullable)contentView bgColor:(UIColor * _Nonnull)bgColor space:(CGFloat)space minSuperviewPadding:(CGFloat)minSuperviewPadding arrowX:(CGFloat)arrowX arrowY:(CGFloat)arrowY horizontal:(BOOL)horizontal OBJC_DESIGNATED_INITIALIZER;
+- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender;
+- (void)didMoveToSuperview;
+- (BOOL)inverted:(UIView * _Nonnull)superview SWIFT_WARN_UNUSED_RESULT;
 - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER;
 - (void)drawRect:(CGRect)rect;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
+@class UIFont;
+
+@interface InfoBubble (SWIFT_EXTENSION(SwiftCharts))
+- (nonnull instancetype)initWithPoint:(CGPoint)point preferredSize:(CGSize)preferredSize superview:(UIView * _Nonnull)superview arrowHeight:(CGFloat)arrowHeight text:(NSString * _Nonnull)text font:(UIFont * _Nonnull)font textColor:(UIColor * _Nonnull)textColor bgColor:(UIColor * _Nonnull)bgColor minSuperviewPadding:(CGFloat)minSuperviewPadding innerPadding:(CGFloat)innerPadding horizontal:(BOOL)horizontal;
+@end
+
+
+@interface UIBezierPath (SWIFT_EXTENSION(SwiftCharts))
+@end
+
+
+@interface UIColor (SWIFT_EXTENSION(SwiftCharts))
+@property (nonatomic, readonly) CGFloat alpha;
+- (UIColor * _Nonnull)adjustBrigtnessWithFactor:(CGFloat)brightnessFactor SWIFT_WARN_UNUSED_RESULT;
+@end
+
 #pragma clang diagnostic pop
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist
index 2ab94aad2..60493df79 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist and b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc
index c580b7e84..ebbedf7b9 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule
index daa645bbd..d190d3799 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc
index a50188db9..5f36eb4aa 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule
index 4beee1085..bf4d4f350 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc
index 1cec88119..4febb8abe 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule
index d1c50a5c9..62a1c2051 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc
index f15ca11be..e6cafcc6c 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule
index 6be4a0dd2..e336c7c35 100644
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts
index 22acb3dad..ea1088cb5 100755
Binary files a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts and b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h
index 4b03a30ca..fef958b75 100644
--- a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h
+++ b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 3.1 (swiftlang-802.0.48 clang-802.0.38)
+// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
diff --git a/Carthage/Build/iOS/xDripG5.framework/Info.plist b/Carthage/Build/iOS/xDripG5.framework/Info.plist
index eac5008dc..ea1bfbeef 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Info.plist and b/Carthage/Build/iOS/xDripG5.framework/Info.plist differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc
index fd1694a50..c7562aabb 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule
index 23a43953b..efe303038 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc
index cb78bfb87..b49128b2c 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule
index 238d64509..0d56b0997 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc
index 7e9cca5f6..14d49023b 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule
index 6717d08d9..7217fedab 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc
index 752e02c05..33a47626b 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule
index bb1a52edd..b2b599939 100644
Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule differ
diff --git a/Carthage/Build/iOS/xDripG5.framework/xDripG5 b/Carthage/Build/iOS/xDripG5.framework/xDripG5
index ed8b12515..186d5be7f 100755
Binary files a/Carthage/Build/iOS/xDripG5.framework/xDripG5 and b/Carthage/Build/iOS/xDripG5.framework/xDripG5 differ
diff --git a/Common/Extensions/HKUnit.swift b/Common/Extensions/HKUnit.swift
index b11c11a0d..c18d256a0 100644
--- a/Common/Extensions/HKUnit.swift
+++ b/Common/Extensions/HKUnit.swift
@@ -21,17 +21,17 @@ extension HKUnit {
         }
     }
 
-    static func milligramsPerDeciliterUnit() -> HKUnit {
+    static func milligramsPerDeciliter() -> HKUnit {
         return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci))
     }
     
-    static func millimolesPerLiterUnit() -> HKUnit {
+    static func millimolesPerLiter() -> HKUnit {
         return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter())
     }
     
     // A glucose-centric presentation helper for the localized unit string
     var glucoseUnitDisplayString: String {
-        if self == HKUnit.millimolesPerLiterUnit() {
+        if self == HKUnit.millimolesPerLiter() {
             return NSLocalizedString("mmol/L", comment: "The unit display string for millimoles of glucose per liter")
         } else {
             return String(describing: self)
diff --git a/Common/Extensions/NSTimeInterval.swift b/Common/Extensions/NSTimeInterval.swift
index 400a5e01c..d40ded003 100644
--- a/Common/Extensions/NSTimeInterval.swift
+++ b/Common/Extensions/NSTimeInterval.swift
@@ -10,6 +10,14 @@ import Foundation
 
 
 extension TimeInterval {
+    static func minutes(_ minutes: Double) -> TimeInterval {
+        return TimeInterval(minutes: minutes)
+    }
+
+    static func hours(_ hours: Double) -> TimeInterval {
+        return TimeInterval(hours: hours)
+    }
+
     init(minutes: Double) {
         self.init(minutes * 60)
     }
diff --git a/Common/Extensions/NumberFormatter.swift b/Common/Extensions/NumberFormatter.swift
index e7e3cf35a..b3f41c0fc 100644
--- a/Common/Extensions/NumberFormatter.swift
+++ b/Common/Extensions/NumberFormatter.swift
@@ -20,21 +20,26 @@ extension NumberFormatter {
         return numberFormatter
     }
 
-    func describingGlucose(_ value: Double, for unit: HKUnit) -> String? {
-        guard let stringValue = string(from: NSNumber(value: value)) else {
+    func string(from number: Double, unit: String) -> String? {
+        guard let stringValue = string(from: NSNumber(value: number)) else {
             return nil
         }
 
         return String(
-            format: NSLocalizedString("GLUCOSE_VALUE_AND_UNIT",
-                                      value: "%1$@ %2$@",
-                                      comment: "Format string for combining localized glucose value and unit. (1: glucose value)(2: unit)"
+            format: NSLocalizedString(
+                "QUANTITY_VALUE_AND_UNIT",
+                value: "%1$@ %2$@",
+                comment: "Format string for combining localized numeric value and unit. (1: numeric value)(2: unit)"
             ),
             stringValue,
-            unit.glucoseUnitDisplayString
+            unit
         )
     }
 
+    func describingGlucose(_ value: Double, for unit: HKUnit) -> String? {
+        return string(from: value, unit: unit.glucoseUnitDisplayString)
+    }
+
     @nonobjc func describingGlucose(_ value: HKQuantity, for unit: HKUnit) -> String? {
         return describingGlucose(value.doubleValue(for: unit), for: unit)
     }
diff --git a/DoseMathTests/DoseMathTests.swift b/DoseMathTests/DoseMathTests.swift
index 80b62d682..7f77e7179 100644
--- a/DoseMathTests/DoseMathTests.swift
+++ b/DoseMathTests/DoseMathTests.swift
@@ -61,7 +61,7 @@ class RecommendTempBasalTests: XCTestCase {
         return fixture.map {
             return GlucoseFixtureValue(
                 startDate: dateFormatter.date(from: $0["date"] as! String)!,
-                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double)
+                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double)
             )
         }
     }
@@ -81,15 +81,19 @@ class RecommendTempBasalTests: XCTestCase {
     }
 
     var glucoseTargetRange: GlucoseRangeSchedule {
-        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
+        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule {
-        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
+        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
     }
     
     var minimumBGGuard: GlucoseThreshold {
-        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliterUnit(), value: 55)
+        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55)
+    }
+
+    var insulinActionDuration: TimeInterval {
+        return TimeInterval(hours: 4)
     }
 
     func testNoChange() {
@@ -102,7 +106,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertNil(dose)
@@ -118,7 +123,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertNil(dose)
@@ -139,7 +145,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose!.rate)
@@ -156,7 +163,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertNil(dose)
@@ -176,7 +184,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose!.rate)
@@ -202,7 +211,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose!.rate)
@@ -216,7 +226,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertNil(dose)
@@ -236,7 +247,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose!.rate)
@@ -253,7 +265,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose!.rate)
@@ -271,7 +284,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertNil(dose)
@@ -291,7 +305,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose!.rate)
@@ -308,7 +323,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(3.0, dose!.rate)
@@ -325,7 +341,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(1.425, dose!.rate, accuracy: 1.0 / 40.0)
@@ -342,7 +359,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(1.475, dose!.rate, accuracy: 1.0 / 40.0)
@@ -359,14 +377,15 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: self.insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(3.0, dose!.rate)
         XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration)
 
         // Use mmol sensitivity value
-        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])!
+        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])!
 
         dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
             atDate: glucose.first!.startDate,
@@ -375,7 +394,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(2.975, dose!.rate, accuracy: 1.0 / 40.0)
@@ -383,7 +403,7 @@ class RecommendTempBasalTests: XCTestCase {
     }
 
     func testVeryLowAndRising() {
-        let glucose = loadGlucoseValueFixture("recommend_tamp_basal_very_low_end_in_range")
+        let glucose = loadGlucoseValueFixture("recommend_temp_basal_very_low_end_in_range")
 
         let dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
                                                                    atDate: glucose.first!.startDate,
@@ -392,13 +412,31 @@ class RecommendTempBasalTests: XCTestCase {
                                                                    glucoseTargetRange: glucoseTargetRange,
                                                                    insulinSensitivity: self.insulinSensitivitySchedule,
                                                                    basalRateSchedule: basalRateSchedule,
-                                                                   minimumBGGuard: minimumBGGuard
+                                                                   minimumBGGuard: minimumBGGuard,
+                                                                   insulinActionDuration: insulinActionDuration
         )
         
         XCTAssertEqual(0.0, dose!.rate)
         XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration)
     }
 
+    func testRiseAfterDIA() {
+        let glucose = loadGlucoseValueFixture("far_future_high_bg_forecast")
+
+        let dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
+                                                                   atDate: glucose.first!.startDate,
+                                                                   lastTempBasal: nil,
+                                                                   maxBasalRate: maxBasalRate,
+                                                                   glucoseTargetRange: glucoseTargetRange,
+                                                                   insulinSensitivity: self.insulinSensitivitySchedule,
+                                                                   basalRateSchedule: basalRateSchedule,
+                                                                   minimumBGGuard: minimumBGGuard,
+                                                                   insulinActionDuration: insulinActionDuration
+        )
+
+        XCTAssertNil(dose)
+    }
+
 
     func testNoInputGlucose() {
         let dose = DoseMath.recommendTempBasalFromPredictedGlucose([],
@@ -407,7 +445,8 @@ class RecommendTempBasalTests: XCTestCase {
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertNil(dose)
@@ -426,7 +465,7 @@ class RecommendBolusTests: XCTestCase {
         return fixture.map {
             return GlucoseFixtureValue(
                 startDate: dateFormatter.date(from: $0["date"] as! String)!,
-                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double)
+                quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double)
             )
         }
     }
@@ -446,15 +485,19 @@ class RecommendBolusTests: XCTestCase {
     }
 
     var glucoseTargetRange: GlucoseRangeSchedule {
-        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
+        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)!
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule {
-        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
+        return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])!
     }
     
     var minimumBGGuard: GlucoseThreshold {
-        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliterUnit(), value: 55)
+        return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55)
+    }
+
+    var insulinActionDuration: TimeInterval {
+        return TimeInterval(hours: 4)
     }
 
     func testNoChange() {
@@ -467,7 +510,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(0, dose.amount)
@@ -483,7 +527,9 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
+
         )
 
         XCTAssertEqual(0, dose.amount)
@@ -499,7 +545,9 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
+
         )
 
         XCTAssertEqual(0, dose.amount)
@@ -515,7 +563,9 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
+
         )
 
         XCTAssertEqual(0, dose.amount)
@@ -531,19 +581,19 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
+
         )
 
         XCTAssertEqual(1.325, dose.amount)
 
         if case BolusRecommendationNotice.currentGlucoseBelowTarget(let glucose, let units) = dose.notice! {
-            XCTAssertEqual(units, HKUnit.milligramsPerDeciliterUnit())
+            XCTAssertEqual(units, HKUnit.milligramsPerDeciliter())
             XCTAssertEqual(glucose.quantity.doubleValue(for: units), 60)
         } else {
             XCTFail("Expected currentGlucoseBelowTarget, but got \(dose.notice!)")
         }
-
-        //XCTAssertEqual(BolusRecommendationNotice.currentGlucoseBelowTarget(glucose: GlucoseValue(56), unit: HKUnit.milligramsPerDeciliterUnit()), dose.notice!)
     }
 
     func testDroppingBelowRangeThenRising() {
@@ -556,7 +606,8 @@ class RecommendBolusTests: XCTestCase {
                                                                insulinSensitivity: insulinSensitivitySchedule,
                                                                basalRateSchedule: basalRateSchedule,
                                                                pendingInsulin: 0,
-                                                               minimumBGGuard: minimumBGGuard
+                                                               minimumBGGuard: minimumBGGuard,
+                                                               insulinActionDuration: insulinActionDuration
         )
         
         XCTAssertEqual(1.325, dose.amount)
@@ -574,7 +625,8 @@ class RecommendBolusTests: XCTestCase {
                                                                insulinSensitivity: insulinSensitivitySchedule,
                                                                basalRateSchedule: basalRateSchedule,
                                                                pendingInsulin: 1,
-                                                               minimumBGGuard: minimumBGGuard
+                                                               minimumBGGuard: minimumBGGuard,
+                                                               insulinActionDuration: insulinActionDuration
         )
         
         XCTAssertEqual(0.325, dose.amount)
@@ -590,7 +642,8 @@ class RecommendBolusTests: XCTestCase {
                                                                insulinSensitivity: insulinSensitivitySchedule,
                                                                basalRateSchedule: basalRateSchedule,
                                                                pendingInsulin: 0,
-                                                               minimumBGGuard: minimumBGGuard
+                                                               minimumBGGuard: minimumBGGuard,
+                                                               insulinActionDuration: insulinActionDuration
         )
         
         XCTAssertEqual(0, dose.amount)
@@ -606,7 +659,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(1.333, dose.amount, accuracy: 1.0 / 40.0)
@@ -622,7 +676,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(0.067, dose.amount, accuracy: 1.0 / 40.0)
@@ -638,7 +693,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(0.083, dose.amount, accuracy: 1.0 / 40.0)
@@ -652,7 +708,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0.8,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(0, dose.amount, accuracy: 1e-13)
@@ -664,7 +721,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(0.083, dose.amount, accuracy: 1.0 / 40.0)
@@ -680,13 +738,14 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: self.insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqual(1.0, dose.amount)
 
         // Use mmol sensitivity value
-        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])!
+        let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])!
 
         dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
             atDate: glucose.first!.startDate,
@@ -695,12 +754,31 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
         XCTAssertEqualWithAccuracy(1.0, dose.amount, accuracy: 1.0 / 40.0)
     }
 
+    func testRiseAfterDIA() {
+        let glucose = loadGlucoseValueFixture("far_future_high_bg_forecast")
+
+        let dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
+                                                               atDate: glucose.first!.startDate,
+                                                               maxBolus: maxBolus,
+                                                               glucoseTargetRange: glucoseTargetRange,
+                                                               insulinSensitivity: self.insulinSensitivitySchedule,
+                                                               basalRateSchedule: basalRateSchedule,
+                                                               pendingInsulin: 0,
+                                                               minimumBGGuard: minimumBGGuard,
+                                                               insulinActionDuration: insulinActionDuration
+        )
+
+        XCTAssertEqual(0.0, dose.amount)
+    }
+
+
     func testNoInputGlucose() {
         let dose = DoseMath.recommendBolusFromPredictedGlucose([],
             maxBolus: 4,
@@ -708,7 +786,8 @@ class RecommendBolusTests: XCTestCase {
             insulinSensitivity: insulinSensitivitySchedule,
             basalRateSchedule: basalRateSchedule,
             pendingInsulin: 0,
-            minimumBGGuard: minimumBGGuard)
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration)
 
         XCTAssertEqual(0, dose.amount)
     }
diff --git a/DoseMathTests/Fixtures/far_future_high_bg_forecast.json b/DoseMathTests/Fixtures/far_future_high_bg_forecast.json
new file mode 100644
index 000000000..27555e5d8
--- /dev/null
+++ b/DoseMathTests/Fixtures/far_future_high_bg_forecast.json
@@ -0,0 +1,16 @@
+ [
+  {"date": "2015-07-19T16:30:00", "amount": 90},
+  {"date": "2015-07-19T17:00:00", "amount": 90},
+  {"date": "2015-07-19T17:30:00", "amount": 90},
+  {"date": "2015-07-19T18:00:00", "amount": 90},
+  {"date": "2015-07-19T18:30:00", "amount": 95},
+  {"date": "2015-07-19T19:00:00", "amount": 100},
+  {"date": "2015-07-19T19:30:00", "amount": 105},
+  {"date": "2015-07-19T20:00:00", "amount": 110},
+  {"date": "2015-07-19T20:30:00", "amount": 115},
+  {"date": "2015-07-19T21:00:00", "amount": 118},
+  {"date": "2015-07-19T21:30:00", "amount": 120},
+  {"date": "2015-07-19T21:30:00", "amount": 140},
+  {"date": "2015-07-19T21:30:00", "amount": 160},
+  {"date": "2015-07-19T21:30:00", "amount": 180}
+  ]
diff --git a/DoseMathTests/Fixtures/recommend_tamp_basal_very_low_end_in_range.json b/DoseMathTests/Fixtures/recommend_temp_basal_very_low_end_in_range.json
similarity index 100%
rename from DoseMathTests/Fixtures/recommend_tamp_basal_very_low_end_in_range.json
rename to DoseMathTests/Fixtures/recommend_temp_basal_very_low_end_in_range.json
diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist
index 6b123c1cc..f5d44d4a7 100644
--- a/DoseMathTests/Info.plist
+++ b/DoseMathTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist
index 1cda04ec4..4061e3d80 100644
--- a/Loop Status Extension/Info.plist	
+++ b/Loop Status Extension/Info.plist	
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>AppGroupIdentifier</key>
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
index 849a62f9f..5069544e7 100644
--- a/Loop Status Extension/StatusViewController.swift	
+++ b/Loop Status Extension/StatusViewController.swift	
@@ -26,7 +26,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         }
     }
     @IBOutlet weak var subtitleLabel: UILabel!
-    @IBOutlet weak var glucoseChartContentView: ChartContentView!
+    @IBOutlet weak var glucoseChartContentView: LoopUI.ChartContentView!
 
     private lazy var charts: StatusChartsManager = {
         let charts = StatusChartsManager(
@@ -44,14 +44,14 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                 settings.trailing = 8
                 settings.axisTitleLabelsToLabelsSpacing = 0
                 settings.labelsToAxisSpacingX = 6
-                settings.labelsWidthY = 30
+                settings.clipInnerFrame = false
                 return settings
             }()
         )
 
         charts.glucoseDisplayRange = (
-            min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
-            max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 175)
+            min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 100),
+            max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 175)
         )
 
         return charts
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index a9707b250..88f632017 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -75,6 +75,7 @@
 		439BED2A1E76093C00B0AED5 /* CGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED291E76093C00B0AED5 /* CGMManager.swift */; };
 		439BED2C1E760A7A00B0AED5 /* DexCGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED2B1E760A7A00B0AED5 /* DexCGMManager.swift */; };
 		439BED2E1E760BC600B0AED5 /* EnliteCGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED2D1E760BC600B0AED5 /* EnliteCGMManager.swift */; };
+		43A51E211EB6DBDD000736CC /* ChartsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A51E201EB6DBDD000736CC /* ChartsTableViewController.swift */; };
 		43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A567681C94880B00334FAC /* LoopDataManager.swift */; };
 		43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */; };
 		43A943761B926B7B0051FA24 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43A943741B926B7B0051FA24 /* Interface.storyboard */; };
@@ -99,11 +100,14 @@
 		43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C094491CACCC73001F6403 /* NotificationManager.swift */; };
 		43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C246A71D89990F0031F8D1 /* Crypto.framework */; };
 		43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */; };
+		43C513191E864C4E001547C7 /* GlucoseRangeSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */; };
 		43C6407C1DA051850093E25D /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; };
 		43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CA93361CB98079000026B5 /* MinimedKit.framework */; };
 		43CB2B2B1D924D450079823D /* WCSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CB2B2A1D924D450079823D /* WCSession.swift */; };
 		43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDD1CA8B63E003CC1B0 /* Data.swift */; };
 		43CEE6E61E56AFD400CB9116 /* NightscoutUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CEE6E51E56AFD400CB9116 /* NightscoutUploader.swift */; };
+		43D848B01E7DCBE100DADCBC /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848AF1E7DCBE100DADCBC /* Result.swift */; };
+		43D848B21E7DF42500DADCBC /* LoopSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848B11E7DF42500DADCBC /* LoopSettings.swift */; };
 		43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */; };
 		43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0521C93EC8200B3C386 /* DeviceDataManager.swift */; };
 		43DBF0591C93F73800B3C386 /* CarbEntryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */; };
@@ -213,9 +217,10 @@
 		4FF4D1011E18375000846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; };
 		540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */; };
 		C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
+		C10B28461EA9BA5E006EA1FC /* far_future_high_bg_forecast.json in Resources */ = {isa = PBXBuildFile; fileRef = C10B28451EA9BA5E006EA1FC /* far_future_high_bg_forecast.json */; };
 		C11C87DD1E21E53500BB71D3 /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */; };
 		C11C87DE1E21EAAD00BB71D3 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
-		C12F21A71DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */; };
+		C12F21A71DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */; };
 		C13BAD941E8009B000050CB5 /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; };
 		C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; };
 		C178249A1E1999FA00D9D25C /* CaseCountable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824991E1999FA00D9D25C /* CaseCountable.swift */; };
@@ -425,6 +430,7 @@
 		439BED291E76093C00B0AED5 /* CGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGMManager.swift; sourceTree = "<group>"; };
 		439BED2B1E760A7A00B0AED5 /* DexCGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DexCGMManager.swift; sourceTree = "<group>"; };
 		439BED2D1E760BC600B0AED5 /* EnliteCGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnliteCGMManager.swift; sourceTree = "<group>"; };
+		43A51E201EB6DBDD000736CC /* ChartsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartsTableViewController.swift; sourceTree = "<group>"; };
 		43A567681C94880B00334FAC /* LoopDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = LoopDataManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwitchTableViewCell.swift; sourceTree = "<group>"; };
 		43A943721B926B7B0051FA24 /* WatchApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WatchApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -450,12 +456,15 @@
 		43C094491CACCC73001F6403 /* NotificationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
 		43C246A71D89990F0031F8D1 /* Crypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crypto.framework; path = Carthage/Build/iOS/Crypto.framework; sourceTree = "<group>"; };
 		43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ShareGlucose+GlucoseKit.swift"; sourceTree = "<group>"; };
+		43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseRangeSchedule.swift; sourceTree = "<group>"; };
 		43C6407B1DA051850093E25D /* InsulinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InsulinKit.framework; path = Carthage/Build/iOS/InsulinKit.framework; sourceTree = "<group>"; };
 		43CA93361CB98079000026B5 /* MinimedKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MinimedKit.framework; path = Carthage/Build/iOS/MinimedKit.framework; sourceTree = "<group>"; };
 		43CB2B2A1D924D450079823D /* WCSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WCSession.swift; sourceTree = "<group>"; };
 		43CE7CDD1CA8B63E003CC1B0 /* Data.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
 		43CEE6E51E56AFD400CB9116 /* NightscoutUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutUploader.swift; sourceTree = "<group>"; };
 		43D533BB1CFD1DD7009E3085 /* WatchApp Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WatchApp Extension.entitlements"; sourceTree = "<group>"; };
+		43D848AF1E7DCBE100DADCBC /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
+		43D848B11E7DF42500DADCBC /* LoopSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopSettings.swift; sourceTree = "<group>"; };
 		43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = BolusViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		43DBF0521C93EC8200B3C386 /* DeviceDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = DeviceDataManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryTableViewController.swift; sourceTree = "<group>"; };
@@ -534,7 +543,8 @@
 		4FF4D0FF1E18374700846527 /* WatchContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchContext.swift; sourceTree = "<group>"; };
 		540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnliteSensorDisplayable.swift; sourceTree = "<group>"; };
 		C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = "<group>"; };
-		C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_tamp_basal_very_low_end_in_range.json; sourceTree = "<group>"; };
+		C10B28451EA9BA5E006EA1FC /* far_future_high_bg_forecast.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = far_future_high_bg_forecast.json; sourceTree = "<group>"; };
+		C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_very_low_end_in_range.json; sourceTree = "<group>"; };
 		C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MealBolusNightscoutTreatment.swift; sourceTree = "<group>"; };
 		C17824991E1999FA00D9D25C /* CaseCountable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaseCountable.swift; sourceTree = "<group>"; };
 		C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseThreshold.swift; sourceTree = "<group>"; };
@@ -660,9 +670,11 @@
 				C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */,
 				436FACED1D0BA636004E2427 /* InsulinDataSource.swift */,
 				436A0DA41D236A2A00104B24 /* LoopError.swift */,
+				43D848B11E7DF42500DADCBC /* LoopSettings.swift */,
 				430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */,
 				4F526D601DF8D9A900A04910 /* NetBasal.swift */,
 				438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */,
+				43D848AF1E7DCBE100DADCBC /* Result.swift */,
 				43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */,
 				4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
 			);
@@ -803,9 +815,10 @@
 				43E2D8E91D20C0DB004DA55F /* recommend_temp_basal_start_high_end_low.json */,
 				43E2D8EA1D20C0DB004DA55F /* recommend_temp_basal_start_low_end_high.json */,
 				43E2D8EB1D20C0DB004DA55F /* recommend_temp_basal_start_low_end_in_range.json */,
-				C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */,
+				C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */,
 				C17824A21E19EAB600D9D25C /* recommend_temp_basal_start_very_low_end_high.json */,
 				C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */,
+				C10B28451EA9BA5E006EA1FC /* far_future_high_bg_forecast.json */,
 			);
 			path = Fixtures;
 			sourceTree = "<group>";
@@ -821,6 +834,7 @@
 				4F08DE8E1E7BB871006741EA /* CollectionType+Loop.swift */,
 				43CE7CDD1CA8B63E003CC1B0 /* Data.swift */,
 				4302F4E41D4EA75100F0FCAF /* DoseStore.swift */,
+				43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */,
 				C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */,
 				43CEE6E51E56AFD400CB9116 /* NightscoutUploader.swift */,
 				4398973A1CD2FC2000223065 /* NSDateFormatter.swift */,
@@ -841,6 +855,7 @@
 				43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */,
 				4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */,
 				43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */,
+				43A51E201EB6DBDD000736CC /* ChartsTableViewController.swift */,
 				433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */,
 				C178249F1E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift */,
 				4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */,
@@ -1023,22 +1038,22 @@
 		968DCD53F724DE56FFE51920 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				43C6407B1DA051850093E25D /* InsulinKit.framework */,
-				438A95A71D8B9B24009D12E1 /* xDripG5.framework */,
 				434FB6451D68F1CD007B9C70 /* Amplitude.framework */,
 				43F78D481C914197002152D1 /* CarbKit.framework */,
 				43C246A71D89990F0031F8D1 /* Crypto.framework */,
 				4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */,
 				43F78D491C914197002152D1 /* GlucoseKit.framework */,
 				43F5C2C81B929C09003EB13D /* HealthKit.framework */,
+				43C6407B1DA051850093E25D /* InsulinKit.framework */,
 				43F78D4B1C914197002152D1 /* LoopKit.framework */,
 				43CA93361CB98079000026B5 /* MinimedKit.framework */,
 				C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */,
+				4F70C1DD1DE8DCA7006380B7 /* NotificationCenter.framework */,
 				434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */,
 				43523EDA1CC35083001850F1 /* RileyLinkKit.framework */,
 				43B371871CE597D10013C5A6 /* ShareClient.framework */,
 				4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */,
-				4F70C1DD1DE8DCA7006380B7 /* NotificationCenter.framework */,
+				438A95A71D8B9B24009D12E1 /* xDripG5.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1077,7 +1092,7 @@
 				4F70C1E71DE8DCA7006380B7 /* PBXTargetDependency */,
 			);
 			name = Loop;
-			productName = Naterade;
+			productName = Loop;
 			productReference = 43776F8C1B8022E90074EA36 /* Loop.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -1338,12 +1353,13 @@
 				43E2D8EF1D20C0DB004DA55F /* recommend_temp_basal_high_and_falling.json in Resources */,
 				43E2D8ED1D20C0DB004DA55F /* recommend_temp_basal_correct_low_at_min.json in Resources */,
 				43E2D8F01D20C0DB004DA55F /* recommend_temp_basal_high_and_rising.json in Resources */,
-				C12F21A71DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json in Resources */,
+				C12F21A71DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json in Resources */,
 				43E2D8F11D20C0DB004DA55F /* recommend_temp_basal_in_range_and_rising.json in Resources */,
 				43E2D8EE1D20C0DB004DA55F /* recommend_temp_basal_flat_and_high.json in Resources */,
 				C1C6591C1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json in Resources */,
 				43E2D8F31D20C0DB004DA55F /* recommend_temp_basal_start_high_end_in_range.json in Resources */,
 				43E2D8F51D20C0DB004DA55F /* recommend_temp_basal_start_low_end_high.json in Resources */,
+				C10B28461EA9BA5E006EA1FC /* far_future_high_bg_forecast.json in Resources */,
 				43E2D8EC1D20C0DB004DA55F /* read_selected_basal_profile.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1418,6 +1434,7 @@
 				43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */,
 				4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */,
 				430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */,
+				43C513191E864C4E001547C7 /* GlucoseRangeSchedule.swift in Sources */,
 				43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */,
 				437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */,
 				439BED2E1E760BC600B0AED5 /* EnliteCGMManager.swift in Sources */,
@@ -1430,6 +1447,7 @@
 				437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */,
 				43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */,
 				43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */,
+				43D848B01E7DCBE100DADCBC /* Result.swift in Sources */,
 				43E397A31D56B9E40028E321 /* Glucose.swift in Sources */,
 				4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */,
 				43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */,
@@ -1493,8 +1511,10 @@
 				4F70C2101DE8FAC5006380B7 /* StatusExtensionDataManager.swift in Sources */,
 				436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */,
 				439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */,
+				43A51E211EB6DBDD000736CC /* ChartsTableViewController.swift in Sources */,
 				4346D1F61C78501000ABAFE3 /* ChartPoint+Loop.swift in Sources */,
 				438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */,
+				43D848B21E7DF42500DADCBC /* LoopSettings.swift in Sources */,
 				438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */,
 				43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */,
 				432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */,
@@ -1716,7 +1736,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 35;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1774,7 +1794,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 35;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2015,11 +2035,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 35;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 33;
+				DYLIB_CURRENT_VERSION = 35;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = LoopUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -2043,11 +2063,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 35;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 33;
+				DYLIB_CURRENT_VERSION = 35;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = LoopUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/Loop/AppDelegate.swift b/Loop/AppDelegate.swift
index 25bd46728..d35f24387 100644
--- a/Loop/AppDelegate.swift
+++ b/Loop/AppDelegate.swift
@@ -27,7 +27,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
         if  let navVC = window?.rootViewController as? UINavigationController,
             let statusVC = navVC.viewControllers.first as? StatusTableViewController {
-            statusVC.dataManager = deviceManager
+            statusVC.deviceManager = deviceManager
         }
 
         return true
@@ -70,18 +70,14 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 extension AppDelegate: UNUserNotificationCenterDelegate {
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
         switch response.actionIdentifier {
-        case NotificationManager.Action.RetryBolus.rawValue:
-            if  let units = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double,
-                let startDate = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? Date,
+        case NotificationManager.Action.retryBolus.rawValue:
+            if  let units = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.bolusAmount.rawValue] as? Double,
+                let startDate = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.bolusStartDate.rawValue] as? Date,
                 startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5)
             {
                 AnalyticsManager.sharedManager.didRetryBolus()
 
-                deviceManager.enactBolus(units: units) { (error) in
-                    if error != nil {
-                        NotificationManager.sendBolusFailureNotificationForAmount(units, atStartDate: startDate)
-                    }
-
+                deviceManager.enactBolus(units: units, at: startDate) { (_) in
                     completionHandler()
                 }
                 return
diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index b4cbba6f9..41d32bf84 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="74s-IX-WF0">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="74s-IX-WF0">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -20,10 +20,10 @@
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" id="vah-ss-3Ud" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="56" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vah-ss-3Ud" id="D0A-EB-kmz">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moR-fS-DWR">
@@ -51,10 +51,10 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ConfigTableViewCell" textLabel="5TX-kX-nBo" detailTextLabel="m9c-SQ-djE" style="IBUITableViewCellStyleValue1" id="0EG-OG-YuT">
-                                <rect key="frame" x="0.0" y="100" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0EG-OG-YuT" id="af2-sZ-CY0">
-                                    <rect key="frame" x="0.0" y="0.0" width="342" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Pump ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5TX-kX-nBo">
@@ -131,7 +131,7 @@
                                 <rect key="frame" x="0.0" y="28" width="375" height="270"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mQk-9D-0ub" id="B1i-Pw-wSw">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="270"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="269.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FBL-RL-faM" customClass="ChartContentView" customModule="LoopUI">
@@ -176,7 +176,7 @@
                                 <rect key="frame" x="0.0" y="298" width="375" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xc2-a9-ojZ" id="a4h-tq-Rnl">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="63.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIL-Ub-qYp">
@@ -210,7 +210,7 @@
                                 <rect key="frame" x="0.0" y="362" width="375" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="I71-cY-0y7" id="0f9-ja-YFt">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="63.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="252" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zbc-87-wxZ">
@@ -448,7 +448,7 @@
                                         <rect key="frame" x="0.0" y="35" width="375" height="45"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AUz-zE-m0e" id="m9w-O9-Oa0">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="⚠ Glucose Predicted Below Range" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k0g-P7-OVN">
@@ -470,7 +470,7 @@
                                         <rect key="frame" x="0.0" y="80" width="375" height="57"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LZi-Cn-JOA" id="H41-1O-Omj">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="57"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="56.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" fixedFrame="YES" text="Active Insulin: 1.5U" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="viU-7a-kbI">
@@ -498,7 +498,7 @@
                                         <rect key="frame" x="0.0" y="137" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DoN-m5-O7j" id="3OB-7U-Jvb">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Recommended" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywT-OR-NnU">
@@ -543,7 +543,7 @@
                                         <rect key="frame" x="0.0" y="181" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="us0-UE-Wqz" id="2fI-OE-GLU">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Bolus" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oA-6d-ZTL">
@@ -587,7 +587,7 @@
                                         <rect key="frame" x="0.0" y="225" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="efV-tT-gC9" id="nq8-dv-ceA">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ya0-9b-ZAS">
diff --git a/Loop/Extensions/CaseCountable.swift b/Loop/Extensions/CaseCountable.swift
index 1c8c49489..8b6f0eb89 100644
--- a/Loop/Extensions/CaseCountable.swift
+++ b/Loop/Extensions/CaseCountable.swift
@@ -6,11 +6,9 @@
 //  Copyright © 2017 LoopKit Authors. All rights reserved.
 //
 
-import Foundation
+protocol CaseCountable: RawRepresentable {}
 
-public protocol CaseCountable: RawRepresentable {}
-
-public extension CaseCountable where RawValue: Integer {
+extension CaseCountable where RawValue: Integer {
     static var count: Int {
         var i: RawValue = 0
         while let new = Self(rawValue: i) { i = new.rawValue.advanced(by: 1) }
diff --git a/Loop/Extensions/ChartSettings+Loop.swift b/Loop/Extensions/ChartSettings+Loop.swift
index 2020f095d..dda66f32f 100644
--- a/Loop/Extensions/ChartSettings+Loop.swift
+++ b/Loop/Extensions/ChartSettings+Loop.swift
@@ -10,13 +10,13 @@ import SwiftCharts
 
 extension ChartSettings {
     static var `default`: ChartSettings {
-        let settings = ChartSettings()
+        var settings = ChartSettings()
         settings.top = 12
         settings.bottom = 0
         settings.trailing = 8
         settings.axisTitleLabelsToLabelsSpacing = 0
         settings.labelsToAxisSpacingX = 6
-        settings.labelsWidthY = 30
+        settings.clipInnerFrame = false
         return settings
     }
 }
diff --git a/Loop/Extensions/DoseStore.swift b/Loop/Extensions/DoseStore.swift
index 65e01ac83..258d32729 100644
--- a/Loop/Extensions/DoseStore.swift
+++ b/Loop/Extensions/DoseStore.swift
@@ -11,17 +11,18 @@ import MinimedKit
 
 
 // Bridges support for MinimedKit data types
-extension DoseStore {
+extension LoopDataManager {
     /**
      Adds and persists new pump events.
      */
-    func add(_ pumpEvents: [TimestampedHistoryEvent], completionHandler: @escaping (_ error: DoseStore.DoseStoreError?) -> Void) {
+    func addPumpEvents(_ pumpEvents: [TimestampedHistoryEvent], completion: @escaping (_ error: DoseStore.DoseStoreError?) -> Void) {
         var events: [NewPumpEvent] = []
         var lastTempBasalAmount: DoseEntry?
         var title: String
 
         for event in pumpEvents {
             var dose: DoseEntry?
+            var eventType: InsulinKit.PumpEventType?
 
             switch event.pumpEvent {
             case let bolus as BolusNormalPumpEvent:
@@ -53,14 +54,16 @@ extension DoseStore {
                         unit: amount.unit
                     )
                 }
+            case is PrimePumpEvent:
+                eventType = .prime
             default:
                 break
             }
 
             title = String(describing: event.pumpEvent)
-            events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title))
+            events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title, type: eventType))
         }
 
-        addPumpEvents(events, completionHandler: completionHandler)
+        addPumpEvents(events, completion: completion)
     }
 }
diff --git a/Loop/Extensions/GlucoseRangeSchedule.swift b/Loop/Extensions/GlucoseRangeSchedule.swift
new file mode 100644
index 000000000..11a276dba
--- /dev/null
+++ b/Loop/Extensions/GlucoseRangeSchedule.swift
@@ -0,0 +1,19 @@
+//
+//  GlucoseRangeSchedule.swift
+//  Loop
+//
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+import LoopKit
+
+
+extension GlucoseRangeSchedule {
+    var workoutModeEnabled: Bool? {
+        guard let override = temporaryOverride else {
+            return false
+        }
+
+        return override.endDate.timeIntervalSinceNow > 0
+    }
+}
diff --git a/Loop/Extensions/NSUserDefaults.swift b/Loop/Extensions/NSUserDefaults.swift
index dc004524c..8e84f5019 100644
--- a/Loop/Extensions/NSUserDefaults.swift
+++ b/Loop/Extensions/NSUserDefaults.swift
@@ -14,49 +14,45 @@ import HealthKit
 extension UserDefaults {
 
     private enum Key: String {
-        case BasalRateSchedule = "com.loudnate.Naterade.BasalRateSchedule"
+        case basalRateSchedule = "com.loudnate.Naterade.BasalRateSchedule"
+        case batteryChemistry = "com.loopkit.Loop.BatteryChemistry"
         case cgmSettings = "com.loopkit.Loop.cgmSettings"
-        case CarbRatioSchedule = "com.loudnate.Naterade.CarbRatioSchedule"
-        case ConnectedPeripheralIDs = "com.loudnate.Naterade.ConnectedPeripheralIDs"
-        case DosingEnabled = "com.loudnate.Naterade.DosingEnabled"
-        case InsulinActionDuration = "com.loudnate.Naterade.InsulinActionDuration"
-        case InsulinSensitivitySchedule = "com.loudnate.Naterade.InsulinSensitivitySchedule"
-        case GlucoseTargetRangeSchedule = "com.loudnate.Naterade.GlucoseTargetRangeSchedule"
-        case MaximumBasalRatePerHour = "com.loudnate.Naterade.MaximumBasalRatePerHour"
-        case MaximumBolus = "com.loudnate.Naterade.MaximumBolus"
-        case PreferredInsulinDataSource = "com.loudnate.Loop.PreferredInsulinDataSource"
-        case PumpID = "com.loudnate.Naterade.PumpID"
-        case PumpModelNumber = "com.loudnate.Naterade.PumpModelNumber"
-        case PumpRegion = "com.loopkit.Loop.PumpRegion"
-        case PumpTimeZone = "com.loudnate.Naterade.PumpTimeZone"
-        case RetrospectiveCorrectionEnabled = "com.loudnate.Loop.RetrospectiveCorrectionEnabled"
-        case BatteryChemistry = "com.loopkit.Loop.BatteryChemistry"
-        case MinimumBGGuard = "com.loopkit.Loop.MinimumBGGuard"
+        case carbRatioSchedule = "com.loudnate.Naterade.CarbRatioSchedule"
+        case connectedPeripheralIDs = "com.loudnate.Naterade.ConnectedPeripheralIDs"
+        case loopSettings = "com.loopkit.Loop.loopSettings"
+        case insulinActionDuration = "com.loudnate.Naterade.InsulinActionDuration"
+        case insulinCounteractionEffects = "com.loopkit.Loop.insulinCounteractionEffects"
+        case insulinSensitivitySchedule = "com.loudnate.Naterade.InsulinSensitivitySchedule"
+        case preferredInsulinDataSource = "com.loudnate.Loop.PreferredInsulinDataSource"
+        case pumpID = "com.loudnate.Naterade.PumpID"
+        case pumpModelNumber = "com.loudnate.Naterade.PumpModelNumber"
+        case pumpRegion = "com.loopkit.Loop.PumpRegion"
+        case pumpTimeZone = "com.loudnate.Naterade.PumpTimeZone"
     }
 
     var basalRateSchedule: BasalRateSchedule? {
         get {
-            if let rawValue = dictionary(forKey: Key.BasalRateSchedule.rawValue) {
+            if let rawValue = dictionary(forKey: Key.basalRateSchedule.rawValue) {
                 return BasalRateSchedule(rawValue: rawValue)
             } else {
                 return nil
             }
         }
         set {
-            set(newValue?.rawValue, forKey: Key.BasalRateSchedule.rawValue)
+            set(newValue?.rawValue, forKey: Key.basalRateSchedule.rawValue)
         }
     }
 
     var carbRatioSchedule: CarbRatioSchedule? {
         get {
-            if let rawValue = dictionary(forKey: Key.CarbRatioSchedule.rawValue) {
+            if let rawValue = dictionary(forKey: Key.carbRatioSchedule.rawValue) {
                 return CarbRatioSchedule(rawValue: rawValue)
             } else {
                 return nil
             }
         }
         set {
-            set(newValue?.rawValue, forKey: Key.CarbRatioSchedule.rawValue)
+            set(newValue?.rawValue, forKey: Key.carbRatioSchedule.rawValue)
         }
     }
 
@@ -98,183 +94,166 @@ extension UserDefaults {
 
     var connectedPeripheralIDs: [String] {
         get {
-            return array(forKey: Key.ConnectedPeripheralIDs.rawValue) as? [String] ?? []
+            return array(forKey: Key.connectedPeripheralIDs.rawValue) as? [String] ?? []
         }
         set {
-            set(newValue, forKey: Key.ConnectedPeripheralIDs.rawValue)
+            set(newValue, forKey: Key.connectedPeripheralIDs.rawValue)
         }
     }
 
-    var dosingEnabled: Bool {
+    var loopSettings: LoopSettings? {
         get {
-            return bool(forKey: Key.DosingEnabled.rawValue)
+            if let rawValue = dictionary(forKey: Key.loopSettings.rawValue) {
+                return LoopSettings(rawValue: rawValue)
+            } else {
+                // Migrate the version 0 case
+                defer {
+                    removeObject(forKey: "com.loudnate.Naterade.DosingEnabled")
+                    removeObject(forKey: "com.loudnate.Naterade.GlucoseTargetRangeSchedule")
+                    removeObject(forKey:  "com.loudnate.Naterade.MaximumBasalRatePerHour")
+                    removeObject(forKey: "com.loudnate.Naterade.MaximumBolus")
+                    removeObject(forKey: "com.loopkit.Loop.MinimumBGGuard")
+                    removeObject(forKey: "com.loudnate.Loop.RetrospectiveCorrectionEnabled")
+                }
+
+                let glucoseTargetRangeSchedule: GlucoseRangeSchedule?
+                if let rawValue = dictionary(forKey: "com.loudnate.Naterade.GlucoseTargetRangeSchedule") {
+                    glucoseTargetRangeSchedule = GlucoseRangeSchedule(rawValue: rawValue)
+                } else {
+                    glucoseTargetRangeSchedule = nil
+                }
+
+                let minimumBGGuard: GlucoseThreshold?
+                if let rawValue = dictionary(forKey: "com.loopkit.Loop.MinimumBGGuard") {
+                    minimumBGGuard = GlucoseThreshold(rawValue: rawValue)
+                } else {
+                    minimumBGGuard = nil
+                }
+
+                var maximumBasalRatePerHour: Double? = double(forKey: "com.loudnate.Naterade.MaximumBasalRatePerHour")
+                if maximumBasalRatePerHour! <= 0 {
+                    maximumBasalRatePerHour = nil
+                }
+
+                var maximumBolus: Double? = double(forKey: "com.loudnate.Naterade.MaximumBolus")
+                if maximumBolus! <= 0 {
+                    maximumBolus = nil
+                }
+
+                let settings = LoopSettings(
+                    dosingEnabled: bool(forKey: "com.loudnate.Naterade.DosingEnabled"),
+                    glucoseTargetRangeSchedule: glucoseTargetRangeSchedule,
+                    maximumBasalRatePerHour: maximumBasalRatePerHour,
+                    maximumBolus: maximumBolus,
+                    minimumBGGuard: minimumBGGuard,
+                    retrospectiveCorrectionEnabled: bool(forKey: "com.loudnate.Loop.RetrospectiveCorrectionEnabled")
+                )
+                self.loopSettings = settings
+
+                return settings
+            }
         }
         set {
-            set(newValue, forKey: Key.DosingEnabled.rawValue)
+            set(newValue?.rawValue, forKey: Key.loopSettings.rawValue)
         }
     }
 
     var insulinActionDuration: TimeInterval? {
         get {
-            let value = double(forKey: Key.InsulinActionDuration.rawValue)
+            let value = double(forKey: Key.insulinActionDuration.rawValue)
 
             return value > 0 ? value : nil
         }
         set {
             if let insulinActionDuration = newValue {
-                set(insulinActionDuration, forKey: Key.InsulinActionDuration.rawValue)
+                set(insulinActionDuration, forKey: Key.insulinActionDuration.rawValue)
             } else {
-                removeObject(forKey: Key.InsulinActionDuration.rawValue)
+                removeObject(forKey: Key.insulinActionDuration.rawValue)
             }
         }
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule? {
         get {
-            if let rawValue = dictionary(forKey: Key.InsulinSensitivitySchedule.rawValue) {
+            if let rawValue = dictionary(forKey: Key.insulinSensitivitySchedule.rawValue) {
                 return InsulinSensitivitySchedule(rawValue: rawValue)
             } else {
                 return nil
             }
         }
         set {
-            set(newValue?.rawValue, forKey: Key.InsulinSensitivitySchedule.rawValue)
-        }
-    }
-
-    var glucoseTargetRangeSchedule: GlucoseRangeSchedule? {
-        get {
-            if let rawValue = dictionary(forKey: Key.GlucoseTargetRangeSchedule.rawValue) {
-                return GlucoseRangeSchedule(rawValue: rawValue)
-            } else {
-                return nil
-            }
-        }
-        set {
-            set(newValue?.rawValue, forKey: Key.GlucoseTargetRangeSchedule.rawValue)
-        }
-    }
-
-    var maximumBasalRatePerHour: Double? {
-        get {
-            let value = double(forKey: Key.MaximumBasalRatePerHour.rawValue)
-
-            return value > 0 ? value : nil
-        }
-        set {
-            if let maximumBasalRatePerHour = newValue {
-                set(maximumBasalRatePerHour, forKey: Key.MaximumBasalRatePerHour.rawValue)
-            } else {
-                removeObject(forKey: Key.MaximumBasalRatePerHour.rawValue)
-            }
-        }
-    }
-
-    var maximumBolus: Double? {
-        get {
-            let value = double(forKey: Key.MaximumBolus.rawValue)
-
-            return value > 0 ? value : nil
-        }
-        set {
-            if let maximumBolus = newValue {
-                set(maximumBolus, forKey: Key.MaximumBolus.rawValue)
-            } else {
-                removeObject(forKey: Key.MaximumBolus.rawValue)
-            }
+            set(newValue?.rawValue, forKey: Key.insulinSensitivitySchedule.rawValue)
         }
     }
 
     var preferredInsulinDataSource: InsulinDataSource? {
         get {
-            return InsulinDataSource(rawValue: integer(forKey: Key.PreferredInsulinDataSource.rawValue))
+            return InsulinDataSource(rawValue: integer(forKey: Key.preferredInsulinDataSource.rawValue))
         }
         set {
             if let preferredInsulinDataSource = newValue {
-                set(preferredInsulinDataSource.rawValue, forKey: Key.PreferredInsulinDataSource.rawValue)
+                set(preferredInsulinDataSource.rawValue, forKey: Key.preferredInsulinDataSource.rawValue)
             } else {
-                removeObject(forKey: Key.PreferredInsulinDataSource.rawValue)
+                removeObject(forKey: Key.preferredInsulinDataSource.rawValue)
             }
         }
     }
 
     var pumpID: String? {
         get {
-            return string(forKey: Key.PumpID.rawValue)
+            return string(forKey: Key.pumpID.rawValue)
         }
         set {
-            set(newValue, forKey: Key.PumpID.rawValue)
+            set(newValue, forKey: Key.pumpID.rawValue)
         }
     }
 
     var pumpModelNumber: String? {
         get {
-            return string(forKey: Key.PumpModelNumber.rawValue)
+            return string(forKey: Key.pumpModelNumber.rawValue)
         }
         set {
-            set(newValue, forKey: Key.PumpModelNumber.rawValue)
+            set(newValue, forKey: Key.pumpModelNumber.rawValue)
         }
     }
 
     var pumpRegion: PumpRegion? {
         get {
             // Defaults to 0 / northAmerica
-            return PumpRegion(rawValue: integer(forKey: Key.PumpRegion.rawValue))
+            return PumpRegion(rawValue: integer(forKey: Key.pumpRegion.rawValue))
         }
         set {
-            set(newValue?.rawValue, forKey: Key.PumpRegion.rawValue)
+            set(newValue?.rawValue, forKey: Key.pumpRegion.rawValue)
         }
     }
 
     var pumpTimeZone: TimeZone? {
         get {
-            if let offset = object(forKey: Key.PumpTimeZone.rawValue) as? NSNumber {
+            if let offset = object(forKey: Key.pumpTimeZone.rawValue) as? NSNumber {
                 return TimeZone(secondsFromGMT: offset.intValue)
             } else {
                 return nil
             }
         } set {
             if let value = newValue {
-                set(NSNumber(value: value.secondsFromGMT() as Int), forKey: Key.PumpTimeZone.rawValue)
+                set(NSNumber(value: value.secondsFromGMT() as Int), forKey: Key.pumpTimeZone.rawValue)
             } else {
-                removeObject(forKey: Key.PumpTimeZone.rawValue)
+                removeObject(forKey: Key.pumpTimeZone.rawValue)
             }
         }
     }
 
-    var retrospectiveCorrectionEnabled: Bool {
-        get {
-            return bool(forKey: Key.RetrospectiveCorrectionEnabled.rawValue)
-        }
-        set {
-            set(newValue, forKey: Key.RetrospectiveCorrectionEnabled.rawValue)
-        }
-    }
-
     var batteryChemistry: BatteryChemistryType? {
         get {
-            return BatteryChemistryType(rawValue: integer(forKey: Key.BatteryChemistry.rawValue))
+            return BatteryChemistryType(rawValue: integer(forKey: Key.batteryChemistry.rawValue))
         }
         set {
             if let batteryChemistry = newValue {
-                set(batteryChemistry.rawValue, forKey: Key.BatteryChemistry.rawValue)
-            } else {
-                removeObject(forKey: Key.BatteryChemistry.rawValue)
-            }
-        }
-    }
-    
-    var minimumBGGuard: GlucoseThreshold? {
-        get {
-            if let rawValue = dictionary(forKey: Key.MinimumBGGuard.rawValue) {
-                return GlucoseThreshold(rawValue: rawValue)
+                set(batteryChemistry.rawValue, forKey: Key.batteryChemistry.rawValue)
             } else {
-                return nil
+                removeObject(forKey: Key.batteryChemistry.rawValue)
             }
         }
-        set {
-            set(newValue?.rawValue, forKey: Key.MinimumBGGuard.rawValue)
-        }
     }
 
 }
diff --git a/Loop/Info.plist b/Loop/Info.plist
index 127e1b859..56cdbe698 100644
--- a/Loop/Info.plist
+++ b/Loop/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Loop/Managers/AnalyticsManager.swift b/Loop/Managers/AnalyticsManager.swift
index 046e64a10..5f48b269d 100644
--- a/Loop/Managers/AnalyticsManager.swift
+++ b/Loop/Managers/AnalyticsManager.swift
@@ -99,22 +99,26 @@ final class AnalyticsManager {
         logEvent("Glucose target range change")
     }
 
-    func didChangeMaximumBasalRate() {
-        logEvent("Maximum basal rate change")
-    }
+    func didChangeLoopSettings(from oldValue: LoopSettings, to newValue: LoopSettings) {
+        logEvent("Loop settings change")
 
-    func didChangeMaximumBolus() {
-        logEvent("Maximum bolus change")
-    }
-    
-    func didChangeMinimumBGGuard() {
-        logEvent("Minimum BG Guard change")
+        if newValue.maximumBasalRatePerHour != oldValue.maximumBasalRatePerHour {
+            logEvent("Maximum basal rate change")
+        }
+
+        if newValue.maximumBolus != oldValue.maximumBolus {
+            logEvent("Maximum bolus change")
+        }
+
+        if newValue.minimumBGGuard != oldValue.minimumBGGuard {
+            logEvent("Minimum BG Guard change")
+        }
     }
 
     // MARK: - Loop Events
 
     func didAddCarbsFromWatch(_ carbs: Double) {
-        logEvent("Carb entry created", withProperties: ["source" : "Watch", "value": carbs], outOfSession: true)
+        logEvent("Carb entry created", withProperties: ["source" : "Watch"], outOfSession: true)
     }
 
     func didRetryBolus() {
@@ -122,7 +126,7 @@ final class AnalyticsManager {
     }
 
     func didSetBolusFromWatch(_ units: Double) {
-        logEvent("Bolus set", withProperties: ["source" : "Watch", "value": units], outOfSession: true)
+        logEvent("Bolus set", withProperties: ["source" : "Watch"], outOfSession: true)
     }
 
     func loopDidSucceed() {
diff --git a/Loop/Managers/CGM/EnliteCGMManager.swift b/Loop/Managers/CGM/EnliteCGMManager.swift
index 6a3dd24c6..76371f2ce 100644
--- a/Loop/Managers/CGM/EnliteCGMManager.swift
+++ b/Loop/Managers/CGM/EnliteCGMManager.swift
@@ -39,7 +39,7 @@ final class EnliteCGMManager: CGMManager {
                     self.sensorState = EnliteSensorDisplayable(latestSensorEvent)
                 }
 
-                let unit = HKUnit.milligramsPerDeciliterUnit()
+                let unit = HKUnit.milligramsPerDeciliter()
                 let glucoseValues = events
                     // TODO: Is the { $0.date > latestGlucoseDate } filter duplicative?
                     .filter({ $0.glucoseEvent is SensorValueGlucoseEvent && $0.date > latestGlucoseDate })
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index 06565eb87..a18e681e6 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -19,7 +19,7 @@ import NightscoutUploadKit
 import RileyLinkKit
 
 
-final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
+final class DeviceDataManager {
 
     // MARK: - Utilities
 
@@ -167,7 +167,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
             pumpStatus = NightscoutUploadKit.PumpStatus(clock: pumpDate, pumpID: pumpID, iob: iobStatus, battery: batteryStatus, reservoir: status.reservoirRemainingUnits)
         } else {
             pumpStatus = nil
-            self.logger.addError("Could not interpret pump clock: \(pumpDateComponents)", fromSource: "RileyLink")
+            logger.addError("Could not interpret pump clock: \(pumpDateComponents)", fromSource: "RileyLink")
         }
 
         // Trigger device status upload, even if something is wrong with pumpStatus
@@ -177,27 +177,18 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
         case .active(glucose: let glucose):
             // Enlite data is included
             if let date = glucoseDateComponents?.date {
-                glucoseStore?.addGlucose(
-                    HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose)),
+                loopManager.addGlucose([(
+                    quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: Double(glucose)),
                     date: date,
-                    isDisplayOnly: false,
-                    device: nil
-                ) { (success, _, _) in
-                    if success {
-                        NotificationCenter.default.post(name: .GlucoseUpdated, object: self)
-                    }
-                }
+                    isDisplayOnly: false
+                )], from: nil)
             }
         case .off:
             // Enlite is disabled, so assert glucose from another source
             cgmManager?.fetchNewDataIfNeeded(with: self) { (result) in
                 switch result {
                 case .newData(let values):
-                    self.glucoseStore?.addGlucoseValues(values, device: self.cgmManager?.device) { (success, _, _) in
-                        if success {
-                            NotificationCenter.default.post(name: .GlucoseUpdated, object: self)
-                        }
-                    }
+                    self.loopManager.addGlucose(values, from: self.cgmManager?.device)
                 case .noData, .error:
                     break
                 }
@@ -223,73 +214,72 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
      - parameter timeLeft: The approximate time before the reservoir is empty
      */
     private func updateReservoirVolume(_ units: Double, at date: Date, withTimeLeft timeLeft: TimeInterval?) {
-        doseStore.addReservoirValue(units, atDate: date) { (newValue, previousValue, areStoredValuesContinuous, error) -> Void in
-            if let error = error {
+        loopManager.addReservoirValue(units, at: date) { (result) in
+            switch result {
+            case .failure(let error):
                 self.logger.addError(error, fromSource: "DoseStore")
-                return
-            }
-
-            if self.preferredInsulinDataSource == .pumpHistory || !areStoredValuesContinuous {
-                self.fetchPumpHistory { (error) in
-                    // Notify and trigger a loop as long as we have fresh, reliable pump data.
-                    if error == nil || areStoredValuesContinuous {
-                        NotificationCenter.default.post(name: .PumpStatusUpdated, object: self)
+            case .success(let (newValue, lastValue, areStoredValuesContinuous)):
+                // Run a loop as long as we have fresh, reliable pump data.
+                if self.preferredInsulinDataSource == .pumpHistory || !areStoredValuesContinuous {
+                    self.fetchPumpHistory { (error) in
+                        if error == nil || areStoredValuesContinuous {
+                            self.loopManager.loop()
+                        }
                     }
+                } else {
+                    self.loopManager.loop()
                 }
-            } else {
-                NotificationCenter.default.post(name: .PumpStatusUpdated, object: self)
-            }
 
-            // Send notifications for low reservoir if necessary
-            if let newVolume = newValue?.unitVolume, let previousVolume = previousValue?.unitVolume {
-                guard newVolume > 0 else {
-                    NotificationManager.sendPumpReservoirEmptyNotification()
-                    return
-                }
+                // Send notifications for low reservoir if necessary
+                if let previousVolume = lastValue?.unitVolume {
+                    guard newValue.unitVolume > 0 else {
+                        NotificationManager.sendPumpReservoirEmptyNotification()
+                        return
+                    }
 
-                let warningThresholds: [Double] = [10, 20, 30]
+                    let warningThresholds: [Double] = [10, 20, 30]
 
-                for threshold in warningThresholds {
-                    if newVolume <= threshold && previousVolume > threshold {
-                        NotificationManager.sendPumpReservoirLowNotificationForAmount(newVolume, andTimeRemaining: timeLeft)
+                    for threshold in warningThresholds {
+                        if newValue.unitVolume <= threshold && previousVolume > threshold {
+                            NotificationManager.sendPumpReservoirLowNotificationForAmount(newValue.unitVolume, andTimeRemaining: timeLeft)
+                        }
                     }
-                }
 
-                if newVolume > previousVolume + 1 {
-                    AnalyticsManager.sharedManager.reservoirWasRewound()
+                    if newValue.unitVolume > previousVolume + 1 {
+                        AnalyticsManager.sharedManager.reservoirWasRewound()
+                    }
                 }
             }
         }
     }
 
-    /**
-     Polls the pump for new history events and stores them.
-     
-     - parameter completion: A closure called after the fetch is complete. This closure takes a single argument:
-        - error: An error describing why the fetch and/or store failed
-     */
-    private func fetchPumpHistory(_ completionHandler: @escaping (_ error: Error?) -> Void) {
+    /// Polls the pump for new history events and passes them to the loop manager
+    ///
+    /// - Parameters:
+    ///   - completion: A closure called once upon completion
+    ///   - error: An error describing why the fetch and/or store failed
+    private func fetchPumpHistory(_ completion: @escaping (_ error: Error?) -> Void) {
         guard let device = rileyLinkManager.firstConnectedDevice else {
             return
         }
 
-        let startDate = doseStore.pumpEventQueryAfterDate
+        let startDate = loopManager.doseStore.pumpEventQueryAfterDate
 
         device.ops?.getHistoryEvents(since: startDate) { (result) in
             switch result {
             case let .success(events, _):
-                self.doseStore.add(events) { (error) in
+                self.loopManager.addPumpEvents(events) { (error) in
                     if let error = error {
                         self.logger.addError("Failed to store history: \(error)", fromSource: "DoseStore")
                     }
 
-                    completionHandler(error)
+                    completion(error)
                 }
             case .failure(let error):
                 self.rileyLinkManager.deprioritizeDevice(device: device)
                 self.logger.addError("Failed to fetch history: \(error)", fromSource: "RileyLink")
 
-                completionHandler(error)
+                completion(error)
             }
         }
     }
@@ -331,8 +321,8 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
         // How long should we wait before we poll for new pump data?
         let pumpStatusAgeTolerance = rileyLinkManager.idleListeningEnabled ? TimeInterval(minutes: 11) : TimeInterval(minutes: 4)
 
-        return doseStore.lastReservoirValue == nil
-            || doseStore.lastReservoirValue!.startDate.timeIntervalSinceNow <= -pumpStatusAgeTolerance
+        return loopManager.doseStore.lastReservoirValue == nil
+            || loopManager.doseStore.lastReservoirValue!.startDate.timeIntervalSinceNow <= -pumpStatusAgeTolerance
     }
 
     /**
@@ -356,7 +346,6 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
                 self.updateReservoirVolume(status.reservoir, at: date, withTimeLeft: nil)
                 let battery = BatteryStatus(voltage: status.batteryVolts, status: BatteryIndicator(batteryStatus: status.batteryStatus))
 
-
                 nsPumpStatus = NightscoutUploadKit.PumpStatus(clock: date, pumpID: status.pumpID, iob: nil, battery: battery, suspended: status.suspended, bolusing: status.bolusing, reservoir: status.reservoir)
             case .failure(let error):
                 self.troubleshootPumpComms(using: device)
@@ -372,19 +361,27 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
     /// - parameter units:      The number of units to deliver
     /// - parameter completion: A clsure called after the command is complete. This closure takes a single argument:
     ///     - error: An error describing why the command failed
-    func enactBolus(units: Double, completion: @escaping (_ error: Error?) -> Void) {
+    func enactBolus(units: Double, at startDate: Date = Date(), completion: @escaping (_ error: Error?) -> Void) {
+        let notify = { (error: Error?) -> Void in
+            if let error = error {
+                NotificationManager.sendBolusFailureNotification(for: error, units: units, at: startDate)
+            }
+
+            completion(error)
+        }
+
         guard units > 0 else {
-            completion(nil)
+            notify(nil)
             return
         }
 
         guard let device = rileyLinkManager.firstConnectedDevice else {
-            completion(LoopError.connectionError)
+            notify(LoopError.connectionError)
             return
         }
 
         guard let ops = device.ops else {
-            completion(LoopError.configurationError("PumpOps"))
+            notify(LoopError.configurationError("PumpOps"))
             return
         }
 
@@ -392,32 +389,38 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
             ops.setNormalBolus(units: units) { (error) in
                 if let error = error {
                     self.logger.addError(error, fromSource: "Bolus")
-                    completion(LoopError.communicationError)
+                    notify(error)
                 } else {
-                    self.loopManager.recordBolus(units, at: Date())
-                    completion(nil)
+                    self.loopManager.addExpectedBolus(units, at: Date())
+                    notify(nil)
                 }
             }
         }
 
         // If we don't have recent pump data, or the pump was recently rewound, read new pump data before bolusing.
-        if  doseStore.lastReservoirValue == nil ||
-            doseStore.lastReservoirVolumeDrop < 0 ||
-            doseStore.lastReservoirValue!.startDate.timeIntervalSinceNow <= TimeInterval(minutes: -6)
+        if  loopManager.doseStore.lastReservoirValue == nil ||
+            loopManager.doseStore.lastReservoirVolumeDrop < 0 ||
+            loopManager.doseStore.lastReservoirValue!.startDate.timeIntervalSinceNow <= TimeInterval(minutes: -6)
         {
             readPumpData { (result) in
                 switch result {
                 case .success(let (status, date)):
-                    self.doseStore.addReservoirValue(status.reservoir, atDate: date) { (newValue, _, _, error) in
-                        if let error = error {
+                    self.loopManager.addReservoirValue(status.reservoir, at: date) { (result) in
+                        switch result {
+                        case .failure(let error):
                             self.logger.addError(error, fromSource: "Bolus")
-                            completion(error)
-                        } else {
+                            notify(error)
+                        case .success:
                             setBolus()
                         }
                     }
                 case .failure(let error):
-                    completion(error)
+                    switch error {
+                    case let error as PumpCommsError:
+                        notify(SetBolusError.certain(error))
+                    default:
+                        notify(error)
+                    }
                 }
             }
         } else {
@@ -513,7 +516,8 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
             }
 
             remoteDataManager.nightscoutService.uploader?.reset()
-            doseStore.pumpID = pumpID
+
+            loopManager.doseStore.resetPumpData()
 
             UserDefaults.standard.pumpID = pumpID
         }
@@ -539,21 +543,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
             UserDefaults.standard.pumpTimeZone = pumpState?.timeZone
 
             if let pumpTimeZone = pumpState?.timeZone {
-                if let basalRateSchedule = basalRateSchedule {
-                    self.basalRateSchedule = BasalRateSchedule(dailyItems: basalRateSchedule.items, timeZone: pumpTimeZone)
-                }
-
-                if let carbRatioSchedule = carbRatioSchedule {
-                    self.carbRatioSchedule = CarbRatioSchedule(unit: carbRatioSchedule.unit, dailyItems: carbRatioSchedule.items, timeZone: pumpTimeZone)
-                }
-
-                if let insulinSensitivitySchedule = insulinSensitivitySchedule {
-                    self.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: insulinSensitivitySchedule.unit, dailyItems: insulinSensitivitySchedule.items, timeZone: pumpTimeZone)
-                }
-
-                if let glucoseTargetRangeSchedule = glucoseTargetRangeSchedule {
-                    self.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: glucoseTargetRangeSchedule.unit, dailyItems: glucoseTargetRangeSchedule.items, workoutRange: glucoseTargetRangeSchedule.workoutRange, timeZone: pumpTimeZone)
-                }
+                loopManager.setScheduleTimeZone(pumpTimeZone)
             }
         case "pumpModel"?:
             if let sentrySupported = pumpState?.pumpModel?.hasMySentry, !sentrySupported {
@@ -584,160 +574,12 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
         }
     }
 
-    // MARK: Loop model inputs
-
-    var basalRateSchedule: BasalRateSchedule? = UserDefaults.standard.basalRateSchedule {
-        didSet {
-            doseStore.basalProfile = basalRateSchedule
-
-            UserDefaults.standard.basalRateSchedule = basalRateSchedule
-
-            AnalyticsManager.sharedManager.didChangeBasalRateSchedule()
-        }
-    }
-
-    var carbRatioSchedule: CarbRatioSchedule? = UserDefaults.standard.carbRatioSchedule {
-        didSet {
-            carbStore?.carbRatioSchedule = carbRatioSchedule
-
-            UserDefaults.standard.carbRatioSchedule = carbRatioSchedule
-
-            AnalyticsManager.sharedManager.didChangeCarbRatioSchedule()
-        }
-    }
-
-    var insulinActionDuration: TimeInterval? = UserDefaults.standard.insulinActionDuration {
-        didSet {
-            doseStore.insulinActionDuration = insulinActionDuration
-
-            UserDefaults.standard.insulinActionDuration = insulinActionDuration
-
-            if oldValue != insulinActionDuration {
-                AnalyticsManager.sharedManager.didChangeInsulinActionDuration()
-            }
-        }
-    }
-
-    var insulinSensitivitySchedule: InsulinSensitivitySchedule? = UserDefaults.standard.insulinSensitivitySchedule {
-        didSet {
-            carbStore?.insulinSensitivitySchedule = insulinSensitivitySchedule
-            doseStore.insulinSensitivitySchedule = insulinSensitivitySchedule
-
-            UserDefaults.standard.insulinSensitivitySchedule = insulinSensitivitySchedule
-
-            AnalyticsManager.sharedManager.didChangeInsulinSensitivitySchedule()
-        }
-    }
-
-    var glucoseTargetRangeSchedule: GlucoseRangeSchedule? = UserDefaults.standard.glucoseTargetRangeSchedule {
-        didSet {
-            UserDefaults.standard.glucoseTargetRangeSchedule = glucoseTargetRangeSchedule
-
-            NotificationCenter.default.post(name: .LoopSettingsUpdated, object: self)
-
-            AnalyticsManager.sharedManager.didChangeGlucoseTargetRangeSchedule()
-        }
-    }
-    
-    var minimumBGGuard: GlucoseThreshold? = UserDefaults.standard.minimumBGGuard {
-        didSet {
-            UserDefaults.standard.minimumBGGuard = minimumBGGuard
-            AnalyticsManager.sharedManager.didChangeMinimumBGGuard()
-        }
-    }
-
-    var workoutModeEnabled: Bool? {
-        guard let range = glucoseTargetRangeSchedule else {
-            return nil
-        }
-
-        guard let override = range.temporaryOverride else {
-            return false
-        }
-
-        return override.endDate.timeIntervalSinceNow > 0
-    }
-
-    /// Attempts to enable workout glucose targets until the given date, and returns true if successful.
-    /// TODO: This can live on the schedule itself once its a value type, since didSet would invoke when mutated.
-    @discardableResult
-    func enableWorkoutMode(until endDate: Date) -> Bool {
-        guard let glucoseTargetRangeSchedule = glucoseTargetRangeSchedule else {
-            return false
-        }
-
-        _ = glucoseTargetRangeSchedule.setWorkoutOverride(until: endDate)
-
-        NotificationCenter.default.post(name: .LoopSettingsUpdated, object: self)
-
-        return true
-    }
-
-    func disableWorkoutMode() {
-        glucoseTargetRangeSchedule?.clearOverride()
-
-        NotificationCenter.default.post(name: .LoopSettingsUpdated, object: self)
-    }
-
-    var maximumBasalRatePerHour: Double? = UserDefaults.standard.maximumBasalRatePerHour {
-        didSet {
-            UserDefaults.standard.maximumBasalRatePerHour = maximumBasalRatePerHour
-
-            AnalyticsManager.sharedManager.didChangeMaximumBasalRate()
-        }
-    }
-
-    var maximumBolus: Double? = UserDefaults.standard.maximumBolus {
-        didSet {
-            UserDefaults.standard.maximumBolus = maximumBolus
-
-            AnalyticsManager.sharedManager.didChangeMaximumBolus()
-        }
-    }
-
-    // MARK: - CarbKit
-
-    let carbStore: CarbStore?
-
-    // MARK: CarbStoreDelegate
-
-    func carbStore(_: CarbStore, didError error: CarbStore.CarbStoreError) {
-        logger.addError(error, fromSource: "CarbStore")
-    }
-
-    // MARK: - GlucoseKit
-
-    let glucoseStore = GlucoseStore()
-
-    // MARK: - InsulinKit
-
-    let doseStore: DoseStore
-
-    // MARK: DoseStoreDelegate
-
-    func doseStore(_ doseStore: DoseStore, hasEventsNeedingUpload pumpEvents: [PersistedPumpEvent], fromPumpID pumpID: String, withCompletion completionHandler: @escaping (_ uploadedObjects: [NSManagedObjectID]) -> Void) {
-        guard let uploader = remoteDataManager.nightscoutService.uploader, let pumpModel = pumpState?.pumpModel else {
-            completionHandler(pumpEvents.map({ $0.objectID }))
-            return
-        }
-
-        uploader.upload(pumpEvents, from: pumpModel) { (result) in
-            switch result {
-            case .success(let objects):
-                completionHandler(objects)
-            case .failure(let error):
-                self.logger.addError(error, fromSource: "NightscoutUploadKit")
-                completionHandler([])
-            }
-        }
-    }
-
     // MARK: - WatchKit
 
     fileprivate var watchManager: WatchDataManager!
-    
+
     // MARK: - Status Extension
-    
+
     fileprivate var statusExtensionManager: StatusExtensionDataManager!
 
     // MARK: - Initialization
@@ -747,19 +589,6 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
     init() {
         let pumpID = UserDefaults.standard.pumpID
 
-        doseStore = DoseStore(
-            pumpID: pumpID,
-            insulinActionDuration: insulinActionDuration,
-            basalProfile: basalRateSchedule,
-            insulinSensitivitySchedule: insulinSensitivitySchedule
-        )
-
-         carbStore = CarbStore(
-            defaultAbsorptionTimes: (fast: TimeInterval(hours: 2), medium: TimeInterval(hours: 3), slow: TimeInterval(hours: 4)),
-            carbRatioSchedule: carbRatioSchedule,
-            insulinSensitivitySchedule: insulinSensitivitySchedule
-        )
-
         var idleListeningEnabled = true
 
         if let pumpID = pumpID {
@@ -797,15 +626,14 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
         remoteDataManager.delegate = self
         statusExtensionManager = StatusExtensionDataManager(deviceDataManager: self)
         loopManager = LoopDataManager(
-            deviceDataManager: self,
+            delegate: self,
             lastLoopCompleted: statusExtensionManager.context?.loop?.lastCompleted
         )
         watchManager = WatchDataManager(deviceDataManager: self)
         nightscoutDataManager = NightscoutDataManager(deviceDataManager: self)
 
-        carbStore?.delegate = self
-        carbStore?.syncDelegate = remoteDataManager.nightscoutService.uploader
-        doseStore.delegate = self
+        loopManager.carbStore.syncDelegate = remoteDataManager.nightscoutService.uploader
+        loopManager.doseStore.delegate = self
 
         setupCGM()
     }
@@ -814,7 +642,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate {
 
 extension DeviceDataManager: RemoteDataManagerDelegate {
     func remoteDataManagerDidUpdateServices(_ dataManager: RemoteDataManager) {
-        carbStore?.syncDelegate = dataManager.nightscoutService.uploader
+        loopManager.carbStore.syncDelegate = dataManager.nightscoutService.uploader
     }
 }
 
@@ -823,11 +651,7 @@ extension DeviceDataManager: CGMManagerDelegate {
     func cgmManager(_ manager: CGMManager, didUpdateWith result: CGMResult) {
         switch result {
         case .newData(let values):
-            glucoseStore?.addGlucoseValues(values, device: manager.device) { (success, _, _) in
-                if success {
-                    NotificationCenter.default.post(name: .GlucoseUpdated, object: self)
-                }
-
+            loopManager.addGlucose(values, from: manager.device) { _ in
                 self.assertCurrentPumpData()
             }
         case .noData, .error:
@@ -836,7 +660,64 @@ extension DeviceDataManager: CGMManagerDelegate {
     }
 
     func startDateToFilterNewData(for manager: CGMManager) -> Date? {
-        return glucoseStore?.latestGlucose?.startDate
+        return loopManager.glucoseStore.latestGlucose?.startDate
+    }
+}
+
+
+extension DeviceDataManager: DoseStoreDelegate {
+    func doseStore(_ doseStore: DoseStore,
+        hasEventsNeedingUpload pumpEvents: [PersistedPumpEvent],
+        completion completionHandler: @escaping (_ uploadedObjects: [NSManagedObjectID]) -> Void
+    ) {
+        guard let uploader = remoteDataManager.nightscoutService.uploader, let pumpModel = pumpState?.pumpModel else {
+            completionHandler(pumpEvents.map({ $0.objectID }))
+            return
+        }
+
+        uploader.upload(pumpEvents, from: pumpModel) { (result) in
+            switch result {
+            case .success(let objects):
+                completionHandler(objects)
+            case .failure(let error):
+                self.logger.addError(error, fromSource: "NightscoutUploadKit")
+                completionHandler([])
+            }
+        }
+    }
+}
+
+
+extension DeviceDataManager: LoopDataManagerDelegate {
+    func loopDataManager(_ manager: LoopDataManager, didRecommendBasalChange basal: LoopDataManager.TempBasalRecommendation, completion: @escaping (_ result: Result<DoseEntry>) -> Void) {
+        guard let device = rileyLinkManager.firstConnectedDevice else {
+            completion(.failure(LoopError.connectionError))
+            return
+        }
+
+        guard let ops = device.ops else {
+            completion(.failure(LoopError.configurationError("PumpOps")))
+            return
+        }
+
+        ops.setTempBasal(rate: basal.rate, duration: basal.duration) { (result) -> Void in
+            switch result {
+            case .success(let body):
+                let now = Date()
+                let endDate = now.addingTimeInterval(body.timeRemaining)
+                let startDate = endDate.addingTimeInterval(-basal.duration)
+
+                completion(.success(DoseEntry(
+                    type: .tempBasal,
+                    startDate: startDate,
+                    endDate: endDate,
+                    value: body.rate,
+                    unit: .unitsPerHour
+                )))
+            case .failure(let error):
+                completion(.failure(error))
+            }
+        }
     }
 }
 
@@ -848,13 +729,9 @@ extension DeviceDataManager: CustomDebugStringConvertible {
             "## DeviceDataManager",
             "launchDate: \(launchDate)",
             "cgm: \(String(describing: cgm))",
-            "latestPumpStatusFromMySentry: \(String(describing:latestPumpStatusFromMySentry))",
+            "latestPumpStatusFromMySentry: \(String(describing: latestPumpStatusFromMySentry))",
             "pumpState: \(String(reflecting: pumpState))",
             "preferredInsulinDataSource: \(preferredInsulinDataSource)",
-            "glucoseTargetRangeSchedule: \(String(describing: glucoseTargetRangeSchedule))",
-            "workoutModeEnabled: \(String(describing: workoutModeEnabled))",
-            "maximumBasalRatePerHour: \(String(describing: maximumBasalRatePerHour))",
-            "maximumBolus: \(String(describing: maximumBolus))",
             cgmManager != nil ? String(reflecting: cgmManager!) : "",
             String(reflecting: rileyLinkManager),
             String(reflecting: statusExtensionManager!),
@@ -864,15 +741,3 @@ extension DeviceDataManager: CustomDebugStringConvertible {
         ].joined(separator: "\n")
     }
 }
-
-
-extension Notification.Name {
-    /// Notification posted by the instance when new glucose data was processed
-    static let GlucoseUpdated = Notification.Name(rawValue:  "com.loudnate.Naterade.notification.GlucoseUpdated")
-
-    /// Notification posted by the instance when new pump data was processed
-    static let PumpStatusUpdated = Notification.Name(rawValue: "com.loudnate.Naterade.notification.PumpStatusUpdated")
-
-    /// Notification posted by the instance when loop configuration was changed
-    static let LoopSettingsUpdated = Notification.Name(rawValue: "com.loudnate.Naterade.notification.LoopSettingsUpdated")
-}
diff --git a/Loop/Managers/DiagnosticLogger+LoopKit.swift b/Loop/Managers/DiagnosticLogger+LoopKit.swift
index e70cf3f81..5e610942a 100644
--- a/Loop/Managers/DiagnosticLogger+LoopKit.swift
+++ b/Loop/Managers/DiagnosticLogger+LoopKit.swift
@@ -25,54 +25,4 @@ extension DiagnosticLogger {
     func addError(_ message: Error, fromSource source: String) {
         addError(String(describing: message), fromSource: source)
     }
-
-    func addLoopStatus(startDate: Date, endDate: Date, glucose: GlucoseValue, effects: [String: [GlucoseEffect]], error: Error?, prediction: [GlucoseValue], predictionWithRetrospectiveEffect: Double, eventualBGWithRetrospectiveEffect: Double, eventualBGWithoutMomentum: Double, recommendedTempBasal: LoopDataManager.TempBasalRecommendation?) {
-
-        let dateFormatter = DateFormatter.ISO8601StrictDateFormatter()
-        let unit = HKUnit.milligramsPerDeciliterUnit()
-
-        var message: [String: Any] = [
-            "startDate": dateFormatter.string(from: startDate),
-            "duration": endDate.timeIntervalSince(startDate),
-            "glucose": [
-                "startDate": dateFormatter.string(from: glucose.startDate),
-                "value": glucose.quantity.doubleValue(for: unit),
-                "unit": unit.unitString
-            ],
-            "input": effects.reduce([:], { (previous, item) -> [String: Any] in
-                var input = previous
-                input[item.0] = item.1.map {
-                    [
-                        "startDate": dateFormatter.string(from: $0.startDate),
-                        "value": $0.quantity.doubleValue(for: unit),
-                        "unit": unit.unitString
-                    ]
-                }
-                return input
-            }),
-            "prediction": prediction.map { (value) -> [String: Any] in
-                [
-                    "startDate": dateFormatter.string(from: value.startDate),
-                    "value": value.quantity.doubleValue(for: unit),
-                    "unit": unit.unitString
-                ]
-            },
-            "prediction_retrospect_delta": predictionWithRetrospectiveEffect,
-            "eventualBGWithRetrospectiveEffect": eventualBGWithRetrospectiveEffect,
-            "eventualBGWithoutMomentum": eventualBGWithoutMomentum
-        ]
-
-        if let error = error {
-            message["error"] = String(describing: error)
-        }
-
-        if let recommendedTempBasal = recommendedTempBasal {
-            message["recommendedTempBasal"] = [
-                "rate": recommendedTempBasal.rate,
-                "minutes": recommendedTempBasal.duration.minutes
-            ]
-        }
-
-        addMessage(message, toCollection: "loop")
-    }
 }
diff --git a/Loop/Managers/DoseMath.swift b/Loop/Managers/DoseMath.swift
index cb224a271..3511a7d14 100644
--- a/Loop/Managers/DoseMath.swift
+++ b/Loop/Managers/DoseMath.swift
@@ -31,7 +31,7 @@ struct DoseMath {
      - returns: The determined basal rate, in Units/hour
      */
     private static func calculateTempBasalRateForGlucose(_ currentGlucose: HKQuantity, toTargetGlucose targetGlucose: HKQuantity, insulinSensitivity: HKQuantity, currentBasalRate: Double, maxBasalRate: Double, duration: TimeInterval) -> Double {
-        let unit = HKUnit.milligramsPerDeciliterUnit()
+        let unit = HKUnit.milligramsPerDeciliter()
         let doseUnits = (currentGlucose.doubleValue(for: unit) - targetGlucose.doubleValue(for: unit)) / insulinSensitivity.doubleValue(for: unit)
 
         let rate = min(maxBasalRate, max(0, doseUnits / (duration / TimeInterval(hours: 1)) + currentBasalRate))
@@ -62,13 +62,15 @@ struct DoseMath {
         glucoseTargetRange: GlucoseRangeSchedule,
         insulinSensitivity: InsulinSensitivitySchedule,
         basalRateSchedule: BasalRateSchedule,
-        minimumBGGuard: GlucoseThreshold
+        minimumBGGuard: GlucoseThreshold,
+        insulinActionDuration: TimeInterval
     ) -> (rate: Double, duration: TimeInterval)? {
         guard glucose.count > 1 else {
             return nil
         }
 
-        let eventualGlucose = glucose.last!
+        let eventualGlucose = glucose.filter { $0.startDate <= date.addingTimeInterval(insulinActionDuration) }.last!
+        
         let minGlucose = glucose.min { $0.quantity < $1.quantity }!
 
         let eventualGlucoseTargets = glucoseTargetRange.value(at: eventualGlucose.startDate)
@@ -151,13 +153,15 @@ struct DoseMath {
         insulinSensitivity: InsulinSensitivitySchedule,
         basalRateSchedule: BasalRateSchedule,
         pendingInsulin: Double,
-        minimumBGGuard: GlucoseThreshold
+        minimumBGGuard: GlucoseThreshold,
+        insulinActionDuration: TimeInterval
     ) -> BolusRecommendation {
         guard glucose.count > 1 else {
             return BolusRecommendation(amount: 0, pendingInsulin: pendingInsulin)
         }
 
-        let eventualGlucose = glucose.last!
+        let eventualGlucose = glucose.filter { $0.startDate <= date.addingTimeInterval(insulinActionDuration) }.last!
+
         let minGlucose = glucose.min { $0.quantity < $1.quantity }!
 
         let eventualGlucoseTargets = glucoseTargetRange.value(at: eventualGlucose.startDate)
diff --git a/Loop/Managers/KeychainManager.swift b/Loop/Managers/KeychainManager.swift
index 8e969ff46..ff0e0db0d 100644
--- a/Loop/Managers/KeychainManager.swift
+++ b/Loop/Managers/KeychainManager.swift
@@ -256,8 +256,8 @@ private extension URLComponents {
 
         host = keychainAttributes[kSecAttrServer as String] as? String
 
-        if let port = keychainAttributes[kSecAttrPort as String] as? NSNumber, port.intValue > 0 {
-            self.port = port as? Int
+        if let port = keychainAttributes[kSecAttrPort as String] as? Int, port > 0 {
+            self.port = port
         }
 
         if let path = keychainAttributes[kSecAttrPath as String] as? String {
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
index db70a69d0..79a3a84f4 100644
--- a/Loop/Managers/LoopDataManager.swift
+++ b/Loop/Managers/LoopDataManager.swift
@@ -8,11 +8,10 @@
 
 import Foundation
 import CarbKit
+import GlucoseKit
 import HealthKit
 import InsulinKit
 import LoopKit
-import MinimedKit
-import HealthKit
 
 
 final class LoopDataManager {
@@ -28,127 +27,384 @@ final class LoopDataManager {
 
     typealias TempBasalRecommendation = (recommendedDate: Date, rate: Double, duration: TimeInterval)
 
-    private typealias GlucoseChange = (GlucoseValue, GlucoseValue)
+    private typealias GlucoseChange = (start: GlucoseValue, end: GlucoseValue)
+
+    let carbStore: CarbStore!
+
+    let doseStore: DoseStore
+
+    let glucoseStore: GlucoseStore! = GlucoseStore()
+
+    unowned let delegate: LoopDataManagerDelegate
+
+    private let logger = DiagnosticLogger()
+
+    init(
+        delegate: LoopDataManagerDelegate,
+        lastLoopCompleted: Date?,
+        basalRateSchedule: BasalRateSchedule? = UserDefaults.standard.basalRateSchedule,
+        carbRatioSchedule: CarbRatioSchedule? = UserDefaults.standard.carbRatioSchedule,
+        insulinActionDuration: TimeInterval? = UserDefaults.standard.insulinActionDuration,
+        insulinSensitivitySchedule: InsulinSensitivitySchedule? = UserDefaults.standard.insulinSensitivitySchedule,
+        settings: LoopSettings = UserDefaults.standard.loopSettings ?? LoopSettings()
+    ) {
+        self.delegate = delegate
+        self.lastLoopCompleted = lastLoopCompleted
+        self.settings = settings
+
+        carbStore = CarbStore(
+            defaultAbsorptionTimes: (
+                fast: TimeInterval(hours: 2),
+                medium: TimeInterval(hours: 3),
+                slow: TimeInterval(hours: 4)
+            ),
+            carbRatioSchedule: carbRatioSchedule,
+            insulinSensitivitySchedule: insulinSensitivitySchedule
+        )
+
+        doseStore = DoseStore(
+            insulinActionDuration: insulinActionDuration,
+            basalProfile: basalRateSchedule,
+            insulinSensitivitySchedule: insulinSensitivitySchedule
+        )
+
+        // Observe changes
+        carbUpdateObserver = NotificationCenter.default.addObserver(
+            forName: .CarbEntriesDidUpdate,
+            object: nil,
+            queue: nil
+        ) { (note) -> Void in
+            self.dataAccessQueue.async {
+                self.carbEffect = nil
+                self.carbsOnBoardSeries = nil
+                self.notify(forChange: .carbs)
+            }
+        }
+    }
 
-    unowned let deviceDataManager: DeviceDataManager
+    // MARK: - Preferences
 
-    var dosingEnabled: Bool {
+    /// Loop-related settings
+    ///
+    /// These are not thread-safe.
+    var settings: LoopSettings {
         didSet {
-            UserDefaults.standard.dosingEnabled = dosingEnabled
+            UserDefaults.standard.loopSettings = settings
+            notify(forChange: .preferences)
+            AnalyticsManager.sharedManager.didChangeLoopSettings(from: oldValue, to: settings)
+        }
+    }
 
+    /// The daily schedule of basal insulin rates
+    var basalRateSchedule: BasalRateSchedule? {
+        get {
+            return doseStore.basalProfile
+        }
+        set {
+            doseStore.basalProfile = newValue
+            UserDefaults.standard.basalRateSchedule = newValue
             notify(forChange: .preferences)
         }
     }
 
-    var retrospectiveCorrectionEnabled: Bool {
-        didSet {
-            UserDefaults.standard.retrospectiveCorrectionEnabled = retrospectiveCorrectionEnabled
+    /// The daily schedule of carbs-to-insulin ratios
+    /// This is measured in grams/Unit
+    var carbRatioSchedule: CarbRatioSchedule? {
+        get {
+            return carbStore.carbRatioSchedule
+        }
+        set {
+            carbStore.carbRatioSchedule = newValue
+            UserDefaults.standard.carbRatioSchedule = newValue
+            notify(forChange: .preferences)
+        }
+    }
+
+    /// Enable workout glucose targets until the given date
+    ///
+    /// TODO: When schedule settings are migrated to structs, this can be simplified
+    ///
+    /// - Parameter endDate: The date the workout targets should end
+    /// - Returns: True if the override was set
+    @discardableResult
+    func enableWorkoutMode(until endDate: Date) -> Bool {
+        guard let glucoseTargetRangeSchedule = settings.glucoseTargetRangeSchedule else {
+            return false
+        }
+
+        _ = glucoseTargetRangeSchedule.setWorkoutOverride(until: endDate)
+
+        notify(forChange: .preferences)
+
+        return true
+    }
+
+    /// Disable any active workout glucose targets
+    func disableWorkoutMode() {
+        settings.glucoseTargetRangeSchedule?.clearOverride()
+
+        notify(forChange: .preferences)
+    }
+
+    /// The length of time insulin has an effect on blood glucose
+    var insulinActionDuration: TimeInterval? {
+        get {
+            return doseStore.insulinActionDuration
+        }
+        set {
+            let oldValue = doseStore.insulinActionDuration
+            doseStore.insulinActionDuration = newValue
+
+            UserDefaults.standard.insulinActionDuration = newValue
+
+            if oldValue != newValue {
+                AnalyticsManager.sharedManager.didChangeInsulinActionDuration()
+            }
+        }
+    }
+
+    /// The daily schedule of insulin sensitivity (also known as ISF)
+    /// This is measured in <blood glucose>/Unit
+    var insulinSensitivitySchedule: InsulinSensitivitySchedule? {
+        get {
+            return carbStore.insulinSensitivitySchedule
+        }
+        set {
+            carbStore.insulinSensitivitySchedule = newValue
+            doseStore.insulinSensitivitySchedule = newValue
+
+            UserDefaults.standard.insulinSensitivitySchedule = newValue
 
             notify(forChange: .preferences)
         }
     }
 
-    init(deviceDataManager: DeviceDataManager, lastLoopCompleted: Date?) {
-        self.deviceDataManager = deviceDataManager
-        self.lastLoopCompleted = lastLoopCompleted
+    /// The amount of time since a given date that data should be considered valid
+    var recencyInterval = TimeInterval(minutes: 15)
 
-        dosingEnabled = UserDefaults.standard.dosingEnabled
-        retrospectiveCorrectionEnabled = UserDefaults.standard.retrospectiveCorrectionEnabled
+    /// Sets a new time zone for a the schedule-based settings
+    ///
+    /// - Parameter timeZone: The time zone
+    func setScheduleTimeZone(_ timeZone: TimeZone) {
+        // Recreate each schedule to force a change notification
+        // TODO: When schedule settings are migrated to structs, this can be simplified
+        if let basalRateSchedule = basalRateSchedule {
+            self.basalRateSchedule = BasalRateSchedule(dailyItems: basalRateSchedule.items, timeZone: timeZone)
+        }
 
-        // Observe changes
-        let center = NotificationCenter.default
+        if let carbRatioSchedule = carbRatioSchedule {
+            self.carbRatioSchedule = CarbRatioSchedule(unit: carbRatioSchedule.unit, dailyItems: carbRatioSchedule.items, timeZone: timeZone)
+        }
+
+        if let insulinSensitivitySchedule = insulinSensitivitySchedule {
+            self.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: insulinSensitivitySchedule.unit, dailyItems: insulinSensitivitySchedule.items, timeZone: timeZone)
+        }
+
+        if let glucoseTargetRangeSchedule = settings.glucoseTargetRangeSchedule {
+            settings.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: glucoseTargetRangeSchedule.unit, dailyItems: glucoseTargetRangeSchedule.items, workoutRange: glucoseTargetRangeSchedule.workoutRange, timeZone: timeZone)
+        }
+    }
+
+    // MARK: - Intake
 
-        notificationObservers = [
-            center.addObserver(forName: .GlucoseUpdated, object: deviceDataManager, queue: nil) { (note) -> Void in
+    /// Adds and stores glucose data
+    ///
+    /// - Parameters:
+    ///   - values: The new glucose values to store
+    ///   - device: The device that captured the data
+    ///   - completion: A closure called once upon completion
+    ///   - result: The stored glucose values
+    func addGlucose(
+        _ values: [(quantity: HKQuantity, date: Date, isDisplayOnly: Bool)],
+        from device: HKDevice?,
+        completion: ((_ result: Result<[GlucoseValue]>) -> Void)? = nil
+    ) {
+        glucoseStore.addGlucoseValues(values, device: device) { (success, values, error) in
+            if success {
                 self.dataAccessQueue.async {
                     self.glucoseMomentumEffect = nil
-                    self.glucoseChange = nil
+                    self.retrospectiveGlucoseChange = nil
                     self.notify(forChange: .glucose)
                 }
-            },
-            center.addObserver(forName: .PumpStatusUpdated, object: deviceDataManager, queue: nil) { (note) -> Void in
-                self.dataAccessQueue.async {
-                    // Assuming insulin data is never back-dated, we don't need to remove the retrospective glucose effects
-                    // TODO: What about a deletion?
-                    self.insulinEffect = nil
-                    self.insulinOnBoard = nil
-                    self.loop()
-                }
-            },
-            center.addObserver(forName: .CarbEntriesDidUpdate, object: nil, queue: nil) { (note) -> Void in
-                self.dataAccessQueue.async {
+            }
+
+            if let error = error {
+                completion?(.failure(error))
+            } else {
+                completion?(.success(values ?? []))
+            }
+        }
+    }
+
+    /// Adds and stores carb data, and recommends a bolus if needed
+    ///
+    /// - Parameters:
+    ///   - carbEntry: The new carb value
+    ///   - completion: A closure called once upon completion
+    ///   - result: The bolus recommendation
+    func addCarbEntryAndRecommendBolus(_ carbEntry: CarbEntry, completion: @escaping (_ result: Result<BolusRecommendation?>) -> Void) {
+        carbStore.addCarbEntry(carbEntry) { (success, _, error) in
+            self.dataAccessQueue.async {
+                if success {
                     self.carbEffect = nil
                     self.carbsOnBoardSeries = nil
-                    self.notify(forChange: .carbs)
+
+                    defer {
+                        self.notify(forChange: .carbs)
+                    }
+
+                    do {
+                        try self.update()
+
+                        completion(.success(try self.recommendBolus()))
+                    } catch let error {
+                        completion(.failure(error))
+                    }
+                } else if let error = error {
+                    completion(.failure(error))
+                } else {
+                    completion(.success(nil))
                 }
             }
-        ]
+        }
+    }
+
+    /// Adds a bolus enacted by the pump, but not fully delivered.
+    ///
+    /// - Parameters:
+    ///   - units: The bolus amount, in units
+    ///   - date: The date the bolus was enacted
+    func addExpectedBolus(_ units: Double, at date: Date) {
+        dataAccessQueue.async {
+            self.lastBolus = (units: units, date: date)
+            self.notify(forChange: .bolus)
+        }
+    }
+
+    /// Adds and stores new pump events
+    ///
+    /// - Parameters:
+    ///   - events: The pump events to add
+    ///   - completion: A closure called once upon completion
+    ///   - error: An error explaining why the events could not be saved.
+    func addPumpEvents(_ events: [NewPumpEvent], completion: @escaping (_ error: DoseStore.DoseStoreError?) -> Void) {
+        doseStore.addPumpEvents(events) { (error) in
+            if error != nil {
+                self.insulinEffect = nil
+                self.insulinOnBoard = nil
+            }
+
+            completion(error)
+        }
+    }
+
+    /// Adds and stores a pump reservoir volume
+    ///
+    /// - Parameters:
+    ///   - units: The reservoir volume, in units
+    ///   - date: The date of the volume reading
+    ///   - completion: A closure called once upon completion
+    ///   - result: The current state of the reservoir values:
+    ///       - newValue: The new stored value
+    ///       - lastValue: The previous new stored value
+    ///       - areStoredValuesContinuous: Whether the current recent state of the stored reservoir data is considered continuous and reliable for deriving insulin effects after addition of this new value.
+    func addReservoirValue(_ units: Double, at date: Date, completion: @escaping (_ result: Result<(newValue: ReservoirValue, lastValue: ReservoirValue?, areStoredValuesContinuous: Bool)>) -> Void) {
+        doseStore.addReservoirValue(units, atDate: date) { (newValue, previousValue, areStoredValuesContinuous, error) in
+            if let error = error {
+                completion(.failure(error))
+            } else if let newValue = newValue {
+                self.insulinEffect = nil
+                self.insulinOnBoard = nil
+
+                completion(.success((
+                    newValue: newValue,
+                    lastValue: previousValue,
+                    areStoredValuesContinuous: areStoredValuesContinuous
+                )))
+            } else {
+                assertionFailure()
+            }
+        }
     }
 
     // Actions
 
-    private func loop() {
-        NotificationCenter.default.post(name: .LoopRunning, object: self)
+    func enactRecommendedTempBasal(_ completion: @escaping (_ error: Error?) -> Void) {
+        dataAccessQueue.async {
+            self.setRecommendedTempBasal(completion)
+        }
+    }
 
-        lastLoopError = nil
+    /// Runs the "loop"
+    ///
+    /// Executes an analysis of the current data, and recommends an adjustment to the current
+    /// temporary basal rate.
+    func loop() {
+        self.dataAccessQueue.async {
+            NotificationCenter.default.post(name: .LoopRunning, object: self)
 
-        do {
-            try self.update()
+            self.lastLoopError = nil
 
-            if dosingEnabled {
+            do {
+                try self.update()
 
-                setRecommendedTempBasal { (success, error) -> Void in
-                    self.lastLoopError = error
+                if self.settings.dosingEnabled {
+                    self.setRecommendedTempBasal { (error) -> Void in
+                        self.lastLoopError = error
 
-                    if let error = error {
-                        self.deviceDataManager.logger.addError(error, fromSource: "TempBasal")
-                    } else {
-                        self.lastLoopCompleted = Date()
+                        if let error = error {
+                            self.logger.addError(error, fromSource: "TempBasal")
+                        } else {
+                            self.lastLoopCompleted = Date()
+                        }
+                        self.notify(forChange: .tempBasal)
                     }
-                    self.notify(forChange: .tempBasal)
-                }
 
-                // Delay the notification until we know the result of the temp basal
-                return
-            } else {
-                lastLoopCompleted = Date()
+                    // Delay the notification until we know the result of the temp basal
+                    return
+                } else {
+                    self.lastLoopCompleted = Date()
+                }
+            } catch let error {
+                self.lastLoopError = error
             }
-        } catch let error {
-            lastLoopError = error
-        }
 
-        notify(forChange: .tempBasal)
+            self.notify(forChange: .tempBasal)
+        }
     }
 
     // References to registered notification center observers
-    private var notificationObservers: [Any] = []
+    private var carbUpdateObserver: Any?
 
     deinit {
-        for observer in notificationObservers {
+        if let observer = carbUpdateObserver {
             NotificationCenter.default.removeObserver(observer)
         }
     }
 
-    private func update() throws {
+    /// - Throws:
+    ///     - LoopError.configurationError
+    ///     - LoopError.glucoseTooOld
+    ///     - LoopError.missingDataError
+    ///     - LoopError.pumpDataTooOld
+    fileprivate func update() throws {
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
         let updateGroup = DispatchGroup()
 
-        guard let glucoseStore = deviceDataManager.glucoseStore else {
-            throw LoopError.configurationError("GlucoseStore")
-        }
-
         // Fetch glucose effects as far back as we want to make retroactive analysis
-        guard let effectStartDate = glucoseStore.latestGlucose?.startDate.addingTimeInterval(-glucoseStore.reflectionDataInterval) else {
+        guard let lastGlucoseDate = glucoseStore.latestGlucose?.startDate else {
             throw LoopError.missingDataError(details: "Glucose data not available", recovery: "Check your CGM data source")
         }
 
-        if glucoseChange == nil {
+        let retrospectiveStart = lastGlucoseDate.addingTimeInterval(-glucoseStore.reflectionDataInterval)
+
+        if retrospectiveGlucoseChange == nil {
             updateGroup.enter()
-            glucoseStore.getRecentGlucoseChange { (values, error) in
+            glucoseStore.getRecentGlucoseChange { (change, error) in
                 if let error = error {
-                    self.deviceDataManager.logger.addError(error, fromSource: "GlucoseStore")
+                    self.logger.addError(error, fromSource: "GlucoseStore")
                 }
-
-                self.glucoseChange = values
+                self.retrospectiveGlucoseChange = change
                 updateGroup.leave()
             }
         }
@@ -157,7 +413,7 @@ final class LoopDataManager {
             updateGroup.enter()
             glucoseStore.getRecentMomentumEffect { (effects, error) -> Void in
                 if let error = error, effects.count == 0 {
-                    self.deviceDataManager.logger.addError(error, fromSource: "GlucoseStore")
+                    self.logger.addError(error, fromSource: "GlucoseStore")
                     self.glucoseMomentumEffect = nil
                 } else {
                     self.glucoseMomentumEffect = effects
@@ -167,44 +423,41 @@ final class LoopDataManager {
             }
         }
 
-        if let carbStore = deviceDataManager.carbStore {
-            if carbEffect == nil {
-                updateGroup.enter()
-
-                carbStore.getGlucoseEffects(startDate: effectStartDate) { (effects, error) -> Void in
-                    if let error = error {
-                        self.deviceDataManager.logger.addError(error, fromSource: "CarbStore")
-                        self.carbEffect = nil
-                    } else {
-                        self.carbEffect = effects
-                    }
-
-                    updateGroup.leave()
+        if carbEffect == nil {
+            updateGroup.enter()
+            carbStore.getGlucoseEffects(startDate: retrospectiveStart) { (effects, error) -> Void in
+                if let error = error {
+                    self.logger.addError(error, fromSource: "CarbStore")
+                    self.carbEffect = nil
+                } else {
+                    self.carbEffect = effects
                 }
-            }
 
-            if carbsOnBoardSeries == nil {
-                updateGroup.enter()
-                carbStore.getCarbsOnBoardValues(startDate: effectStartDate) { (values, error) in
-                    if let error = error {
-                        self.deviceDataManager.logger.addError(error, fromSource: "CarbStore")
-                    }
+                updateGroup.leave()
+            }
+        }
 
-                    self.carbsOnBoardSeries = values
-                    updateGroup.leave()
+        if carbsOnBoardSeries == nil {
+            updateGroup.enter()
+            carbStore.getCarbsOnBoardValues(startDate: retrospectiveStart) { (values, error) in
+                if let error = error {
+                    self.logger.addError(error, fromSource: "CarbStore")
                 }
+
+                self.carbsOnBoardSeries = values
+                updateGroup.leave()
             }
         }
 
         if insulinEffect == nil {
             updateGroup.enter()
-            deviceDataManager.doseStore.getGlucoseEffects(start: effectStartDate) { result -> Void in
+            doseStore.getGlucoseEffects(start: retrospectiveStart) { (result) -> Void in
                 switch result {
-                case .success(let effects):
-                    self.insulinEffect = effects
                 case .failure(let error):
-                    self.deviceDataManager.logger.addError(error, fromSource: "DoseStore")
+                    self.logger.addError(error, fromSource: "DoseStore")
                     self.insulinEffect = nil
+                case .success(let effects):
+                    self.insulinEffect = effects
                 }
 
                 updateGroup.leave()
@@ -213,33 +466,33 @@ final class LoopDataManager {
 
         if insulinOnBoard == nil {
             updateGroup.enter()
-            deviceDataManager.doseStore.insulinOnBoard(at: Date()) { result in
+            doseStore.insulinOnBoard(at: Date()) { (result) in
                 switch result {
-                case .success(let values):
-                    self.insulinOnBoard = values
                 case .failure(let error):
-                    self.deviceDataManager.logger.addError(error, fromSource: "DoseStore")
+                    self.logger.addError(error, fromSource: "DoseStore")
                     self.insulinOnBoard = nil
+                case .success(let value):
+                    self.insulinOnBoard = value
                 }
                 updateGroup.leave()
             }
         }
 
-        _ = updateGroup.wait(timeout: DispatchTime.distantFuture)
+        _ = updateGroup.wait(timeout: .distantFuture)
 
-        if self.retrospectivePredictedGlucose == nil {
+        if retrospectivePredictedGlucose == nil {
             do {
-                try self.updateRetrospectiveGlucoseEffect()
+                try updateRetrospectiveGlucoseEffect()
             } catch let error {
-                self.deviceDataManager.logger.addError(error, fromSource: "RetrospectiveGlucose")
+                logger.addError(error, fromSource: "RetrospectiveGlucose")
             }
         }
 
-        if self.predictedGlucose == nil {
+        if predictedGlucose == nil {
             do {
-                try self.updatePredictedGlucoseAndRecommendedBasal()
+                try updatePredictedGlucoseAndRecommendedBasal()
             } catch let error {
-                self.deviceDataManager.logger.addError(error, fromSource: "PredictGlucose")
+                logger.addError(error, fromSource: "PredictGlucose")
 
                 throw error
             }
@@ -253,50 +506,16 @@ final class LoopDataManager {
         )
     }
 
-    /**
-     Retrieves the current state of the loop, calculating
-     
-     This operation is performed asynchronously and the completion will be executed on an arbitrary background queue.
-
-     - parameter resultsHandler: A closure called once the values have been retrieved. The closure takes the following arguments:
-        - predictedGlucose:     The calculated timeline of predicted glucose values
-        - retrospectivePredictedGlucose: The retrospective prediction over a recent period of glucose samples
-        - recommendedTempBasal: The recommended temp basal based on predicted glucose
-        - lastTempBasal:        The last set temp basal
-        - lastLoopCompleted:    The last date at which a loop completed, from prediction to dose (if dosing is enabled)
-        - insulinOnBoard        Current insulin on board
-        - carbsOnBoard          Current carbs on board
-        - error:                An error in the current state of the loop, or one that happened during the last attempt to loop.
-     */
-    func getLoopStatus(_ resultsHandler: @escaping (_ predictedGlucose: [GlucoseValue]?, _ retrospectivePredictedGlucose: [GlucoseValue]?, _ recommendedTempBasal: TempBasalRecommendation?, _ lastTempBasal: DoseEntry?, _ lastLoopCompleted: Date?, _ insulinOnBoard: InsulinValue?, _ carbsOnBoard: CarbValue?, _ error: Error?) -> Void) {
-        dataAccessQueue.async {
-            var error: Error?
-
-            do {
-                try self.update()
-            } catch let updateError {
-                error = updateError
-            }
-
-            let currentCOB = self.carbsOnBoardSeries?.closestPriorToDate(Date())
-
-            resultsHandler(self.predictedGlucose, self.retrospectivePredictedGlucose, self.recommendedTempBasal, self.lastTempBasal, self.lastLoopCompleted, self.insulinOnBoard, currentCOB, error ?? self.lastLoopError)
-        }
-    }
-
-
-
-    /**
-     Computes amount of insulin from boluses that have been issued and not confirmed, and
-     remaining insulin delivery from temporary basal rate adjustments above scheduled rate 
-     that are still in progress.
-
-     *This method should only be called from the `dataAccessQueue`*
-
-     **/
+    /// Computes amount of insulin from boluses that have been issued and not confirmed, and
+    /// remaining insulin delivery from temporary basal rate adjustments above scheduled rate
+    /// that are still in progress.
+    ///
+    /// - Returns: The amount of pending insulin, in units
+    /// - Throws: LoopError.configurationError
     private func getPendingInsulin() throws -> Double {
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
 
-        guard let basalRates = deviceDataManager.basalRateSchedule else {
+        guard let basalRates = basalRateSchedule else {
             throw LoopError.configurationError("Basal Rate Schedule")
         }
 
@@ -319,46 +538,39 @@ final class LoopDataManager {
         return pendingTempBasalInsulin + pendingBolusAmount
     }
 
-    func modelPredictedGlucose(using inputs: [PredictionInputEffect], resultsHandler: @escaping (_ predictedGlucose: [GlucoseValue]?, _ error: Error?) -> Void) {
-        dataAccessQueue.async { 
-            guard let
-                glucose = self.deviceDataManager.glucoseStore?.latestGlucose
-            else {
-                resultsHandler(nil, LoopError.missingDataError(details: "Cannot predict glucose due to missing input data", recovery: "Check your CGM data source"))
-                return
-            }
+    /// - Throws: LoopError.missingDataError
+    fileprivate func predictGlucose(using inputs: PredictionInputEffect) throws -> [GlucoseValue] {
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
 
-            var momentum: [GlucoseEffect] = []
-            var effects: [[GlucoseEffect]] = []
+        guard let glucose = self.glucoseStore.latestGlucose else {
+            throw LoopError.missingDataError(details: "Cannot predict glucose due to missing input data", recovery: "Check your CGM data source")
+        }
 
-            for input in inputs {
-                switch input {
-                case .carbs:
-                    if let carbEffect = self.carbEffect {
-                        effects.append(carbEffect)
-                    }
-                case .insulin:
-                    if let insulinEffect = self.insulinEffect {
-                        effects.append(insulinEffect)
-                    }
-                case .momentum:
-                    if let momentumEffect = self.glucoseMomentumEffect {
-                        momentum = momentumEffect
-                    }
-                case .retrospection:
-                    effects.append(self.retrospectiveGlucoseEffect)
-                }
-            }
+        var momentum: [GlucoseEffect] = []
+        var effects: [[GlucoseEffect]] = []
+
+        if inputs.contains(.carbs), let carbEffect = self.carbEffect {
+            effects.append(carbEffect)
+        }
+
+        if inputs.contains(.insulin), let insulinEffect = self.insulinEffect {
+            effects.append(insulinEffect)
+        }
 
-            let prediction = LoopMath.predictGlucose(glucose, momentum: momentum, effects: effects)
+        if inputs.contains(.momentum), let momentumEffect = self.glucoseMomentumEffect {
+            momentum = momentumEffect
+        }
 
-            resultsHandler(prediction, nil)
+        if inputs.contains(.retrospection) {
+            effects.append(self.retrospectiveGlucoseEffect)
         }
+
+        return LoopMath.predictGlucose(glucose, momentum: momentum, effects: effects)
     }
 
-    // Calculation
+    // MARK: - Calculation state
 
-    private let dataAccessQueue: DispatchQueue = DispatchQueue(label: "com.loudnate.Naterade.LoopDataManager.dataAccessQueue", qos: .utility)
+    fileprivate let dataAccessQueue: DispatchQueue = DispatchQueue(label: "com.loudnate.Naterade.LoopDataManager.dataAccessQueue", qos: .utility)
 
     private var carbEffect: [GlucoseEffect]? {
         didSet {
@@ -368,7 +580,6 @@ final class LoopDataManager {
             retrospectivePredictedGlucose = nil
         }
     }
-    private var carbsOnBoardSeries: [CarbValue]?
     private var insulinEffect: [GlucoseEffect]? {
         didSet {
             if let bolusDate = lastBolus?.date, bolusDate.timeIntervalSinceNow < TimeInterval(minutes: -5) {
@@ -378,64 +589,53 @@ final class LoopDataManager {
             predictedGlucose = nil
         }
     }
-    private var insulinOnBoard: InsulinValue?
     private var glucoseMomentumEffect: [GlucoseEffect]? {
         didSet {
             predictedGlucose = nil
         }
     }
-    private var glucoseChange: GlucoseChange? {
+    private var retrospectiveGlucoseEffect: [GlucoseEffect] = [] {
         didSet {
-            retrospectivePredictedGlucose = nil
+            predictedGlucose = nil
         }
     }
-    private var predictedGlucose: [GlucoseValue]? {
+
+    /// The change in glucose over the reflection time interval (default is 30 min)
+    private var retrospectiveGlucoseChange: GlucoseChange? {
         didSet {
-            recommendedTempBasal = nil
-            predictedGlucoseWithoutMomentum = nil
+            retrospectivePredictedGlucose = nil
         }
     }
-    private var predictedGlucoseWithoutMomentum: [GlucoseValue]?
-    private var retrospectivePredictedGlucose: [GlucoseValue]? {
+
+    fileprivate var predictedGlucose: [GlucoseValue]? {
         didSet {
-            retrospectiveGlucoseEffect = []
+            recommendedTempBasal = nil
         }
     }
-    private var retrospectiveGlucoseEffect: [GlucoseEffect] = [] {
+    fileprivate var retrospectivePredictedGlucose: [GlucoseValue]? {
         didSet {
-            predictedGlucose = nil
+            retrospectiveGlucoseEffect = []
         }
     }
-    private var recommendedTempBasal: TempBasalRecommendation?
+    fileprivate var recommendedTempBasal: TempBasalRecommendation?
 
-    private var lastTempBasal: DoseEntry?
-    private var lastBolus: (units: Double, date: Date)?
-    private var lastLoopError: Error? {
-        didSet {
-            if lastLoopError != nil {
-                AnalyticsManager.sharedManager.loopDidError()
-            }
-        }
-    }
-    private var lastLoopCompleted: Date? {
+    fileprivate var carbsOnBoardSeries: [CarbValue]?
+    fileprivate var insulinOnBoard: InsulinValue?
+
+    fileprivate var lastTempBasal: DoseEntry?
+    fileprivate var lastBolus: (units: Double, date: Date)?
+    fileprivate var lastLoopCompleted: Date? {
         didSet {
             NotificationManager.scheduleLoopNotRunningNotifications()
 
             AnalyticsManager.sharedManager.loopDidSucceed()
         }
     }
-
-    var lastNetBasal: NetBasal? {
-        get {
-            guard
-                let scheduledBasal = deviceDataManager.basalRateSchedule?.between(start: Date(), end: Date()).first
-            else {
-                return nil
+    fileprivate var lastLoopError: Error? {
+        didSet {
+            if lastLoopError != nil {
+                AnalyticsManager.sharedManager.loopDidError()
             }
-
-            return NetBasal(lastTempBasal: lastTempBasal,
-                            maxBasal: deviceDataManager.maximumBasalRatePerHour,
-                            scheduledBasal: scheduledBasal)
         }
     }
 
@@ -444,7 +644,9 @@ final class LoopDataManager {
  
      *This method should only be called from the `dataAccessQueue`*
      */
-    private func updateRetrospectiveGlucoseEffect() throws {
+    private func updateRetrospectiveGlucoseEffect(effectDuration: TimeInterval = TimeInterval(minutes: 60)) throws {
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
+
         guard
             let carbEffect = self.carbEffect,
             let insulinEffect = self.insulinEffect
@@ -453,15 +655,15 @@ final class LoopDataManager {
             throw LoopError.missingDataError(details: "Cannot retrospect glucose due to missing input data", recovery: nil)
         }
 
-        guard let change = glucoseChange else {
+        guard let change = retrospectiveGlucoseChange else {
             self.retrospectivePredictedGlucose = nil
             return  // Expected case for calibrations
         }
 
         // Run a retrospective prediction over the duration of the recorded glucose change, using the current carb and insulin effects
-        let startDate = change.0.startDate
-        let endDate = change.1.endDate.addingTimeInterval(TimeInterval(minutes: 5))
-        let retrospectivePrediction = LoopMath.predictGlucose(change.0, effects:
+        let startDate = change.start.startDate
+        let endDate = change.end.endDate.addingTimeInterval(TimeInterval(minutes: 5))
+        let retrospectivePrediction = LoopMath.predictGlucose(change.start, effects:
             carbEffect.filterDateRange(startDate, endDate),
             insulinEffect.filterDateRange(startDate, endDate)
         )
@@ -469,128 +671,82 @@ final class LoopDataManager {
         self.retrospectivePredictedGlucose = retrospectivePrediction
 
         guard let lastGlucose = retrospectivePrediction.last else { return }
-        let glucoseUnit = HKUnit.milligramsPerDeciliterUnit()
+        let glucoseUnit = HKUnit.milligramsPerDeciliter()
         let velocityUnit = glucoseUnit.unitDivided(by: HKUnit.second())
 
-        let discrepancy = change.1.quantity.doubleValue(for: glucoseUnit) - lastGlucose.quantity.doubleValue(for: glucoseUnit) // mg/dL
-        let velocity = HKQuantity(unit: velocityUnit, doubleValue: discrepancy / change.1.endDate.timeIntervalSince(change.0.endDate))
+        let discrepancy = change.end.quantity.doubleValue(for: glucoseUnit) - lastGlucose.quantity.doubleValue(for: glucoseUnit) // mg/dL
+        let velocity = HKQuantity(unit: velocityUnit, doubleValue: discrepancy / change.end.endDate.timeIntervalSince(change.0.endDate))
         let type = HKQuantityType.quantityType(forIdentifier: HKQuantityTypeIdentifier.bloodGlucose)!
-        let glucose = HKQuantitySample(type: type, quantity: change.1.quantity, start: change.1.startDate, end: change.1.endDate)
+        let glucose = HKQuantitySample(type: type, quantity: change.end.quantity, start: change.end.startDate, end: change.end.endDate)
 
-        self.retrospectiveGlucoseEffect = LoopMath.decayEffect(from: glucose, atRate: velocity, for: TimeInterval(minutes: 60))
+        self.retrospectiveGlucoseEffect = LoopMath.decayEffect(from: glucose, atRate: velocity, for: effectDuration)
     }
 
-    /**
-     Runs the glucose prediction on the latest effect data.
-     
-     *This method should only be called from the `dataAccessQueue`*
-     */
+
+    /// Runs the glucose prediction on the latest effect data.
+    ///
+    /// - Throws:
+    ///     - LoopError.configurationError
+    ///     - LoopError.glucoseTooOld
+    ///     - LoopError.missingDataError
+    ///     - LoopError.pumpDataTooOld
     private func updatePredictedGlucoseAndRecommendedBasal() throws {
-        guard let
-            glucose = self.deviceDataManager.glucoseStore?.latestGlucose
-            else {
-                self.predictedGlucose = nil
-                throw LoopError.missingDataError(details: "Glucose", recovery: "Check your CGM data source")
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
+
+        guard let glucose = glucoseStore.latestGlucose else {
+            self.predictedGlucose = nil
+            throw LoopError.missingDataError(details: "Glucose", recovery: "Check your CGM data source")
         }
 
-        guard let
-            pumpStatusDate = self.deviceDataManager.doseStore.lastReservoirValue?.startDate
-        else {
+        guard let pumpStatusDate = doseStore.lastReservoirValue?.startDate else {
             self.predictedGlucose = nil
             throw LoopError.missingDataError(details: "Reservoir", recovery: "Check that your pump is in range")
         }
 
         let startDate = Date()
-        let recencyInterval = TimeInterval(minutes: 15)
 
-        guard startDate.timeIntervalSince(glucose.startDate) <= recencyInterval
-        else {
+        guard startDate.timeIntervalSince(glucose.startDate) <= recencyInterval else {
             self.predictedGlucose = nil
             throw LoopError.glucoseTooOld(date: glucose.startDate)
         }
 
-        guard startDate.timeIntervalSince(pumpStatusDate) <= recencyInterval
-        else {
+        guard startDate.timeIntervalSince(pumpStatusDate) <= recencyInterval else {
             self.predictedGlucose = nil
             throw LoopError.pumpDataTooOld(date: pumpStatusDate)
         }
 
-        guard let
-            momentum = self.glucoseMomentumEffect,
-            let carbEffect = self.carbEffect,
-            let insulinEffect = self.insulinEffect else
-        {
+        guard glucoseMomentumEffect != nil, carbEffect != nil, insulinEffect != nil else {
             self.predictedGlucose = nil
             throw LoopError.missingDataError(details: "Glucose effects", recovery: nil)
         }
 
-        var error: Error?
-
-        let prediction = LoopMath.predictGlucose(glucose, momentum: momentum, effects: carbEffect, insulinEffect)
-        let predictionWithRetrospectiveEffect = LoopMath.predictGlucose(glucose, momentum: momentum, effects: carbEffect, insulinEffect, retrospectiveGlucoseEffect)
-        let predictionWithoutMomentum = LoopMath.predictGlucose(glucose, effects: carbEffect, insulinEffect)
-
-        let predictDiff: Double
-
-        let unit = HKUnit.milligramsPerDeciliterUnit()
-        if  let lastA = prediction.last?.quantity.doubleValue(for: unit),
-            let lastB = predictionWithRetrospectiveEffect.last?.quantity.doubleValue(for: unit)
-        {
-            predictDiff = lastB - lastA
-        } else {
-            predictDiff = 0
-        }
-
-        let eventualBGWithRetrospectiveEffect: Double = predictionWithRetrospectiveEffect.last?.quantity.doubleValue(for: unit) ?? 0
-        let eventualBGWithoutMomentum: Double = predictionWithoutMomentum.last?.quantity.doubleValue(for: unit) ?? 0
-
-        defer {
-            deviceDataManager.logger.addLoopStatus(
-                startDate: startDate,
-                endDate: Date(),
-                glucose: glucose,
-                effects: [
-                    "momentum": momentum,
-                    "carbs": carbEffect,
-                    "insulin": insulinEffect,
-                    "retrospective_glucose": retrospectiveGlucoseEffect
-                ],
-                error: error,
-                prediction: prediction,
-                predictionWithRetrospectiveEffect: predictDiff,
-                eventualBGWithRetrospectiveEffect: eventualBGWithRetrospectiveEffect,
-                eventualBGWithoutMomentum: eventualBGWithoutMomentum,
-                recommendedTempBasal: recommendedTempBasal
-            )
-        }
-
-        self.predictedGlucose = retrospectiveCorrectionEnabled ? predictionWithRetrospectiveEffect : prediction
-        self.predictedGlucoseWithoutMomentum = predictionWithoutMomentum
+        let predictedGlucose = try predictGlucose(using: settings.enabledEffects)
+        self.predictedGlucose = predictedGlucose
 
-        guard let minimumBGGuard = self.deviceDataManager.minimumBGGuard else {
+        guard let minimumBGGuard = settings.minimumBGGuard else {
             throw LoopError.configurationError("Minimum BG Guard")
         }
 
         guard let
-            maxBasal = deviceDataManager.maximumBasalRatePerHour,
-            let glucoseTargetRange = deviceDataManager.glucoseTargetRangeSchedule,
-            let insulinSensitivity = deviceDataManager.insulinSensitivitySchedule,
-            let basalRates = deviceDataManager.basalRateSchedule
+            maxBasal = settings.maximumBasalRatePerHour,
+            let glucoseTargetRange = settings.glucoseTargetRangeSchedule,
+            let insulinSensitivity = insulinSensitivitySchedule,
+            let basalRates = basalRateSchedule,
+            let insulinActionDuration = insulinActionDuration
         else {
-            error = LoopError.configurationError("Check settings")
-            throw error!
+            throw LoopError.configurationError("Check settings")
         }
 
         guard
             lastBolus == nil,  // Don't recommend changes if a bolus was just set
-            let predictedGlucose = self.predictedGlucose,
             let tempBasal = DoseMath.recommendTempBasalFromPredictedGlucose(predictedGlucose,
                 lastTempBasal: lastTempBasal,
                 maxBasalRate: maxBasal,
                 glucoseTargetRange: glucoseTargetRange,
                 insulinSensitivity: insulinSensitivity,
                 basalRateSchedule: basalRates,
-                minimumBGGuard: minimumBGGuard
+                minimumBGGuard: minimumBGGuard,
+                insulinActionDuration: insulinActionDuration
             )
         else {
             recommendedTempBasal = nil
@@ -600,50 +756,30 @@ final class LoopDataManager {
         recommendedTempBasal = (recommendedDate: Date(), rate: tempBasal.rate, duration: tempBasal.duration)
     }
 
-    func addCarbEntryAndRecommendBolus(_ carbEntry: CarbEntry, resultsHandler: @escaping (_ recommendation: BolusRecommendation?, _ error: Error?) -> Void) {
-        if let carbStore = deviceDataManager.carbStore {
-            carbStore.addCarbEntry(carbEntry) { (success, _, error) in
-                self.dataAccessQueue.async {
-                    if success {
-                        self.carbEffect = nil
-                        self.carbsOnBoardSeries = nil
-
-                        do {
-                            try self.update()
-
-                            resultsHandler(try self.recommendBolus(), nil)
-                        } catch let error {
-                            resultsHandler(nil, error)
-                        }
-                    } else {
-                        resultsHandler(nil, error)
-                    }
-                }
-            }
-        } else {
-            resultsHandler(nil, LoopError.configurationError("Carb Store"))
-        }
-    }
+    /// - Returns: A bolus recommendation from the current data
+    /// - Throws: 
+    ///     - LoopError.configurationError
+    ///     - LoopError.glucoseTooOld
+    ///     - LoopError.missingDataError
+    fileprivate func recommendBolus() throws -> BolusRecommendation {
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
 
-    private func recommendBolus() throws -> BolusRecommendation {
-        guard let minimumBGGuard = self.deviceDataManager.minimumBGGuard else {
+        guard let minimumBGGuard = settings.minimumBGGuard else {
             throw LoopError.configurationError("Minimum BG Guard")
         }
 
-        guard let
-            glucose = self.predictedGlucose,
-            let glucoseWithoutMomentum = self.predictedGlucoseWithoutMomentum,
-            let maxBolus = self.deviceDataManager.maximumBolus,
-            let glucoseTargetRange = self.deviceDataManager.glucoseTargetRangeSchedule,
-            let insulinSensitivity = self.deviceDataManager.insulinSensitivitySchedule,
-            let basalRates = self.deviceDataManager.basalRateSchedule
+        guard
+            let predictedGlucose = predictedGlucose,
+            let maxBolus = settings.maximumBolus,
+            let glucoseTargetRange = settings.glucoseTargetRangeSchedule,
+            let insulinSensitivity = insulinSensitivitySchedule,
+            let basalRates = basalRateSchedule,
+            let insulinActionDuration = insulinActionDuration
         else {
             throw LoopError.configurationError("Check Settings")
         }
 
-        let recencyInterval = TimeInterval(minutes: 15)
-        
-        guard let glucoseDate = glucose.first?.startDate else {
+        guard let glucoseDate = predictedGlucose.first?.startDate else {
             throw LoopError.missingDataError(details: "No glucose data found", recovery: "Check your CGM source")
         }
 
@@ -653,122 +789,218 @@ final class LoopDataManager {
 
         let pendingInsulin = try self.getPendingInsulin()
 
-        let recommendationWithMomentum = DoseMath.recommendBolusFromPredictedGlucose(glucose,
+        let recommendation = DoseMath.recommendBolusFromPredictedGlucose(predictedGlucose,
             maxBolus: maxBolus,
             glucoseTargetRange: glucoseTargetRange,
             insulinSensitivity: insulinSensitivity,
             basalRateSchedule: basalRates,
             pendingInsulin: pendingInsulin,
-            minimumBGGuard: minimumBGGuard
+            minimumBGGuard: minimumBGGuard,
+            insulinActionDuration: insulinActionDuration
         )
 
-        let recommendationWithoutMomentum = DoseMath.recommendBolusFromPredictedGlucose(glucoseWithoutMomentum,
-            maxBolus: maxBolus,
-            glucoseTargetRange: glucoseTargetRange,
-            insulinSensitivity: insulinSensitivity,
-            basalRateSchedule: basalRates,
-            pendingInsulin: pendingInsulin,
-            minimumBGGuard: minimumBGGuard
-        )
-        
-        if (recommendationWithMomentum.amount > recommendationWithoutMomentum.amount) {
-            return recommendationWithoutMomentum
-        } else {
-            return recommendationWithMomentum
-        }
+        return recommendation
     }
 
-    func getRecommendedBolus(_ resultsHandler: @escaping (_ units: BolusRecommendation?, _ error: Error?) -> Void) {
-        dataAccessQueue.async {
-            do {
-                let recommendation = try self.recommendBolus()
-                resultsHandler(recommendation, nil)
-            } catch let error {
-                resultsHandler(nil, error)
-            }
-        }
-    }
+    /// *This method should only be called from the `dataAccessQueue`*
+    private func setRecommendedTempBasal(_ completion: @escaping (_ error: Error?) -> Void) {
+        dispatchPrecondition(condition: .onQueue(dataAccessQueue))
 
-    private func setRecommendedTempBasal(_ resultsHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         guard let recommendedTempBasal = self.recommendedTempBasal else {
-            resultsHandler(true, nil)
+            completion(nil)
             return
         }
 
         guard abs(recommendedTempBasal.recommendedDate.timeIntervalSinceNow) < TimeInterval(minutes: 5) else {
-            resultsHandler(false, LoopError.recommendationExpired(date: recommendedTempBasal.recommendedDate))
+            completion(LoopError.recommendationExpired(date: recommendedTempBasal.recommendedDate))
             return
         }
 
-        guard let device = self.deviceDataManager.rileyLinkManager.firstConnectedDevice else {
-            resultsHandler(false, LoopError.connectionError)
-            return
+        delegate.loopDataManager(self, didRecommendBasalChange: recommendedTempBasal) { (result) in
+            self.dataAccessQueue.async {
+                switch result {
+                case .success(let basal):
+                    self.lastTempBasal = basal
+                    self.recommendedTempBasal = nil
+
+                    completion(nil)
+                case .failure(let error):
+                    completion(error)
+                }
+            }
         }
+    }
+}
 
-        guard let ops = device.ops else {
-            resultsHandler(false, LoopError.configurationError("PumpOps"))
-            return
+
+/// Describes a view into the loop state
+protocol LoopState {
+    /// An error in the current state of the loop, or one that happened during the last attempt to loop.
+    var error: Error? { get }
+
+    /// The last date at which a loop completed, from prediction to dose (if dosing is enabled)
+    var lastLoopCompleted: Date? { get }
+
+    /// The last set temp basal
+    var lastTempBasal: DoseEntry? { get }
+
+    /// The calculated timeline of predicted glucose values
+    var predictedGlucose: [GlucoseValue]? { get }
+
+    /// The recommended temp basal based on predicted glucose
+    var recommendedTempBasal: LoopDataManager.TempBasalRecommendation? { get }
+
+    /// The retrospective prediction over a recent period of glucose samples
+    var retrospectivePredictedGlucose: [GlucoseValue]? { get }
+
+    /// Calculates a new prediction from the current data using the specified effect inputs
+    ///
+    /// This method is intended for visualization purposes only, not dosing calculation. No validation of input data is done.
+    ///
+    /// - Parameter inputs: The effect inputs to include
+    /// - Returns: An timeline of predicted glucose values
+    /// - Throws: LoopError.missingDataError if prediction cannot be computed
+    func predictGlucose(using inputs: PredictionInputEffect) throws -> [GlucoseValue]
+
+    /// Calculates a recommended bolus based on predicted glucose
+    ///
+    /// - Returns: A bolus recommendation
+    /// - Throws: An error describing why a bolus couldn't be computed
+    ///     - LoopError.configurationError
+    ///     - LoopError.glucoseTooOld
+    ///     - LoopError.missingDataError
+    func recommendBolus() throws -> BolusRecommendation
+
+    // TODO: These values are duplicative and don't need to be cached in LoopDataManager
+
+    /// Current carbs on board
+    var carbsOnBoard: CarbValue? { get }
+
+    /// Current insulin on board
+    var insulinOnBoard: InsulinValue? { get }
+}
+
+
+extension LoopDataManager {
+    private struct LoopStateView: LoopState {
+        private let loopDataManager: LoopDataManager
+        private let updateError: Error?
+
+        init(loopDataManager: LoopDataManager, updateError: Error?) {
+            self.loopDataManager = loopDataManager
+            self.updateError = updateError
         }
 
-        ops.setTempBasal(rate: recommendedTempBasal.rate, duration: recommendedTempBasal.duration) { (result) -> Void in
-            switch result {
-            case .success(let body):
-                self.dataAccessQueue.async {
-                    let now = Date()
-                    let endDate = now.addingTimeInterval(body.timeRemaining)
-                    let startDate = endDate.addingTimeInterval(-recommendedTempBasal.duration)
+        var error: Error? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return updateError ?? loopDataManager.lastLoopError
+        }
 
-                    self.lastTempBasal = DoseEntry(type: .tempBasal, startDate: startDate, endDate: endDate, value: body.rate, unit: .unitsPerHour)
-                    self.recommendedTempBasal = nil
+        var lastLoopCompleted: Date? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.lastLoopCompleted
+        }
 
-                    resultsHandler(true, nil)
-                }
-            case .failure(let error):
-                resultsHandler(false, error)
-            }
+        var lastTempBasal: DoseEntry? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.lastTempBasal
         }
-    }
 
-    func enactRecommendedTempBasal(_ resultsHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
-        dataAccessQueue.async {
-            self.setRecommendedTempBasal(resultsHandler)
+        var predictedGlucose: [GlucoseValue]? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.predictedGlucose
+        }
+
+        var recommendedTempBasal: LoopDataManager.TempBasalRecommendation? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.recommendedTempBasal
+        }
+
+        var retrospectivePredictedGlucose: [GlucoseValue]? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.retrospectivePredictedGlucose
+        }
+
+        var carbsOnBoard: CarbValue? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.carbsOnBoardSeries?.closestPriorToDate(Date())
+        }
+
+        var insulinOnBoard: InsulinValue? {
+            dispatchPrecondition(condition: .onQueue(loopDataManager.dataAccessQueue))
+            return loopDataManager.insulinOnBoard
+        }
+
+        func predictGlucose(using inputs: PredictionInputEffect) throws -> [GlucoseValue] {
+            return try loopDataManager.predictGlucose(using: inputs)
+        }
+
+        func recommendBolus() throws -> BolusRecommendation {
+            return try loopDataManager.recommendBolus()
         }
     }
-    
-    /**
-     Informs the loop algorithm of an enacted bolus
 
-     - parameter units: The amount of insulin
-     - parameter date:  The date the bolus was set
-     */
-    func recordBolus(_ units: Double, at date: Date) {
+    /// Executes a closure with access to the current state of the loop.
+    ///
+    /// This operation is performed asynchronously and the closure will be executed on an arbitrary background queue.
+    ///
+    /// - Parameter handler: A closure called when the state is ready
+    /// - Parameter manager: The loop manager
+    /// - Parameter state: The current state of the manager. This is invalid to access outside of the closure.
+    func getLoopState(_ handler: @escaping (_ manager: LoopDataManager, _ state: LoopState) -> Void) {
         dataAccessQueue.async {
-            self.lastBolus = (units: units, date: date)
-            self.notify(forChange: .bolus)
+            var updateError: Error?
+
+            do {
+                try self.update()
+            } catch let error {
+                updateError = error
+            }
+
+            handler(self, LoopStateView(loopDataManager: self, updateError: updateError))
         }
     }
 }
 
+
 extension LoopDataManager {
     /// Generates a diagnostic report about the current state
     ///
     /// This operation is performed asynchronously and the completion will be executed on an arbitrary background queue.
     ///
-    /// - parameter completionHandler: A closure called once the report has been generated. The closure takes a single argument of the report string.
-    func generateDiagnosticReport(_ completionHandler: @escaping (_ report:     String) -> Void) {
-        getLoopStatus { (predictedGlucose, retrospectivePredictedGlucose, recommendedTempBasal, lastTempBasal, lastLoopCompleted, insulinOnBoard, carbsOnBoard, error) in
-            let report = [
+    /// - parameter completion: A closure called once the report has been generated. The closure takes a single argument of the report string.
+    func generateDiagnosticReport(_ completion: @escaping (_ report: String) -> Void) {
+        getLoopState { (manager, state) in
+            var entries = [
                 "## LoopDataManager",
-                "predictedGlucose: \(predictedGlucose ?? [])",
-                "retrospectivePredictedGlucose: \(retrospectivePredictedGlucose ?? [])",
-                "recommendedTempBasal: \(String(describing: recommendedTempBasal))",
-                "lastTempBasal: \(String(describing: lastTempBasal))",
-                "lastLoopCompleted: \(lastLoopCompleted ?? .distantPast)",
-                "insulinOnBoard: \(String(describing: insulinOnBoard))",
-                "carbsOnBoard: \(String(describing: carbsOnBoard))",
-                "error: \(String(describing: error))"
+                "settings: \(String(reflecting: manager.settings))",
+                "predictedGlucose: \(state.predictedGlucose ?? [])",
+                "retrospectivePredictedGlucose: \(state.retrospectivePredictedGlucose ?? [])",
+                "recommendedTempBasal: \(String(describing: state.recommendedTempBasal))",
+                "lastTempBasal: \(String(describing: state.lastTempBasal))",
+                "lastBolus: \(String(describing: manager.lastBolus))",
+                "lastLoopCompleted: \(String(describing: state.lastLoopCompleted))",
+                "insulinOnBoard: \(String(describing: state.insulinOnBoard))",
+                "carbsOnBoard: \(String(describing: state.carbsOnBoard))",
+                "error: \(String(describing: state.error))"
             ]
-            completionHandler(report.joined(separator: "\n"))
+
+            self.glucoseStore.generateDiagnosticReport { (report) in
+                entries.append(report)
+                entries.append("")
+
+                self.carbStore.generateDiagnosticReport { (report) in
+                    entries.append(report)
+                    entries.append("")
+
+                    self.doseStore.generateDiagnosticReport { (report) in
+                        entries.append(report)
+                        entries.append("")
+
+                        completion(entries.joined(separator: "\n"))
+                    }
+                }
+            }
         }
     }
 }
@@ -779,3 +1011,16 @@ extension Notification.Name {
 
     static let LoopRunning = Notification.Name(rawValue: "com.loudnate.Naterade.notification.LoopRunning")
 }
+
+
+protocol LoopDataManagerDelegate: class {
+
+    /// Informs the delegate that an immediate basal change is recommended
+    ///
+    /// - Parameters:
+    ///   - manager: The manager
+    ///   - basal: The new recommended basal
+    ///   - completion: A closure called once on completion
+    ///   - result: The enacted basal
+    func loopDataManager(_ manager: LoopDataManager, didRecommendBasalChange basal: LoopDataManager.TempBasalRecommendation, completion: @escaping (_ result: Result<DoseEntry>) -> Void) -> Void
+}
diff --git a/Loop/Managers/NightscoutDataManager.swift b/Loop/Managers/NightscoutDataManager.swift
index 9a2404819..24f3f6204 100644
--- a/Loop/Managers/NightscoutDataManager.swift
+++ b/Loop/Managers/NightscoutDataManager.swift
@@ -34,23 +34,38 @@ final class NightscoutDataManager {
             let context = LoopDataManager.LoopUpdateContext(rawValue: rawContext),
             case .tempBasal = context
         else {
-                return
+            return
         }
 
-        deviceDataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, _, insulinOnBoard, carbsOnBoard, loopError) in
-            
-            self.deviceDataManager.loopManager.getRecommendedBolus { (recommendation, getBolusError) in
-                if let getBolusError = getBolusError {
-                    self.deviceDataManager.logger.addError(getBolusError, fromSource: "NightscoutDataManager")
+        deviceDataManager.loopManager.getLoopState { (_, state) in
+            var loopError = state.error
+            let recommendation: Double?
+
+            do {
+                recommendation = try state.recommendBolus().amount
+            } catch let error {
+                recommendation = nil
+
+                if loopError == nil {
+                    loopError = error
                 }
-                self.uploadLoopStatus(insulinOnBoard, carbsOnBoard: carbsOnBoard, predictedGlucose: predictedGlucose, recommendedTempBasal: recommendedTempBasal, recommendedBolus: recommendation?.amount, lastTempBasal: lastTempBasal, loopError: loopError ?? getBolusError)
             }
+
+            self.uploadLoopStatus(
+                insulinOnBoard: state.insulinOnBoard,
+                carbsOnBoard: state.carbsOnBoard,
+                predictedGlucose: state.predictedGlucose,
+                recommendedTempBasal: state.recommendedTempBasal,
+                recommendedBolus: recommendation,
+                lastTempBasal: state.lastTempBasal,
+                loopError: loopError
+            )
         }
     }
     
     private var lastTempBasalUploaded: DoseEntry?
 
-    func uploadLoopStatus(_ insulinOnBoard: InsulinValue? = nil, carbsOnBoard: CarbValue? = nil, predictedGlucose: [GlucoseValue]? = nil, recommendedTempBasal: LoopDataManager.TempBasalRecommendation? = nil, recommendedBolus: Double? = nil, lastTempBasal: DoseEntry? = nil, loopError: Error? = nil) {
+    func uploadLoopStatus(insulinOnBoard: InsulinValue? = nil, carbsOnBoard: CarbValue? = nil, predictedGlucose: [GlucoseValue]? = nil, recommendedTempBasal: LoopDataManager.TempBasalRecommendation? = nil, recommendedBolus: Double? = nil, lastTempBasal: DoseEntry? = nil, loopError: Error? = nil) {
 
         guard deviceDataManager.remoteDataManager.nightscoutService.uploader != nil else {
             return
diff --git a/Loop/Managers/NotificationManager.swift b/Loop/Managers/NotificationManager.swift
index 6667183cd..18e6ae97b 100644
--- a/Loop/Managers/NotificationManager.swift
+++ b/Loop/Managers/NotificationManager.swift
@@ -9,36 +9,38 @@
 import UIKit
 import UserNotifications
 
+import RileyLinkKit
+
 
 struct NotificationManager {
     enum Category: String {
-        case BolusFailure
-        case LoopNotRunning
-        case PumpBatteryLow
-        case PumpReservoirEmpty
-        case PumpReservoirLow
+        case bolusFailure
+        case loopNotRunning
+        case pumpBatteryLow
+        case pumpReservoirEmpty
+        case pumpReservoirLow
     }
 
     enum Action: String {
-        case RetryBolus
+        case retryBolus
     }
 
     enum UserInfoKey: String {
-        case BolusAmount
-        case BolusStartDate
+        case bolusAmount
+        case bolusStartDate
     }
 
     private static var notificationCategories: Set<UNNotificationCategory> {
         var categories = [UNNotificationCategory]()
 
         let retryBolusAction = UNNotificationAction(
-            identifier: Action.RetryBolus.rawValue,
+            identifier: Action.retryBolus.rawValue,
             title: NSLocalizedString("Retry", comment: "The title of the notification action to retry a bolus command"),
             options: []
         )
 
         categories.append(UNNotificationCategory(
-            identifier: Category.BolusFailure.rawValue,
+            identifier: Category.bolusFailure.rawValue,
             actions: [retryBolusAction],
             intentIdentifiers: [],
             options: []
@@ -57,25 +59,35 @@ struct NotificationManager {
 
     // MARK: - Notifications
 
-    static func sendBolusFailureNotificationForAmount(_ units: Double, atStartDate startDate: Date) {
+    static func sendBolusFailureNotification(for error: Error, units: Double, at startDate: Date) {
         let notification = UNMutableNotificationContent()
 
         notification.title = NSLocalizedString("Bolus", comment: "The notification title for a bolus failure")
-        notification.body = String(format: NSLocalizedString("%@ U bolus may have failed.", comment: "The notification alert describing a possible bolus failure. The substitution parameter is the size of the bolus in units."), NumberFormatter.localizedString(from: NSNumber(value: units), number: .decimal))
+
+        switch error {
+        case let error as RileyLinkKit.SetBolusError:
+            notification.subtitle = error.errorDescriptionWithUnits(units)
+            notification.body = String(format: "%@ %@", error.failureReason!, error.recoverySuggestion!)
+        case let error as LocalizedError:
+            notification.body = error.errorDescription ?? error.localizedDescription
+        default:
+            notification.body = error.localizedDescription
+        }
+
         notification.sound = UNNotificationSound.default()
 
         if startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5) {
-            notification.categoryIdentifier = Category.BolusFailure.rawValue
+            notification.categoryIdentifier = Category.bolusFailure.rawValue
         }
 
         notification.userInfo = [
-            UserInfoKey.BolusAmount.rawValue: units,
-            UserInfoKey.BolusStartDate.rawValue: startDate
+            UserInfoKey.bolusAmount.rawValue: units,
+            UserInfoKey.bolusStartDate.rawValue: startDate
         ]
 
         let request = UNNotificationRequest(
             // Only support 1 bolus notification at once
-            identifier: Category.BolusFailure.rawValue,
+            identifier: Category.bolusFailure.rawValue,
             content: notification,
             trigger: nil
         )
@@ -107,11 +119,11 @@ struct NotificationManager {
 
             notification.title = NSLocalizedString("Loop Failure", comment: "The notification title for a loop failure")
             notification.sound = UNNotificationSound.default()
-            notification.categoryIdentifier = Category.LoopNotRunning.rawValue
-            notification.threadIdentifier = Category.LoopNotRunning.rawValue
+            notification.categoryIdentifier = Category.loopNotRunning.rawValue
+            notification.threadIdentifier = Category.loopNotRunning.rawValue
 
             let request = UNNotificationRequest(
-                identifier: "\(Category.LoopNotRunning.rawValue)\(failureInterval)",
+                identifier: "\(Category.loopNotRunning.rawValue)\(failureInterval)",
                 content: notification,
                 trigger: UNTimeIntervalNotificationTrigger(
                     timeInterval: failureInterval + gracePeriod,
@@ -129,10 +141,10 @@ struct NotificationManager {
         notification.title = NSLocalizedString("Pump Battery Low", comment: "The notification title for a low pump battery")
         notification.body = NSLocalizedString("Change the pump battery immediately", comment: "The notification alert describing a low pump battery")
         notification.sound = UNNotificationSound.default()
-        notification.categoryIdentifier = Category.PumpBatteryLow.rawValue
+        notification.categoryIdentifier = Category.pumpBatteryLow.rawValue
 
         let request = UNNotificationRequest(
-            identifier: Category.PumpBatteryLow.rawValue,
+            identifier: Category.pumpBatteryLow.rawValue,
             content: notification,
             trigger: nil
         )
@@ -146,11 +158,11 @@ struct NotificationManager {
         notification.title = NSLocalizedString("Pump Reservoir Empty", comment: "The notification title for an empty pump reservoir")
         notification.body = NSLocalizedString("Change the pump reservoir now", comment: "The notification alert describing an empty pump reservoir")
         notification.sound = UNNotificationSound.default()
-        notification.categoryIdentifier = Category.PumpReservoirEmpty.rawValue
+        notification.categoryIdentifier = Category.pumpReservoirEmpty.rawValue
 
         let request = UNNotificationRequest(
             // Not a typo: this should replace any pump reservoir low notifications
-            identifier: Category.PumpReservoirLow.rawValue,
+            identifier: Category.pumpReservoirLow.rawValue,
             content: notification,
             trigger: nil
         )
@@ -179,10 +191,10 @@ struct NotificationManager {
         }
 
         notification.sound = UNNotificationSound.default()
-        notification.categoryIdentifier = Category.PumpReservoirLow.rawValue
+        notification.categoryIdentifier = Category.pumpReservoirLow.rawValue
 
         let request = UNNotificationRequest(
-            identifier: Category.PumpReservoirLow.rawValue,
+            identifier: Category.pumpReservoirLow.rawValue,
             content: notification,
             trigger: nil
         )
diff --git a/Loop/Managers/StatusExtensionDataManager.swift b/Loop/Managers/StatusExtensionDataManager.swift
index 59ad72632..137c4be6f 100644
--- a/Loop/Managers/StatusExtensionDataManager.swift
+++ b/Loop/Managers/StatusExtensionDataManager.swift
@@ -30,7 +30,7 @@ final class StatusExtensionDataManager {
     }
 
     @objc private func update(_ notification: Notification) {
-        self.dataManager.glucoseStore?.preferredUnit() { (unit, error) in
+        self.dataManager.loopManager.glucoseStore.preferredUnit() { (unit, error) in
             if error == nil, let unit = unit {
                 self.createContext(glucoseUnit: unit) { (context) in
                     if let context = context {
@@ -42,14 +42,7 @@ final class StatusExtensionDataManager {
     }
 
     private func createContext(glucoseUnit: HKUnit, _ completionHandler: @escaping (_ context: StatusExtensionContext?) -> Void) {
-        guard let glucoseStore = self.dataManager.glucoseStore else {
-            completionHandler(nil)
-            return
-        }
-        
-        dataManager.loopManager.getLoopStatus {
-            (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, _, _, error) in
-
+        dataManager.loopManager.getLoopState { (manager, state) in
             let dataManager = self.dataManager
             var context = StatusExtensionContext()
         
@@ -67,22 +60,24 @@ final class StatusExtensionDataManager {
                 )
                 context.predictedGlucose = PredictedGlucoseContext(
                     values: (1...36).map { 89.123 + Double($0 * 5) }, // 3 hours of linear data
-                    unit: HKUnit.milligramsPerDeciliterUnit(),
+                    unit: HKUnit.milligramsPerDeciliter(),
                     startDate: Date(),
                     interval: TimeInterval(minutes: 5))
 
                 let lastLoopCompleted = Date(timeIntervalSinceNow: -TimeInterval(minutes: 0))
             #else
-                guard error == nil else {
+                guard state.error == nil else {
                     // TODO: unclear how to handle the error here properly.
                     completionHandler(nil)
                     return
                 }
+                let lastLoopCompleted = state.lastLoopCompleted
             #endif
 
             context.loop = LoopContext(
-                dosingEnabled: dataManager.loopManager.dosingEnabled,
-                lastCompleted: lastLoopCompleted)
+                dosingEnabled: manager.settings.dosingEnabled,
+                lastCompleted: lastLoopCompleted
+            )
 
             let updateGroup = DispatchGroup()
 
@@ -92,7 +87,7 @@ final class StatusExtensionDataManager {
             let chartEndDate = Date().addingTimeInterval(TimeInterval(hours: 3))
 
             updateGroup.enter()
-            glucoseStore.getCachedGlucoseValues(start: chartStartDate, end: Date()) {
+            manager.glucoseStore.getCachedGlucoseValues(start: chartStartDate, end: Date()) {
                 (values) in
                 context.glucose = values.map({
                     return GlucoseContext(
@@ -101,31 +96,34 @@ final class StatusExtensionDataManager {
                         startDate: $0.startDate
                     )
                 })
-                
-                // Only tranfer the predicted glucose if we have glucose history
-                // Drop the first element in predictedGlucose because it is the currentGlucose
-                // and will have a different interval to the next element
-                if let predictedGlucose = predictedGlucose?.dropFirst(),
-                    predictedGlucose.count > 1 {
-                    let first = predictedGlucose[predictedGlucose.startIndex]
-                    let second = predictedGlucose[predictedGlucose.startIndex.advanced(by: 1)]
-                    context.predictedGlucose = PredictedGlucoseContext(
-                        values: predictedGlucose.map { $0.quantity.doubleValue(for: glucoseUnit) },
-                        unit: glucoseUnit,
-                        startDate: first.startDate,
-                        interval: second.startDate.timeIntervalSince(first.startDate))
-                }
                 updateGroup.leave()
             }
 
-            if let lastNetBasal = dataManager.loopManager.lastNetBasal {
-                context.netBasal = NetBasalContext(
-                    rate: lastNetBasal.rate,
-                    percentage: lastNetBasal.percent,
-                    startDate: lastNetBasal.startDate)
+            // Drop the first element in predictedGlucose because it is the currentGlucose
+            // and will have a different interval to the next element
+            if let predictedGlucose = state.predictedGlucose?.dropFirst(),
+                predictedGlucose.count > 1 {
+                let first = predictedGlucose[predictedGlucose.startIndex]
+                let second = predictedGlucose[predictedGlucose.startIndex.advanced(by: 1)]
+                context.predictedGlucose = PredictedGlucoseContext(
+                    values: predictedGlucose.map { $0.quantity.doubleValue(for: glucoseUnit) },
+                    unit: glucoseUnit,
+                    startDate: first.startDate,
+                    interval: second.startDate.timeIntervalSince(first.startDate))
+            }
+
+            let date = state.lastTempBasal?.startDate ?? Date()
+            if let scheduledBasal = manager.basalRateSchedule?.between(start: date, end: date).first {
+                let netBasal = NetBasal(
+                    lastTempBasal: state.lastTempBasal,
+                    maxBasal: manager.settings.maximumBasalRatePerHour,
+                    scheduledBasal: scheduledBasal
+                )
+
+                context.netBasal = NetBasalContext(rate: netBasal.rate, percentage: netBasal.percent, startDate: netBasal.startDate)
             }
             
-            if let reservoir = dataManager.doseStore.lastReservoirValue,
+            if let reservoir = manager.doseStore.lastReservoirValue,
                let capacity = dataManager.pumpState?.pumpModel?.reservoirCapacity {
                 context.reservoir = ReservoirContext(
                     startDate: reservoir.startDate,
@@ -138,15 +136,16 @@ final class StatusExtensionDataManager {
                 context.batteryPercentage = batteryPercentage
             }
         
-            if let targetRanges = self.dataManager.glucoseTargetRangeSchedule {
+            if let targetRanges = manager.settings.glucoseTargetRangeSchedule {
                 context.targetRanges = targetRanges.between(start: chartStartDate, end: chartEndDate)
-                    .map({
+                    .map {
                         return DatedRangeContext(
                             startDate: $0.startDate,
                             endDate: $0.endDate,
                             minValue: $0.value.minValue,
-                            maxValue: $0.value.maxValue)
-                    })
+                            maxValue: $0.value.maxValue
+                        )
+                    }
 
                 if let override = targetRanges.temporaryOverride {
                     context.temporaryOverride = DatedRangeContext(
@@ -165,9 +164,9 @@ final class StatusExtensionDataManager {
                     isLocal: sensorInfo.isLocal)
             }
 
-            updateGroup.notify(queue: DispatchQueue.global(qos: .background), execute: {
+            updateGroup.notify(queue: DispatchQueue.global(qos: .background)) {
                 completionHandler(context)
-            })
+            }
         }
     }
 }
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
index 028ab69d6..1834842d8 100644
--- a/Loop/Managers/WatchDataManager.swift
+++ b/Loop/Managers/WatchDataManager.swift
@@ -62,18 +62,17 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
     private var lastComplicationContext: WatchContext?
 
     private let minTrendDrift: Double = 20
-    private lazy var minTrendUnit = HKUnit.milligramsPerDeciliterUnit()
+    private lazy var minTrendUnit = HKUnit.milligramsPerDeciliter()
 
     private func sendWatchContext(_ context: WatchContext) {
         if let session = watchSession, session.isPaired && session.isWatchAppInstalled {
-
             let complicationShouldUpdate: Bool
 
             if let lastContext = lastComplicationContext,
                 let lastGlucose = lastContext.glucose, let lastGlucoseDate = lastContext.glucoseDate,
                 let newGlucose = context.glucose, let newGlucoseDate = context.glucoseDate
             {
-                let enoughTimePassed = newGlucoseDate.timeIntervalSince(lastGlucoseDate as Date).minutes >= 30
+                let enoughTimePassed = newGlucoseDate.timeIntervalSince(lastGlucoseDate).minutes >= 30
                 let enoughTrendDrift = abs(newGlucose.doubleValue(for: minTrendUnit) - lastGlucose.doubleValue(for: minTrendUnit)) >= minTrendDrift
 
                 complicationShouldUpdate = enoughTimePassed || enoughTrendDrift
@@ -94,58 +93,49 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
         }
     }
 
-    private func createWatchContext(_ completionHandler: @escaping (_ context: WatchContext?) -> Void) {
-
-        guard let glucoseStore = self.deviceDataManager.glucoseStore else {
-            completionHandler(nil)
-            return
-        }
-
-        let glucose = deviceDataManager.glucoseStore?.latestGlucose
-        let reservoir = deviceDataManager.doseStore.lastReservoirValue
-        let maxBolus = deviceDataManager.maximumBolus
-
-        deviceDataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, _, _, error) in
-            let eventualGlucose = predictedGlucose?.last
+    private func createWatchContext(_ completion: @escaping (_ context: WatchContext?) -> Void) {
+        let loopManager = deviceDataManager.loopManager!
 
-            self.deviceDataManager.loopManager.getRecommendedBolus { (recommendation, error) in
-                glucoseStore.preferredUnit { (unit, error) in
-                    let context = WatchContext(glucose: glucose, eventualGlucose: eventualGlucose, glucoseUnit: unit)
-                    context.reservoir = reservoir?.unitVolume
+        let glucose = loopManager.glucoseStore.latestGlucose
+        let reservoir = loopManager.doseStore.lastReservoirValue
 
-                    context.loopLastRunDate = lastLoopCompleted
-                    context.recommendedBolusDose = recommendation?.amount
-                    context.maxBolus = maxBolus
+        loopManager.glucoseStore.preferredUnit { (unit, error) in
+            loopManager.getLoopState { (manager, state) in
+                let eventualGlucose = state.predictedGlucose?.last
+                let context = WatchContext(glucose: glucose, eventualGlucose: eventualGlucose, glucoseUnit: unit)
+                context.reservoir = reservoir?.unitVolume
 
-                    if let trend = self.deviceDataManager.sensorInfo?.trendType {
-                        context.glucoseTrendRawValue = trend.rawValue
-                    }
+                context.loopLastRunDate = state.lastLoopCompleted
+                context.recommendedBolusDose = try? state.recommendBolus().amount
+                context.maxBolus = manager.settings.maximumBolus
 
-                    completionHandler(context)
+                if let trend = self.deviceDataManager.sensorInfo?.trendType {
+                    context.glucoseTrendRawValue = trend.rawValue
                 }
+
+                completion(context)
             }
         }
     }
 
     private func addCarbEntryFromWatchMessage(_ message: [String: Any], completionHandler: ((_ units: Double?) -> Void)? = nil) {
-        if let carbStore = deviceDataManager.carbStore, let carbEntry = CarbEntryUserInfo(rawValue: message) {
+        if let carbEntry = CarbEntryUserInfo(rawValue: message) {
             let newEntry = NewCarbEntry(
-                quantity: HKQuantity(unit: carbStore.preferredUnit, doubleValue: carbEntry.value),
+                quantity: HKQuantity(unit: deviceDataManager.loopManager.carbStore.preferredUnit, doubleValue: carbEntry.value),
                 startDate: carbEntry.startDate,
                 foodType: nil,
-                absorptionTime: carbEntry.absorptionTimeType.absorptionTimeFromDefaults(carbStore.defaultAbsorptionTimes)
+                absorptionTime: carbEntry.absorptionTimeType.absorptionTimeFromDefaults(deviceDataManager.loopManager.carbStore.defaultAbsorptionTimes)
             )
 
-            deviceDataManager.loopManager.addCarbEntryAndRecommendBolus(newEntry) { (recommendation, error) in
-                NotificationCenter.default.post(name: .CarbEntriesDidUpdate, object: nil)
-
-                if let error = error {
-                    self.deviceDataManager.logger.addError(error, fromSource: error is CarbStore.CarbStoreError ? "CarbStore" : "Bolus")
-                } else {
+            deviceDataManager.loopManager.addCarbEntryAndRecommendBolus(newEntry) { (result) in
+                switch result {
+                case .success(let recommendation):
                     AnalyticsManager.sharedManager.didAddCarbsFromWatch(carbEntry.value)
+                    completionHandler?(recommendation?.amount)
+                case .failure(let error):
+                    self.deviceDataManager.logger.addError(error, fromSource: error is CarbStore.CarbStoreError ? "CarbStore" : "Bolus")
+                    completionHandler?(nil)
                 }
-
-                completionHandler?(recommendation?.amount)
             }
         } else {
             completionHandler?(nil)
@@ -158,14 +148,12 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
         switch message["name"] as? String {
         case CarbEntryUserInfo.name?:
             addCarbEntryFromWatchMessage(message) { (units) in
-                replyHandler(BolusSuggestionUserInfo(recommendedBolus: units ?? 0, maxBolus: self.deviceDataManager.maximumBolus).rawValue)
+                replyHandler(BolusSuggestionUserInfo(recommendedBolus: units ?? 0, maxBolus: self.deviceDataManager.loopManager.settings.maximumBolus).rawValue)
             }
         case SetBolusUserInfo.name?:
             if let bolus = SetBolusUserInfo(rawValue: message as SetBolusUserInfo.RawValue) {
-                self.deviceDataManager.enactBolus(units: bolus.value) { (error) in
-                    if error != nil {
-                        NotificationManager.sendBolusFailureNotificationForAmount(bolus.value, atStartDate: bolus.startDate)
-                    } else {
+                self.deviceDataManager.enactBolus(units: bolus.value, at: bolus.startDate) { (error) in
+                    if error == nil {
                         AnalyticsManager.sharedManager.didSetBolusFromWatch(bolus.value)
                     }
 
diff --git a/Loop/Models/BolusRecommendation.swift b/Loop/Models/BolusRecommendation.swift
index e72e1d3f9..e09eadde6 100644
--- a/Loop/Models/BolusRecommendation.swift
+++ b/Loop/Models/BolusRecommendation.swift
@@ -10,6 +10,7 @@ import Foundation
 import LoopKit
 import HealthKit
 
+
 enum BolusRecommendationNotice: CustomStringConvertible, Equatable {
     case glucoseBelowMinimumGuard(minGlucose: GlucoseValue, unit: HKUnit)
     case currentGlucoseBelowTarget(glucose: GlucoseValue, unit: HKUnit)
@@ -73,3 +74,15 @@ struct BolusRecommendation {
         self.notice = notice
     }
 }
+
+
+extension BolusRecommendation: Comparable {
+    static func ==(lhs: BolusRecommendation, rhs: BolusRecommendation) -> Bool {
+        return lhs.amount == rhs.amount
+    }
+
+    static func <(lhs: BolusRecommendation, rhs: BolusRecommendation) -> Bool {
+        return lhs.amount < rhs.amount
+    }
+}
+
diff --git a/Loop/Models/GlucoseG4.swift b/Loop/Models/GlucoseG4.swift
index de8b64f0a..52e893d7a 100644
--- a/Loop/Models/GlucoseG4.swift
+++ b/Loop/Models/GlucoseG4.swift
@@ -15,7 +15,7 @@ import LoopUI
 
 extension GlucoseG4: GlucoseValue {
     public var quantity: HKQuantity {
-        return HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose))
+        return HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: Double(glucose))
     }
 
     public var startDate: Date {
diff --git a/Loop/Models/GlucoseThreshold.swift b/Loop/Models/GlucoseThreshold.swift
index 19607343e..8fa3b589c 100644
--- a/Loop/Models/GlucoseThreshold.swift
+++ b/Loop/Models/GlucoseThreshold.swift
@@ -39,3 +39,10 @@ struct GlucoseThreshold: RawRepresentable {
         ]
     }
 }
+
+
+extension GlucoseThreshold: Equatable {
+    static func ==(lhs: GlucoseThreshold, rhs: GlucoseThreshold) -> Bool {
+        return lhs.value == rhs.value
+    }
+}
diff --git a/Loop/Models/LoopError.swift b/Loop/Models/LoopError.swift
index 057ca758d..103fa481d 100644
--- a/Loop/Models/LoopError.swift
+++ b/Loop/Models/LoopError.swift
@@ -7,10 +7,12 @@
 //
 
 import Foundation
+import RileyLinkKit
+
 
 enum LoopError: Error {
-    // Failure during device communication
-    case communicationError
+    // A bolus failed to start
+    case bolusCommand(SetBolusError)
 
     // Missing or unexpected configuration values
     case configurationError(String)
@@ -34,6 +36,7 @@ enum LoopError: Error {
     case invalidData(details: String)
 }
 
+
 extension LoopError: LocalizedError {
 
     public var recoverySuggestion: String? {
@@ -46,14 +49,13 @@ extension LoopError: LocalizedError {
     }
 
     public var errorDescription: String? {
-
         let formatter = DateComponentsFormatter()
         formatter.allowedUnits = [.minute]
         formatter.unitsStyle = .full
 
         switch self {
-        case .communicationError:
-            return NSLocalizedString("Communication Error", comment: "The error message displayed after a communication error.")
+        case .bolusCommand(let error):
+            return error.errorDescription
         case .configurationError(let details):
             return String(format: NSLocalizedString("Configuration Error: %1$@", comment: "The error message displayed for configuration errors. (1: configuration error details)"), details)
         case .connectionError:
@@ -76,3 +78,4 @@ extension LoopError: LocalizedError {
     }
 }
 
+
diff --git a/Loop/Models/LoopSettings.swift b/Loop/Models/LoopSettings.swift
new file mode 100644
index 000000000..be8490fe5
--- /dev/null
+++ b/Loop/Models/LoopSettings.swift
@@ -0,0 +1,84 @@
+//
+//  LoopSettings.swift
+//  Loop
+//
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+import LoopKit
+
+
+struct LoopSettings {
+    var dosingEnabled = false
+
+    var glucoseTargetRangeSchedule: GlucoseRangeSchedule?
+
+    var maximumBasalRatePerHour: Double?
+
+    var maximumBolus: Double?
+
+    var minimumBGGuard: GlucoseThreshold? = nil
+
+    var retrospectiveCorrectionEnabled = false
+}
+
+
+extension LoopSettings {
+    var enabledEffects: PredictionInputEffect {
+        var inputs = PredictionInputEffect.all
+        if !retrospectiveCorrectionEnabled {
+            inputs.remove(.retrospection)
+        }
+        return inputs
+    }
+}
+
+
+extension LoopSettings: RawRepresentable {
+    typealias RawValue = [String: Any]
+    private static let version = 1
+
+    init?(rawValue: RawValue) {
+        guard
+            let version = rawValue["version"] as? Int,
+            version == LoopSettings.version
+        else {
+            return nil
+        }
+
+        if let dosingEnabled = rawValue["dosingEnabled"] as? Bool {
+            self.dosingEnabled = dosingEnabled
+        }
+
+        if let rawValue = rawValue["glucoseTargetRangeSchedule"] as? GlucoseRangeSchedule.RawValue {
+            self.glucoseTargetRangeSchedule = GlucoseRangeSchedule(rawValue: rawValue)
+        }
+
+        self.maximumBasalRatePerHour = rawValue["maximumBasalRatePerHour"] as? Double
+
+        self.maximumBolus = rawValue["maximumBolus"] as? Double
+
+        if let rawThreshold = rawValue["minimumBGGuard"] as? GlucoseThreshold.RawValue {
+            self.minimumBGGuard = GlucoseThreshold(rawValue: rawThreshold)
+        }
+
+        if let retrospectiveCorrectionEnabled = rawValue["retrospectiveCorrectionEnabled"] as? Bool {
+            self.retrospectiveCorrectionEnabled = retrospectiveCorrectionEnabled
+        }
+    }
+
+    var rawValue: RawValue {
+        var raw: RawValue = [
+            "version": LoopSettings.version,
+            "dosingEnabled": dosingEnabled,
+            "retrospectiveCorrectionEnabled": retrospectiveCorrectionEnabled
+        ]
+
+        raw["glucoseTargetRangeSchedule"] = glucoseTargetRangeSchedule?.rawValue
+        raw["maximumBasalRatePerHour"] = maximumBasalRatePerHour
+        raw["maximumBolus"] = maximumBolus
+        raw["minimumBGGuard"] = minimumBGGuard?.rawValue
+
+        return raw
+    }
+}
diff --git a/Loop/Models/NetBasal.swift b/Loop/Models/NetBasal.swift
index d9f3007bf..0420ac217 100644
--- a/Loop/Models/NetBasal.swift
+++ b/Loop/Models/NetBasal.swift
@@ -36,6 +36,4 @@ struct NetBasal {
             }
         }
     }
-    
 }
-
diff --git a/Loop/Models/PredictionInputEffect.swift b/Loop/Models/PredictionInputEffect.swift
index 1b257e3d5..9aabe0d91 100644
--- a/Loop/Models/PredictionInputEffect.swift
+++ b/Loop/Models/PredictionInputEffect.swift
@@ -10,35 +10,43 @@ import Foundation
 import HealthKit
 
 
-enum PredictionInputEffect {
-    case carbs
-    case insulin
-    case momentum
-    case retrospection
+struct PredictionInputEffect: OptionSet {
+    let rawValue: Int
 
-    var localizedTitle: String {
+    static let carbs            = PredictionInputEffect(rawValue: 1 << 0)
+    static let insulin          = PredictionInputEffect(rawValue: 1 << 1)
+    static let momentum         = PredictionInputEffect(rawValue: 1 << 2)
+    static let retrospection    = PredictionInputEffect(rawValue: 1 << 3)
+
+    static let all: PredictionInputEffect = [.carbs, .insulin, .momentum, .retrospection]
+
+    var localizedTitle: String? {
         switch self {
-        case .carbs:
+        case [.carbs]:
             return NSLocalizedString("Carbohydrates", comment: "Title of the prediction input effect for carbohydrates")
-        case .insulin:
+        case [.insulin]:
             return NSLocalizedString("Insulin", comment: "Title of the prediction input effect for insulin")
-        case .momentum:
+        case [.momentum]:
             return NSLocalizedString("Glucose Momentum", comment: "Title of the prediction input effect for glucose momentum")
-        case .retrospection:
+        case [.retrospection]:
             return NSLocalizedString("Retrospective Correction", comment: "Title of the prediction input effect for retrospective correction")
+        default:
+            return nil
         }
     }
 
-    func localizedDescription(forGlucoseUnit unit: HKUnit) -> String {
+    func localizedDescription(forGlucoseUnit unit: HKUnit) -> String? {
         switch self {
-        case .carbs:
+        case [.carbs]:
             return String(format: NSLocalizedString("Carbs Absorbed (g) ÷ Carb Ratio (g/U) × Insulin Sensitivity (%1$@/U)", comment: "Description of the prediction input effect for carbohydrates. (1: The glucose unit string)"), unit.glucoseUnitDisplayString)
-        case .insulin:
+        case [.insulin]:
             return String(format: NSLocalizedString("Insulin Absorbed (U) × Insulin Sensitivity (%1$@/U)", comment: "Description of the prediction input effect for insulin"), unit.glucoseUnitDisplayString)
-        case .momentum:
+        case [.momentum]:
             return NSLocalizedString("15 min glucose regression coefficient (b₁), continued with decay over 30 min", comment: "Description of the prediction input effect for glucose momentum")
-        case .retrospection:
+        case [.retrospection]:
             return NSLocalizedString("30 min comparison of glucose prediction vs actual, continued with decay over 60 min", comment: "Description of the prediction input effect for retrospective correction")
+        default:
+            return nil
         }
     }
 }
diff --git a/Loop/Models/Result.swift b/Loop/Models/Result.swift
new file mode 100644
index 000000000..b6763baf7
--- /dev/null
+++ b/Loop/Models/Result.swift
@@ -0,0 +1,12 @@
+//
+//  Result.swift
+//  Loop
+//
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+
+enum Result<T> {
+    case success(T)
+    case failure(Error)
+}
diff --git a/Loop/Models/ShareGlucose+GlucoseKit.swift b/Loop/Models/ShareGlucose+GlucoseKit.swift
index b40b2349f..f0854785a 100644
--- a/Loop/Models/ShareGlucose+GlucoseKit.swift
+++ b/Loop/Models/ShareGlucose+GlucoseKit.swift
@@ -19,7 +19,7 @@ extension ShareGlucose: GlucoseValue {
     }
 
     public var quantity: HKQuantity {
-        return HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose))
+        return HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: Double(glucose))
     }
 }
 
diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
index 876963ef6..53b904585 100644
--- a/Loop/View Controllers/BolusViewController.swift	
+++ b/Loop/View Controllers/BolusViewController.swift	
@@ -63,7 +63,7 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
 
     // MARK: - State
 
-    var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliterUnit()
+    var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliter()
 
     var bolusRecommendation: BolusRecommendation? = nil {
         didSet {
diff --git a/Loop/View Controllers/ChartsTableViewController.swift b/Loop/View Controllers/ChartsTableViewController.swift
new file mode 100644
index 000000000..13b558873
--- /dev/null
+++ b/Loop/View Controllers/ChartsTableViewController.swift	
@@ -0,0 +1,148 @@
+//
+//  ChartsTableViewController.swift
+//  Loop
+//
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+import UIKit
+import LoopUI
+
+
+struct RefreshContext: OptionSet {
+    let rawValue: Int
+
+    /// Catch-all for lastLoopCompleted, recommendedTempBasal, lastTempBasal, preferences
+    static let status  = RefreshContext(rawValue: 1 << 0)
+
+    static let glucose = RefreshContext(rawValue: 1 << 1)
+    static let insulin = RefreshContext(rawValue: 1 << 2)
+    static let carbs   = RefreshContext(rawValue: 1 << 3)
+    static let targets = RefreshContext(rawValue: 1 << 4)
+}
+
+
+/// Abstract class providing boilerplate setup for chart-based table view controllers
+class ChartsTableViewController: UITableViewController, UIGestureRecognizerDelegate {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        let notificationCenter = NotificationCenter.default
+        notificationObservers += [
+            notificationCenter.addObserver(forName: .UIApplicationWillResignActive, object: UIApplication.shared, queue: .main) { _ in
+                self.active = false
+            },
+            notificationCenter.addObserver(forName: .UIApplicationDidBecomeActive, object: UIApplication.shared, queue: .main) { _ in
+                self.active = true
+            }
+        ]
+
+        let gestureRecognizer = UILongPressGestureRecognizer()
+        gestureRecognizer.delegate = self
+        gestureRecognizer.minimumPressDuration = 0.1
+        gestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
+        charts.gestureRecognizer = gestureRecognizer
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+
+        if !visible {
+            charts.didReceiveMemoryWarning()
+        }
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        visible = true
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+
+        visible = false
+    }
+
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+
+        if visible {
+            reloadData(animated: false, to: size)
+        }
+    }
+
+    deinit {
+        for observer in notificationObservers {
+            NotificationCenter.default.removeObserver(observer)
+        }
+    }
+
+    // MARK: - State
+
+    weak var deviceManager: DeviceDataManager!
+
+    var charts = StatusChartsManager(colors: .default, settings: .default)
+
+    // References to registered notification center observers
+    var notificationObservers: [Any] = []
+
+    var active = true {
+        didSet {
+            reloadData()
+        }
+    }
+
+    var visible = false {
+        didSet {
+            reloadData()
+        }
+    }
+
+    // MARK: - Data loading
+
+    /// Refetches all data and updates the views. Must be called on the main queue.
+    ///
+    /// - Parameters:
+    ///   - animated: Whether the updating should be animated if possible
+    ///   - size: The size to render into. Defaults to the table view bounds
+    func reloadData(animated: Bool = false, to size: CGSize? = nil) {
+
+    }
+
+    // MARK: - UIGestureRecognizer
+
+    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        /// Only start the long-press recognition when it starts in a chart cell
+        let point = gestureRecognizer.location(in: tableView)
+        if let indexPath = tableView.indexPathForRow(at: point) {
+            if let cell = tableView.cellForRow(at: indexPath), cell is ChartTableViewCell {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+
+    @objc func handlePan(_ gestureRecognizer: UIGestureRecognizer) {
+        switch gestureRecognizer.state {
+        case .possible, .changed:
+            // Follow your dreams!
+            break
+        case .began, .cancelled, .ended, .failed:
+            for case let row as ChartTableViewCell in self.tableView.visibleCells {
+                let forwards = gestureRecognizer.state == .began
+                UIView.animate(withDuration: forwards ? 0.2 : 0.5, delay: forwards ? 0 : 1, animations: {
+                    let alpha: CGFloat = forwards ? 0 : 1
+                    row.titleLabel?.alpha = alpha
+                    row.subtitleLabel?.alpha = alpha
+                })
+            }
+        }
+    }
+}
diff --git a/Loop/View Controllers/CommandResponseViewController.swift b/Loop/View Controllers/CommandResponseViewController.swift
index 7ad0fdedc..5ea4ceacc 100644
--- a/Loop/View Controllers/CommandResponseViewController.swift	
+++ b/Loop/View Controllers/CommandResponseViewController.swift	
@@ -13,51 +13,17 @@ import LoopKit
 extension CommandResponseViewController {
     static func generateDiagnosticReport(dataManager: DeviceDataManager) -> CommandResponseViewController {
         let vc = CommandResponseViewController(command: { (completionHandler) in
-            let group = DispatchGroup()
-
-            var doseStoreResponse = ""
-            group.enter()
-            dataManager.doseStore.generateDiagnosticReport { (report) in
-                doseStoreResponse = report
-                group.leave()
-            }
-
-            var carbStoreResponse = ""
-            if let carbStore = dataManager.carbStore {
-                group.enter()
-                carbStore.generateDiagnosticReport { (report) in
-                    carbStoreResponse = report
-                    group.leave()
-                }
-            }
-
-            var glucoseStoreResponse = ""
-            if let glucoseStore = dataManager.glucoseStore {
-                group.enter()
-                glucoseStore.generateDiagnosticReport { (report) in
-                    glucoseStoreResponse = report
-                    group.leave()
-                }
-            }
-
-            // LoopStatus
-            var loopManagerResponse = ""
-            group.enter()
             dataManager.loopManager.generateDiagnosticReport { (report) in
-                loopManagerResponse = report
-                group.leave()
-            }
-
-            group.notify(queue: DispatchQueue.main) {
-                completionHandler([
-                    "Use the Share button above save this diagnostic report to aid investigating your problem. Issues can be filed at https://github.com/LoopKit/Loop/issues.",
-                    "Generated: \(Date())",
-                    String(reflecting: dataManager),
-                    loopManagerResponse,
-                    doseStoreResponse,
-                    carbStoreResponse,
-                    glucoseStoreResponse
-                ].joined(separator: "\n\n"))
+                DispatchQueue.main.async {
+                    completionHandler([
+                        "Use the Share button above save this diagnostic report to aid investigating your problem. Issues can be filed at https://github.com/LoopKit/Loop/issues.",
+                        "Generated: \(Date())",
+                        String(reflecting: dataManager),
+                        "",
+                        report,
+                        "",
+                    ].joined(separator: "\n\n"))
+                }
             }
 
             return NSLocalizedString("Loading...", comment: "The loading message for the diagnostic report screen")
diff --git a/Loop/View Controllers/PredictionTableViewController.swift b/Loop/View Controllers/PredictionTableViewController.swift
index 18037eb00..72dd55d39 100644
--- a/Loop/View Controllers/PredictionTableViewController.swift	
+++ b/Loop/View Controllers/PredictionTableViewController.swift	
@@ -12,191 +12,154 @@ import LoopKit
 import LoopUI
 
 
-class PredictionTableViewController: UITableViewController, IdentifiableClass, UIGestureRecognizerDelegate {
+private extension RefreshContext {
+    static let all: RefreshContext = [.glucose, .targets]
+}
+
+
+class PredictionTableViewController: ChartsTableViewController, IdentifiableClass {
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
         tableView.cellLayoutMarginsFollowReadableWidth = true
 
+        charts.glucoseDisplayRange = (
+            min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 60),
+            max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 200)
+        )
+
         let notificationCenter = NotificationCenter.default
-        let mainQueue = OperationQueue.main
-        let application = UIApplication.shared
 
         notificationObservers += [
-            notificationCenter.addObserver(forName: .LoopDataUpdated, object: dataManager.loopManager, queue: nil) { note in
-                guard let rawContext = note.userInfo?[LoopDataManager.LoopUpdateContextKey] as? Int, LoopDataManager.LoopUpdateContext(rawValue: rawContext) != .preferences else {
-                    return
-                }
-
+            notificationCenter.addObserver(forName: .LoopDataUpdated, object: deviceManager.loopManager, queue: nil) { note in
+                let context = note.userInfo?[LoopDataManager.LoopUpdateContextKey] as! LoopDataManager.LoopUpdateContext.RawValue
                 DispatchQueue.main.async {
-                    self.needsRefresh = true
+                    switch LoopDataManager.LoopUpdateContext(rawValue: context) {
+                    case .preferences?:
+                        self.refreshContext.update(with: [.status, .targets])
+                    case .glucose?:
+                        self.refreshContext.update(with: .glucose)
+                    default:
+                        break
+                    }
+
                     self.reloadData(animated: true)
                 }
-            },
-            notificationCenter.addObserver(forName: .UIApplicationWillResignActive, object: application, queue: mainQueue) { _ in
-                self.active = false
-            },
-            notificationCenter.addObserver(forName: .UIApplicationDidBecomeActive, object: application, queue: mainQueue) { _ in
-                self.active = true
             }
         ]
-
-        let chartPanGestureRecognizer = UIPanGestureRecognizer()
-        chartPanGestureRecognizer.delegate = self
-        chartPanGestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
-        charts.panGestureRecognizer = chartPanGestureRecognizer
-    }
-
-    deinit {
-        for observer in notificationObservers {
-            NotificationCenter.default.removeObserver(observer)
-        }
     }
 
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-
-        visible = true
-    }
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-
-        AnalyticsManager.sharedManager.didDisplayStatusScreen()
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-
-        visible = false
+        if !visible {
+            refreshContext = .all
+        }
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        super.viewWillTransition(to: size, with: coordinator)
+        refreshContext.update(with: .status)
 
-        needsRefresh = true
-        if visible {
-            reloadData(animated: false)
-        }
+        super.viewWillTransition(to: size, with: coordinator)
     }
 
     // MARK: - State
 
-    // References to registered notification center observers
-    private var notificationObservers: [Any] = []
-
-    var dataManager: DeviceDataManager!
-
-    private lazy var charts: StatusChartsManager = {
-        let charts = StatusChartsManager(colors: .default, settings: .default)
-
-        charts.glucoseDisplayRange = (
-            min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 60),
-            max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 200)
-        )
-
-        return charts
-    }()
-
     private var retrospectivePredictedGlucose: [GlucoseValue]?
 
-    private var active = true {
-        didSet {
-            reloadData()
-        }
-    }
+    private var refreshContext = RefreshContext.all
 
-    private var needsRefresh = true
+    private var chartStartDate: Date {
+        get {
+            return charts.startDate
+        }
+        set {
+            if newValue != chartStartDate {
+                refreshContext = .all
+            }
 
-    private var visible = false {
-        didSet {
-            reloadData()
+            charts.startDate = newValue
         }
     }
 
-    private var reloading = false
+    override func reloadData(animated: Bool = false, to size: CGSize? = nil) {
+        guard active && visible && !refreshContext.isEmpty else { return }
 
-    private func reloadData(animated: Bool = false) {
-        if active && visible && needsRefresh {
-            needsRefresh = false
-            reloading = true
+        let calendar = Calendar.current
+        var components = DateComponents()
+        components.minute = 0
+        let date = Date(timeIntervalSinceNow: -TimeInterval(hours: 1))
+        chartStartDate = calendar.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
 
-            let calendar = Calendar.current
-            var components = DateComponents()
-            components.minute = 0
-            let date = Date(timeIntervalSinceNow: -TimeInterval(hours: 1))
-            charts.startDate = calendar.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
+        let reloadGroup = DispatchGroup()
 
-            let reloadGroup = DispatchGroup()
+        reloadGroup.enter()
+        deviceManager.loopManager.glucoseStore.preferredUnit { (unit, error) in
+            if let unit = unit {
+                self.charts.glucoseUnit = unit
+            }
 
-            if let glucoseStore = dataManager.glucoseStore {
+            if self.refreshContext.remove(.glucose) != nil {
                 reloadGroup.enter()
-
-                glucoseStore.preferredUnit { (unit, error) in
-                    if let unit = unit {
-                        self.charts.glucoseUnit = unit
-                    }
-
-                    reloadGroup.enter()
-                    glucoseStore.getGlucoseValues(start: self.charts.startDate) { result -> Void in
-                        switch result {
-                        case .success(let values):
-                            self.charts.setGlucoseValues(values)
-                        case .failure(let error):
-                            self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
-                            self.needsRefresh = true
-                            self.charts.setGlucoseValues([])
-                        }
-
-                        reloadGroup.leave()
+                self.deviceManager.loopManager.glucoseStore.getGlucoseValues(start: self.chartStartDate) { (result) -> Void in
+                    switch result {
+                    case .failure(let error):
+                        self.deviceManager.logger.addError(error, fromSource: "GlucoseStore")
+                        self.refreshContext.update(with: .glucose)
+                        self.charts.setGlucoseValues([])
+                    case .success(let values):
+                        self.charts.setGlucoseValues(values)
                     }
 
-                    reloadGroup.enter()
-                    self.dataManager.loopManager.getLoopStatus { (predictedGlucose, retrospectivePredictedGlucose, _, _, _, _, _, error) in
-                        if error != nil {
-                            self.needsRefresh = true
-                        }
-
-                        self.retrospectivePredictedGlucose = retrospectivePredictedGlucose
-                        self.charts.setPredictedGlucoseValues(predictedGlucose ?? [])
-                        
-                        reloadGroup.leave()
-                    }
-
-                    reloadGroup.enter()
-                    self.dataManager.loopManager.modelPredictedGlucose(using: self.selectedInputs.flatMap { $0.selected ? $0.input : nil }) { (predictedGlucose, error) in
-                        if error != nil {
-                            self.needsRefresh = true
-                        }
+                    reloadGroup.leave()
+                }
+            }
 
-                        self.charts.setAlternatePredictedGlucoseValues(predictedGlucose ?? [])
+            // For now, do this every time
+            _ = self.refreshContext.remove(.status)
+            reloadGroup.enter()
+            self.deviceManager.loopManager.getLoopState { (manager, state) in
+                self.retrospectivePredictedGlucose = state.retrospectivePredictedGlucose
+                self.charts.setPredictedGlucoseValues(state.predictedGlucose ?? [])
+
+                do {
+                    let glucose = try state.predictGlucose(using: self.selectedInputs)
+                    self.charts.setAlternatePredictedGlucoseValues(glucose)
+                } catch {
+                    self.refreshContext.update(with: .status)
+                    self.charts.setAlternatePredictedGlucoseValues([])
+                }
 
-                        if let lastPoint = self.charts.alternatePredictedGlucosePoints?.last?.y {
-                            self.eventualGlucoseDescription = String(describing: lastPoint)
-                        }
+                if let lastPoint = self.charts.alternatePredictedGlucosePoints?.last?.y {
+                    self.eventualGlucoseDescription = String(describing: lastPoint)
+                } else {
+                    self.eventualGlucoseDescription = nil
+                }
 
-                        reloadGroup.leave()
+                if self.refreshContext.remove(.targets) != nil {
+                    if let schedule = manager.settings.glucoseTargetRangeSchedule {
+                        self.charts.targetPointsCalculator = GlucoseRangeScheduleCalculator(schedule)
+                    } else {
+                        self.charts.targetPointsCalculator = nil
                     }
-
-                    reloadGroup.leave()
                 }
+
+                reloadGroup.leave()
             }
 
-            charts.targetPointsCalculator = GlucoseRangeScheduleCalculator(dataManager.glucoseTargetRangeSchedule)
+            reloadGroup.leave()
+        }
 
-            reloadGroup.notify(queue: DispatchQueue.main) {
-                self.charts.prerender()
+        reloadGroup.notify(queue: .main) {
+            self.charts.prerender()
 
-                for case let cell as ChartTableViewCell in self.tableView.visibleCells {
-                    cell.reloadChart()
+            for case let cell as ChartTableViewCell in self.tableView.visibleCells {
+                cell.reloadChart()
 
-                    if let indexPath = self.tableView.indexPath(for: cell) {
-                        self.tableView(self.tableView, updateTitleFor: cell, at: indexPath)
-                    }
+                if let indexPath = self.tableView.indexPath(for: cell) {
+                    self.tableView(self.tableView, updateTitleFor: cell, at: indexPath)
                 }
-
-                self.reloading = false
             }
         }
     }
@@ -213,9 +176,9 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
 
     private var eventualGlucoseDescription: String?
 
-    private lazy var selectedInputs: [(input: PredictionInputEffect, selected: Bool)] = [
-        (.carbs, true), (.insulin, true), (.momentum, true), (.retrospection, true)
-    ]
+    private var availableInputs: [PredictionInputEffect] = [.carbs, .insulin, .momentum, .retrospection]
+
+    private var selectedInputs = PredictionInputEffect.all
 
     override func numberOfSections(in tableView: UITableView) -> Int {
         return Section.count
@@ -226,7 +189,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
         case .charts:
             return 1
         case .inputs:
-            return selectedInputs.count
+            return availableInputs.count
         case .settings:
             return 1
         }
@@ -237,7 +200,6 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
         case .charts:
             let cell = tableView.dequeueReusableCell(withIdentifier: ChartTableViewCell.className, for: indexPath) as! ChartTableViewCell
             cell.titleLabel?.textColor = UIColor.secondaryLabelColor
-            cell.subtitleLabel?.textColor = UIColor.secondaryLabelColor
             cell.contentView.layoutMargins.left = tableView.separatorInset.left
             cell.chartContentView.chartGenerator = { [weak self] (frame) in
                 return self?.charts.glucoseChartWithFrame(frame)?.view
@@ -247,24 +209,24 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
             cell.titleLabel?.textColor = UIColor.secondaryLabelColor
             cell.selectionStyle = .none
 
-            cell.addGestureRecognizer(charts.panGestureRecognizer!)
+            cell.addGestureRecognizer(charts.gestureRecognizer!)
 
             return cell
         case .inputs:
             let cell = tableView.dequeueReusableCell(withIdentifier: PredictionInputEffectTableViewCell.className, for: indexPath) as! PredictionInputEffectTableViewCell
 
-            let (input, selected) = selectedInputs[indexPath.row]
+            let input = availableInputs[indexPath.row]
 
             cell.titleLabel?.text = input.localizedTitle
-            cell.accessoryType = selected ? .checkmark : .none
-            cell.enabled = input != .retrospection || dataManager.loopManager.retrospectiveCorrectionEnabled
+            cell.accessoryType = selectedInputs.contains(input) ? .checkmark : .none
+            cell.enabled = input != .retrospection || deviceManager.loopManager.settings.retrospectiveCorrectionEnabled
 
-            var subtitleText = input.localizedDescription(forGlucoseUnit: charts.glucoseUnit)
+            var subtitleText = input.localizedDescription(forGlucoseUnit: charts.glucoseUnit) ?? ""
 
             if input == .retrospection,
                 let startGlucose = retrospectivePredictedGlucose?.first,
                 let endGlucose = retrospectivePredictedGlucose?.last,
-                let currentGlucose = self.dataManager.glucoseStore?.latestGlucose
+                let currentGlucose = self.deviceManager.loopManager.glucoseStore.latestGlucose
             {
                 let formatter = NumberFormatter.glucoseFormatter(for: charts.glucoseUnit)
                 let values = [startGlucose, endGlucose, currentGlucose].map { formatter.string(from: NSNumber(value: $0.quantity.doubleValue(for: charts.glucoseUnit))) ?? "?" }
@@ -287,7 +249,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
 
             cell.titleLabel?.text = NSLocalizedString("Enable Retrospective Correction", comment: "Title of the switch which toggles retrospective correction effects")
             cell.subtitleLabel?.text = NSLocalizedString("This will more aggresively increase or decrease basal delivery when glucose movement doesn't match the carbohydrate and insulin-based model.", comment: "The description of the switch which toggles retrospective correction effects")
-            cell.`switch`?.isOn = dataManager.loopManager.retrospectiveCorrectionEnabled
+            cell.`switch`?.isOn = deviceManager.loopManager.settings.retrospectiveCorrectionEnabled
             cell.`switch`?.addTarget(self, action: #selector(retrospectiveCorrectionSwitchChanged(_:)), for: .valueChanged)
 
             cell.contentView.layoutMargins.left = tableView.separatorInset.left
@@ -332,51 +294,30 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         guard Section(rawValue: indexPath.section) == .inputs else { return }
 
-        let (input, selected) = selectedInputs[indexPath.row]
+        let input = availableInputs[indexPath.row]
+        let isSelected = selectedInputs.contains(input)
 
         if let cell = tableView.cellForRow(at: indexPath) {
-            cell.accessoryType = !selected ? .checkmark : .none
+            cell.accessoryType = !isSelected ? .checkmark : .none
         }
 
-        selectedInputs[indexPath.row] = (input, !selected)
+        selectedInputs.formSymmetricDifference(input)
 
         tableView.deselectRow(at: indexPath, animated: true)
 
-        needsRefresh = true
+        refreshContext.update(with: .status)
         reloadData()
     }
 
-    // MARK: - UIGestureRecognizer
-
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return true
-    }
-
-    @objc func handlePan(_ gestureRecognizer: UIGestureRecognizer) {
-        switch gestureRecognizer.state {
-        case .possible, .changed:
-            // Follow your dreams!
-            break
-        case .began, .cancelled, .ended, .failed:
-            for case let row as ChartTableViewCell in self.tableView.visibleCells {
-                let forwards = gestureRecognizer.state == .began
-                UIView.animate(withDuration: forwards ? 0.2 : 0.5, delay: forwards ? 0 : 1, animations: {
-                    let alpha: CGFloat = forwards ? 0 : 1
-                    row.titleLabel?.alpha = alpha
-                })
-            }
-        }
-    }
-
     // MARK: - Actions
 
     @objc private func retrospectiveCorrectionSwitchChanged(_ sender: UISwitch) {
-        dataManager.loopManager.retrospectiveCorrectionEnabled = sender.isOn
+        deviceManager.loopManager.settings.retrospectiveCorrectionEnabled = sender.isOn
 
-        if  let row = selectedInputs.index(where: { $0.input == PredictionInputEffect.retrospection }),
+        if  let row = availableInputs.index(where: { $0 == .retrospection }),
             let cell = tableView.cellForRow(at: IndexPath(row: row, section: Section.inputs.rawValue)) as? PredictionInputEffectTableViewCell
         {
-            cell.enabled = self.dataManager.loopManager.retrospectiveCorrectionEnabled
+            cell.enabled = self.deviceManager.loopManager.settings.retrospectiveCorrectionEnabled
         }
     }
 }
diff --git a/Loop/View Controllers/SettingsTableViewController.swift b/Loop/View Controllers/SettingsTableViewController.swift
index 70df62c80..b19bb60d8 100644
--- a/Loop/View Controllers/SettingsTableViewController.swift	
+++ b/Loop/View Controllers/SettingsTableViewController.swift	
@@ -47,10 +47,10 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
         dataManager.rileyLinkManager.deviceScanningEnabled = true
 
-        if case .some = dataManager.cgm, let glucoseStore = dataManager.glucoseStore, glucoseStore.authorizationRequired {
-            glucoseStore.authorize({ (success, error) -> Void in
+        if case .some = dataManager.cgm, dataManager.loopManager.glucoseStore.authorizationRequired {
+            dataManager.loopManager.glucoseStore.authorize { (success, error) -> Void in
                 // Do nothing for now
-            })
+            }
         }
 
         AnalyticsManager.sharedManager.didDisplaySettingsScreen()
@@ -168,7 +168,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .dosing:
                 let switchCell = tableView.dequeueReusableCell(withIdentifier: SwitchTableViewCell.className, for: indexPath) as! SwitchTableViewCell
 
-                switchCell.switch?.isOn = dataManager.loopManager.dosingEnabled
+                switchCell.switch?.isOn = dataManager.loopManager.settings.dosingEnabled
                 switchCell.titleLabel.text = NSLocalizedString("Closed Loop", comment: "The title text for the looping enabled switch cell")
 
                 switchCell.switch?.addTarget(self, action: #selector(dosingEnabledChanged(_:)), for: .valueChanged)
@@ -247,7 +247,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .basalRate:
                 configCell.textLabel?.text = NSLocalizedString("Basal Rates", comment: "The title text for the basal rate schedule")
 
-                if let basalRateSchedule = dataManager.basalRateSchedule {
+                if let basalRateSchedule = dataManager.loopManager.basalRateSchedule {
                     configCell.detailTextLabel?.text = "\(basalRateSchedule.total()) U"
                 } else {
                     configCell.detailTextLabel?.text = TapToSetString
@@ -255,7 +255,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .carbRatio:
                 configCell.textLabel?.text = NSLocalizedString("Carb Ratios", comment: "The title text for the carb ratio schedule")
 
-                if let carbRatioSchedule = dataManager.carbRatioSchedule {
+                if let carbRatioSchedule = dataManager.loopManager.carbRatioSchedule {
                     let unit = carbRatioSchedule.unit
                     let value = valueNumberFormatter.string(from: NSNumber(value: carbRatioSchedule.averageQuantity().doubleValue(for: unit))) ?? "—"
 
@@ -266,7 +266,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .insulinSensitivity:
                 configCell.textLabel?.text = NSLocalizedString("Insulin Sensitivities", comment: "The title text for the insulin sensitivity schedule")
 
-                if let insulinSensitivitySchedule = dataManager.insulinSensitivitySchedule {
+                if let insulinSensitivitySchedule = dataManager.loopManager.insulinSensitivitySchedule {
                     let unit = insulinSensitivitySchedule.unit
                     let value = valueNumberFormatter.string(from: NSNumber(value: insulinSensitivitySchedule.averageQuantity().doubleValue(for: unit))) ?? "—"
 
@@ -277,7 +277,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .glucoseTargetRange:
                 configCell.textLabel?.text = NSLocalizedString("Target Range", comment: "The title text for the glucose target range schedule")
 
-                if let glucoseTargetRangeSchedule = dataManager.glucoseTargetRangeSchedule {
+                if let glucoseTargetRangeSchedule = dataManager.loopManager.settings.glucoseTargetRangeSchedule {
                     let unit = glucoseTargetRangeSchedule.unit
                     let value = glucoseTargetRangeSchedule.value(at: Date())
                     let minTarget = valueNumberFormatter.string(from: NSNumber(value: value.minValue)) ?? "—"
@@ -290,7 +290,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .minimumBGGuard:
                 configCell.textLabel?.text = NSLocalizedString("Minimum BG Guard", comment: "The title text for the minimum bg guard setting")
                 
-                if let minimumBGGuard = dataManager.minimumBGGuard {
+                if let minimumBGGuard = dataManager.loopManager.settings.minimumBGGuard {
                     let value = valueNumberFormatter.string(from: NSNumber(value: minimumBGGuard.value)) ?? "-"
                     configCell.detailTextLabel?.text = String(format: NSLocalizedString("%1$@ %2$@", comment: "Format string for minimum bg guard. (1: value)(2: bg unit)"), value, minimumBGGuard.unit.glucoseUnitDisplayString)
                 } else {
@@ -299,7 +299,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .insulinActionDuration:
                 configCell.textLabel?.text = NSLocalizedString("Insulin Action Duration", comment: "The title text for the insulin action duration value")
 
-                if let insulinActionDuration = dataManager.insulinActionDuration {
+                if let insulinActionDuration = dataManager.loopManager.insulinActionDuration {
                     let formatter = DateComponentsFormatter()
                     formatter.unitsStyle = .abbreviated
                     // Seems to have no effect.
@@ -314,7 +314,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .maxBasal:
             configCell.textLabel?.text = NSLocalizedString("Maximum Basal Rate", comment: "The title text for the maximum basal rate value")
 
-                if let maxBasal = dataManager.maximumBasalRatePerHour {
+                if let maxBasal = dataManager.loopManager.settings.maximumBasalRatePerHour {
                     configCell.detailTextLabel?.text = "\(valueNumberFormatter.string(from: NSNumber(value: maxBasal))!) U/hour"
                 } else {
                     configCell.detailTextLabel?.text = TapToSetString
@@ -322,7 +322,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .maxBolus:
                 configCell.textLabel?.text = NSLocalizedString("Maximum Bolus", comment: "The title text for the maximum bolus value")
 
-                if let maxBolus = dataManager.maximumBolus {
+                if let maxBolus = dataManager.loopManager.settings.maximumBolus {
                     configCell.detailTextLabel?.text = "\(valueNumberFormatter.string(from: NSNumber(value: maxBolus))!) U"
                 } else {
                     configCell.detailTextLabel?.text = TapToSetString
@@ -446,11 +446,11 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
                 switch row {
                 case .insulinActionDuration:
-                    vc = .insulinActionDuration(dataManager.insulinActionDuration)
+                    vc = .insulinActionDuration(dataManager.loopManager.insulinActionDuration)
                 case .maxBasal:
-                    vc = .maxBasal(dataManager.maximumBasalRatePerHour)
+                    vc = .maxBasal(dataManager.loopManager.settings.maximumBasalRatePerHour)
                 case .maxBolus:
-                    vc = .maxBolus(dataManager.maximumBolus)
+                    vc = .maxBolus(dataManager.loopManager.settings.maximumBolus)
                 default:
                     fatalError()
                 }
@@ -463,7 +463,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .basalRate:
                 let scheduleVC = SingleValueScheduleTableViewController()
 
-                if let profile = dataManager.basalRateSchedule {
+                if let profile = dataManager.loopManager.basalRateSchedule {
                     scheduleVC.timeZone = profile.timeZone
                     scheduleVC.scheduleItems = profile.items
                 }
@@ -477,14 +477,14 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 scheduleVC.delegate = self
                 scheduleVC.title = NSLocalizedString("Carb Ratios", comment: "The title of the carb ratios schedule screen")
 
-                if let schedule = dataManager.carbRatioSchedule {
+                if let schedule = dataManager.loopManager.carbRatioSchedule {
                     scheduleVC.timeZone = schedule.timeZone
                     scheduleVC.scheduleItems = schedule.items
                     scheduleVC.unit = schedule.unit
 
                     show(scheduleVC, sender: sender)
-                } else if let carbStore = dataManager.carbStore {
-                    carbStore.preferredUnit({ (unit, error) -> Void in
+                } else {
+                    dataManager.loopManager.carbStore.preferredUnit { (unit, error) -> Void in
                         DispatchQueue.main.async {
                             if let error = error {
                                 self.presentAlertController(with: error)
@@ -493,9 +493,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                                 self.show(scheduleVC, sender: sender)
                             }
                         }
-                    })
-                } else {
-                    show(scheduleVC, sender: sender)
+                    }
                 }
             case .insulinSensitivity:
                 let scheduleVC = DailyQuantityScheduleTableViewController()
@@ -503,14 +501,14 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 scheduleVC.delegate = self
                 scheduleVC.title = NSLocalizedString("Insulin Sensitivities", comment: "The title of the insulin sensitivities schedule screen")
 
-                if let schedule = dataManager.insulinSensitivitySchedule {
+                if let schedule = dataManager.loopManager.insulinSensitivitySchedule {
                     scheduleVC.timeZone = schedule.timeZone
                     scheduleVC.scheduleItems = schedule.items
                     scheduleVC.unit = schedule.unit
 
                     show(scheduleVC, sender: sender)
-                } else if let glucoseStore = dataManager.glucoseStore {
-                    glucoseStore.preferredUnit({ (unit, error) -> Void in
+                } else {
+                    dataManager.loopManager.glucoseStore.preferredUnit { (unit, error) -> Void in
                         DispatchQueue.main.async {
                             if let error = error {
                                 self.presentAlertController(with: error)
@@ -519,9 +517,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                                 self.show(scheduleVC, sender: sender)
                             }
                         }
-                    })
-                } else {
-                    show(scheduleVC, sender: sender)
+                    }
                 }
             case .glucoseTargetRange:
                 let scheduleVC = GlucoseRangeScheduleTableViewController()
@@ -529,15 +525,15 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 scheduleVC.delegate = self
                 scheduleVC.title = NSLocalizedString("Target Range", comment: "The title of the glucose target range schedule screen")
 
-                if let schedule = dataManager.glucoseTargetRangeSchedule {
+                if let schedule = dataManager.loopManager.settings.glucoseTargetRangeSchedule {
                     scheduleVC.timeZone = schedule.timeZone
                     scheduleVC.scheduleItems = schedule.items
                     scheduleVC.unit = schedule.unit
                     scheduleVC.workoutRange = schedule.workoutRange
 
                     show(scheduleVC, sender: sender)
-                } else if let glucoseStore = dataManager.glucoseStore {
-                    glucoseStore.preferredUnit({ (unit, error) -> Void in
+                } else {
+                    dataManager.loopManager.glucoseStore.preferredUnit { (unit, error) -> Void in
                         DispatchQueue.main.async {
                             if let error = error {
                                 self.presentAlertController(with: error)
@@ -546,19 +542,17 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                                 self.show(scheduleVC, sender: sender)
                             }
                         }
-                    })
-                } else {
-                    show(scheduleVC, sender: sender)
+                    }
                 }
             case .minimumBGGuard:
-                if let minBGGuard = dataManager.minimumBGGuard {
+                if let minBGGuard = dataManager.loopManager.settings.minimumBGGuard {
                     let vc = GlucoseThresholdTableViewController(threshold: minBGGuard.value, glucoseUnit: minBGGuard.unit)
                     vc.delegate = self
                     vc.indexPath = indexPath
                     vc.title = sender?.textLabel?.text
                     self.show(vc, sender: sender)
-                } else if let glucoseStore = dataManager.glucoseStore {
-                    glucoseStore.preferredUnit({ (unit, error) -> Void in
+                } else {
+                    dataManager.loopManager.glucoseStore.preferredUnit { (unit, error) -> Void in
                         DispatchQueue.main.async {
                             if let error = error {
                                 self.presentAlertController(with: error)
@@ -570,7 +564,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                                 self.show(vc, sender: sender)
                             }
                         }
-                    })
+                    }
                 }
             }
         case .devices:
@@ -652,7 +646,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
     // MARK: - Device mangement
 
     @objc private func dosingEnabledChanged(_ sender: UISwitch) {
-        dataManager.loopManager.dosingEnabled = sender.isOn
+        dataManager.loopManager.settings.dosingEnabled = sender.isOn
     }
 
     @objc private func deviceConnectionChanged(_ connectSwitch: UISwitch) {
@@ -751,19 +745,23 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 switch ConfigurationRow(rawValue: indexPath.row)! {
                 case .basalRate:
                     if let controller = controller as? SingleValueScheduleTableViewController {
-                        dataManager.basalRateSchedule = BasalRateSchedule(dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                        dataManager.loopManager.basalRateSchedule = BasalRateSchedule(dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                        AnalyticsManager.sharedManager.didChangeBasalRateSchedule()
                     }
                 case .glucoseTargetRange:
                     if let controller = controller as? GlucoseRangeScheduleTableViewController {
-                        dataManager.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, workoutRange: controller.workoutRange, timeZone: controller.timeZone)
+                        dataManager.loopManager.settings.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, workoutRange: controller.workoutRange, timeZone: controller.timeZone)
+                        AnalyticsManager.sharedManager.didChangeGlucoseTargetRangeSchedule()
                     }
                 case let row:
                     if let controller = controller as? DailyQuantityScheduleTableViewController {
                         switch row {
                         case .carbRatio:
-                            dataManager.carbRatioSchedule = CarbRatioSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                            dataManager.loopManager.carbRatioSchedule = CarbRatioSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                            AnalyticsManager.sharedManager.didChangeCarbRatioSchedule()
                         case .insulinSensitivity:
-                            dataManager.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                            dataManager.loopManager.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                            AnalyticsManager.sharedManager.didChangeInsulinSensitivitySchedule()
                         default:
                             break
                         }
@@ -848,27 +846,27 @@ extension SettingsTableViewController: TextFieldTableViewControllerDelegate {
                 case .minimumBGGuard:
                     if let controller = controller as? GlucoseThresholdTableViewController,
                         let value = controller.value, let minBGGuard = valueNumberFormatter.number(from: value)?.doubleValue {
-                        dataManager.minimumBGGuard = GlucoseThreshold(unit: controller.glucoseUnit, value: minBGGuard)
+                        dataManager.loopManager.settings.minimumBGGuard = GlucoseThreshold(unit: controller.glucoseUnit, value: minBGGuard)
                     } else {
-                        dataManager.minimumBGGuard = nil
+                        dataManager.loopManager.settings.minimumBGGuard = nil
                     }
                 case .insulinActionDuration:
                     if let value = controller.value, let duration = valueNumberFormatter.number(from: value)?.doubleValue {
-                        dataManager.insulinActionDuration = TimeInterval(hours: duration)
+                        dataManager.loopManager.insulinActionDuration = TimeInterval(hours: duration)
                     } else {
-                        dataManager.insulinActionDuration = nil
+                        dataManager.loopManager.insulinActionDuration = nil
                     }
                 case .maxBasal:
                     if let value = controller.value, let rate = valueNumberFormatter.number(from: value)?.doubleValue {
-                        dataManager.maximumBasalRatePerHour = rate
+                        dataManager.loopManager.settings.maximumBasalRatePerHour = rate
                     } else {
-                        dataManager.maximumBasalRatePerHour = nil
+                        dataManager.loopManager.settings.maximumBasalRatePerHour = nil
                     }
                 case .maxBolus:
                     if let value = controller.value, let units = valueNumberFormatter.number(from: value)?.doubleValue {
-                        dataManager.maximumBolus = units
+                        dataManager.loopManager.settings.maximumBolus = units
                     } else {
-                        dataManager.maximumBolus = nil
+                        dataManager.loopManager.settings.maximumBolus = nil
                     }
                 default:
                     assertionFailure()
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index 415920980..a531e521e 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -16,37 +16,42 @@ import LoopUI
 import SwiftCharts
 
 
-private struct RefreshContext: OptionSet {
-    let rawValue: Int
-
-    /// Catch-all for lastLoopCompleted, recommendedTempBasal, lastTempBasal, preferences
-    static let status  = RefreshContext(rawValue: 1 << 0)
+/// Describes the state within the bolus setting flow
+///
+/// - recommended: A bolus recommendation was discovered and the bolus view controller is presenting/presented
+/// - enacting: A bolus was requested by the user and is pending with the device manager
+private enum BolusState {
+    case recommended
+    case enacting
+}
 
-    static let glucose = RefreshContext(rawValue: 1 << 1)
-    static let insulin = RefreshContext(rawValue: 1 << 2)
-    static let carbs   = RefreshContext(rawValue: 1 << 3)
-    static let targets = RefreshContext(rawValue: 1 << 4)
 
+private extension RefreshContext {
     static let all: RefreshContext = [.status, .glucose, .insulin, .carbs, .targets]
 }
 
 
-final class StatusTableViewController: UITableViewController, UIGestureRecognizerDelegate {
+final class StatusTableViewController: ChartsTableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        charts.glucoseDisplayRange = (
+            min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 100),
+            max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 175)
+        )
+
         let notificationCenter = NotificationCenter.default
-        let mainQueue = OperationQueue.main
-        let application = UIApplication.shared
 
         notificationObservers += [
-            notificationCenter.addObserver(forName: .LoopDataUpdated, object: dataManager.loopManager, queue: nil) { note in
+            notificationCenter.addObserver(forName: .LoopDataUpdated, object: deviceManager.loopManager, queue: nil) { note in
                 let context = note.userInfo?[LoopDataManager.LoopUpdateContextKey] as! LoopDataManager.LoopUpdateContext.RawValue
                 DispatchQueue.main.async {
                     switch LoopDataManager.LoopUpdateContext(rawValue: context) {
-                    case .none, .bolus?, .preferences?:
+                    case .none, .bolus?:
                         self.refreshContext.update(with: .status)
+                    case .preferences?:
+                        self.refreshContext.update(with: [.status, .targets])
                     case .carbs?:
                         self.refreshContext.update(with: .carbs)
                     case .glucose?:
@@ -59,30 +64,16 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                     self.reloadData(animated: true)
                 }
             },
-            notificationCenter.addObserver(forName: .LoopRunning, object: dataManager.loopManager, queue: nil) { _ in
+            notificationCenter.addObserver(forName: .LoopRunning, object: deviceManager.loopManager, queue: nil) { _ in
                 DispatchQueue.main.async {
                     self.hudView.loopCompletionHUD.loopInProgress = true
                 }
-            },
-            notificationCenter.addObserver(forName: .LoopSettingsUpdated, object: dataManager, queue: nil) { _ in
-                DispatchQueue.main.async {
-                    self.refreshContext.update(with: .targets)
-                    self.reloadData(animated: true)
-                }
-            },
-            notificationCenter.addObserver(forName: .UIApplicationWillResignActive, object: application, queue: mainQueue) { _ in
-                self.active = false
-            },
-            notificationCenter.addObserver(forName: .UIApplicationDidBecomeActive, object: application, queue: mainQueue) { _ in
-                self.active = true
             }
         ]
 
-        let chartPanGestureRecognizer = UIPanGestureRecognizer()
-        chartPanGestureRecognizer.delegate = self
-        chartPanGestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
-        tableView.addGestureRecognizer(chartPanGestureRecognizer)
-        charts.panGestureRecognizer = chartPanGestureRecognizer
+        if let gestureRecognizer = charts.gestureRecognizer {
+            tableView.addGestureRecognizer(gestureRecognizer)
+        }
 
         // Toolbar
         toolbarItems![0].accessibilityLabel = NSLocalizedString("Add Meal", comment: "The label of the carb entry button")
@@ -93,17 +84,10 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         toolbarItems![6].tintColor = UIColor.secondaryLabelColor
     }
 
-    deinit {
-        for observer in notificationObservers {
-            NotificationCenter.default.removeObserver(observer)
-        }
-    }
-
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
 
         if !visible {
-            charts.didReceiveMemoryWarning()
             refreshContext = .all
         }
     }
@@ -112,7 +96,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         super.viewWillAppear(animated)
 
         navigationController?.setNavigationBarHidden(true, animated: animated)
-        visible = true
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -127,34 +110,30 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         if presentedViewController == nil {
             navigationController?.setNavigationBarHidden(false, animated: animated)
         }
-        visible = false
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        super.viewWillTransition(to: size, with: coordinator)
-
         refreshContext.update(with: .status)
-        if visible {
-            reloadData(animated: false, to: size)
-        }
+
+        super.viewWillTransition(to: size, with: coordinator)
     }
 
     // MARK: - State
 
-    // References to registered notification center observers
-    private var notificationObservers: [Any] = []
-
-    weak var dataManager: DeviceDataManager!
-
-    private var active = true {
+    override var active: Bool {
         didSet {
-            reloadData()
             hudView.loopCompletionHUD.assertTimer(active)
         }
     }
 
     private var refreshContext = RefreshContext.all
 
+    private var bolusState: BolusState? {
+        didSet {
+            refreshContext.update(with: .status)
+        }
+    }
+
     private var chartStartDate: Date {
         get {
             return charts.startDate
@@ -168,212 +147,220 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    private var visible = false {
-        didSet {
-            reloadData()
-        }
-    }
-
-    private var reloading = false
+    override func reloadData(animated: Bool = false, to size: CGSize? = nil) {
+        guard active && visible && !refreshContext.isEmpty else { return }
 
-    /// Refetches all data and updates the views. Must be called on the main queue.
-    ///
-    /// - parameter animated: Whether the updating should be animated if possible
-    private func reloadData(animated: Bool = false, to size: CGSize? = nil) {
-        if active && visible && !refreshContext.isEmpty {
-            reloading = true
-
-            // How far back should we show data? Use the screen size as a guide.
-            let minimumSegmentWidth: CGFloat = 50
-            let availableWidth = (size ?? self.tableView.bounds.size).width - self.charts.fixedHorizontalMargin
-            let totalHours = floor(Double(availableWidth / minimumSegmentWidth))
-            let historyHours = totalHours - (dataManager.insulinActionDuration ?? TimeInterval(hours: 4)).hours
-
-            var components = DateComponents()
-            components.minute = 0
-            let date = Date(timeIntervalSinceNow: -TimeInterval(hours: max(1, historyHours)))
-            chartStartDate = Calendar.current.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
-
-            let reloadGroup = DispatchGroup()
-            var newRecommendedTempBasal: LoopDataManager.TempBasalRecommendation?
-
-            if let glucoseStore = dataManager.glucoseStore {
-                reloadGroup.enter()
-                glucoseStore.preferredUnit { (unit, error) in
-                    if let unit = unit {
-                        self.charts.glucoseUnit = unit
-                    }
-
-                    if self.refreshContext.remove(.glucose) != nil {
-                        reloadGroup.enter()
-                        glucoseStore.getGlucoseValues(start: self.chartStartDate) { result -> Void in
-                            switch result {
-                            case .success(let values):
-                                self.charts.setGlucoseValues(values)
-                            case .failure(let error):
-                                self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
-                                self.refreshContext.update(with: .glucose)
-                                self.charts.setGlucoseValues([])
-                            }
+        // How far back should we show data? Use the screen size as a guide.
+        let minimumSegmentWidth: CGFloat = 50
+        let availableWidth = (size ?? self.tableView.bounds.size).width - self.charts.fixedHorizontalMargin
+        let totalHours = floor(Double(availableWidth / minimumSegmentWidth))
+        let historyHours = totalHours - (deviceManager.loopManager.insulinActionDuration ?? TimeInterval(hours: 4)).hours
 
-                            reloadGroup.leave()
-                        }
-                    }
-
-                    // For now, do this every time
-                    _ = self.refreshContext.remove(.status)
-                    reloadGroup.enter()
-                    self.dataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, _, _, _) -> Void in
-                        self.charts.setPredictedGlucoseValues(predictedGlucose ?? [])
-
-                        // Retry this refresh again if predicted glucose isn't available
-                        if predictedGlucose == nil {
-                            self.refreshContext.update(with: .status)
-                        }
+        var components = DateComponents()
+        components.minute = 0
+        let date = Date(timeIntervalSinceNow: -TimeInterval(hours: max(1, historyHours)))
+        chartStartDate = Calendar.current.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
 
-                        newRecommendedTempBasal = recommendedTempBasal
-                        self.lastTempBasal = lastTempBasal
-                        self.lastLoopCompleted = lastLoopCompleted
+        let reloadGroup = DispatchGroup()
+        var newLastLoopCompleted: Date?
+        var newLastTempBasal: DoseEntry?
+        var newRecommendedTempBasal: LoopDataManager.TempBasalRecommendation?
 
-                        if let lastPoint = self.charts.predictedGlucosePoints.last?.y {
-                            self.eventualGlucoseDescription = String(describing: lastPoint)
-                        } else {
-                            self.eventualGlucoseDescription = nil
-                        }
-
-                        reloadGroup.leave()
-                    }
-
-                    reloadGroup.leave()
-                }
+        reloadGroup.enter()
+        deviceManager.loopManager.glucoseStore.preferredUnit { (unit, error) in
+            if let unit = unit {
+                self.charts.glucoseUnit = unit
             }
 
-            if refreshContext.remove(.insulin) != nil {
+            if self.refreshContext.remove(.glucose) != nil {
                 reloadGroup.enter()
-                dataManager.doseStore.getInsulinOnBoardValues(start: chartStartDate) { result -> Void in
+                self.deviceManager.loopManager.glucoseStore.getGlucoseValues(start: self.chartStartDate) { (result) -> Void in
                     switch result {
-                    case .success(let values):
-                        self.charts.setIOBValues(values)
                     case .failure(let error):
-                        self.dataManager.logger.addError(error, fromSource: "DoseStore")
-                        self.refreshContext.update(with: .insulin)
-                        self.charts.setIOBValues([])
+                        self.deviceManager.logger.addError(error, fromSource: "GlucoseStore")
+                        self.refreshContext.update(with: .glucose)
+                        self.charts.setGlucoseValues([])
+                    case .success(let values):
+                        self.charts.setGlucoseValues(values)
                     }
+
                     reloadGroup.leave()
                 }
+            }
 
-                reloadGroup.enter()
-                dataManager.doseStore.getNormalizedDoseEntries(start: chartStartDate) { result -> Void in
-                    switch result {
-                    case .failure(let error):
-                        self.dataManager.logger.addError(error, fromSource: "DoseStore")
-                        self.refreshContext.update(with: .insulin)
-                        self.charts.setDoseEntries([])
-                    case .success(let doses):
-                        self.charts.setDoseEntries(doses)
-                    }
-                    reloadGroup.leave()
+            // For now, do this every time
+            _ = self.refreshContext.remove(.status)
+            reloadGroup.enter()
+            self.deviceManager.loopManager.getLoopState { (manager, state) -> Void in
+                self.charts.setPredictedGlucoseValues(state.predictedGlucose ?? [])
+
+                // Retry this refresh again if predicted glucose isn't available
+                if state.predictedGlucose == nil {
+                    self.refreshContext.update(with: .status)
                 }
 
-                reloadGroup.enter()
-                dataManager.doseStore.getTotalUnitsDelivered(since: Calendar.current.startOfDay(for: Date())) { result in
-                    switch result {
-                    case .success(let units):
-                        self.totalDelivery = units.value
-                    case .failure:
-                        self.refreshContext.update(with: .insulin)
-                        self.totalDelivery = nil
-                    }
+                switch self.bolusState {
+                case .recommended?, .enacting?:
+                    newRecommendedTempBasal = nil
+                case .none:
+                    newRecommendedTempBasal = state.recommendedTempBasal
+                }
 
-                    reloadGroup.leave()
+                newLastTempBasal = state.lastTempBasal
+                newLastLoopCompleted = state.lastLoopCompleted
+
+                if let lastPoint = self.charts.predictedGlucosePoints.last?.y {
+                    self.eventualGlucoseDescription = String(describing: lastPoint)
+                } else {
+                    self.eventualGlucoseDescription = nil
                 }
-            }
 
-            if refreshContext.remove(.carbs) != nil, let carbStore = dataManager.carbStore {
-                reloadGroup.enter()
-                carbStore.getCarbsOnBoardValues(startDate: chartStartDate) { (values, error) -> Void in
-                    if let error = error {
-                        self.dataManager.logger.addError(error, fromSource: "CarbStore")
-                        self.refreshContext.update(with: .carbs)
+                if self.refreshContext.remove(.targets) != nil {
+                    if let schedule = manager.settings.glucoseTargetRangeSchedule {
+                        self.charts.targetPointsCalculator = GlucoseRangeScheduleCalculator(schedule)
+                    } else {
+                        self.charts.targetPointsCalculator = nil
                     }
+                }
 
-                    self.charts.setCOBValues(values)
+                reloadGroup.leave()
+            }
 
-                    reloadGroup.leave()
+            reloadGroup.leave()
+        }
+
+        if refreshContext.remove(.insulin) != nil {
+            reloadGroup.enter()
+            deviceManager.loopManager.doseStore.getInsulinOnBoardValues(start: chartStartDate) { (result) -> Void in
+                switch result {
+                case .failure(let error):
+                    self.deviceManager.logger.addError(error, fromSource: "DoseStore")
+                    self.refreshContext.update(with: .insulin)
+                    self.charts.setIOBValues([])
+                case .success(let values):
+                    self.charts.setIOBValues(values)
+                }
+                reloadGroup.leave()
+            }
+
+            reloadGroup.enter()
+            deviceManager.loopManager.doseStore.getNormalizedDoseEntries(start: chartStartDate) { (result) -> Void in
+                switch result {
+                case .failure(let error):
+                    self.deviceManager.logger.addError(error, fromSource: "DoseStore")
+                    self.refreshContext.update(with: .insulin)
+                    self.charts.setDoseEntries([])
+                case .success(let doses):
+                    self.charts.setDoseEntries(doses)
+                }
+                reloadGroup.leave()
+            }
+
+            reloadGroup.enter()
+            deviceManager.loopManager.doseStore.getTotalUnitsDelivered(since: Calendar.current.startOfDay(for: Date())) { (result) in
+                switch result {
+                case .failure:
+                    self.refreshContext.update(with: .insulin)
+                    self.totalDelivery = nil
+                case .success(let total):
+                    self.totalDelivery = total.value
                 }
+
+                reloadGroup.leave()
             }
+        }
 
-            if let reservoir = dataManager.doseStore.lastReservoirValue {
-                if let capacity = dataManager.pumpState?.pumpModel?.reservoirCapacity {
-                    hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(capacity))))
+        if refreshContext.remove(.carbs) != nil {
+            reloadGroup.enter()
+            deviceManager.loopManager.carbStore.getCarbsOnBoardValues(startDate: chartStartDate) { (values, error) -> Void in
+                if let error = error {
+                    self.deviceManager.logger.addError(error, fromSource: "CarbStore")
+                    self.refreshContext.update(with: .carbs)
                 }
-                
-                hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate)
+
+                self.charts.setCOBValues(values)
+
+                reloadGroup.leave()
             }
+        }
 
-            if let level = dataManager.pumpBatteryChargeRemaining {
-                hudView.batteryHUD.batteryLevel = level
+        if let reservoir = deviceManager.loopManager.doseStore.lastReservoirValue {
+            if let capacity = deviceManager.pumpState?.pumpModel?.reservoirCapacity {
+                hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(capacity))))
             }
+            
+            hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate)
+        }
 
-            hudView.loopCompletionHUD.dosingEnabled = dataManager.loopManager.dosingEnabled
+        if let level = deviceManager.pumpBatteryChargeRemaining {
+            hudView.batteryHUD.batteryLevel = level
+        }
 
-            if refreshContext.remove(.targets) != nil {
-                if let schedule = dataManager.glucoseTargetRangeSchedule {
-                    charts.targetPointsCalculator = GlucoseRangeScheduleCalculator(schedule)
-                } else {
-                    charts.targetPointsCalculator = nil
-                }
-            }
+        hudView.loopCompletionHUD.dosingEnabled = deviceManager.loopManager.settings.dosingEnabled
 
-            workoutMode = dataManager.workoutModeEnabled
+        workoutMode = deviceManager.loopManager.settings.glucoseTargetRangeSchedule?.workoutModeEnabled
 
-            reloadGroup.notify(queue: DispatchQueue.main) {
-                if let glucose = self.dataManager.glucoseStore?.latestGlucose {
-                    self.hudView.glucoseHUD.setGlucoseQuantity(glucose.quantity.doubleValue(for: self.charts.glucoseUnit),
-                        at: glucose.startDate,
-                        unit: self.charts.glucoseUnit,
-                        sensor: self.dataManager.sensorInfo
-                    )
-                }
+        reloadGroup.notify(queue: .main) {
+            if let glucose = self.deviceManager.loopManager.glucoseStore.latestGlucose {
+                self.hudView.glucoseHUD.setGlucoseQuantity(glucose.quantity.doubleValue(for: self.charts.glucoseUnit),
+                    at: glucose.startDate,
+                    unit: self.charts.glucoseUnit,
+                    sensor: self.deviceManager.sensorInfo
+                )
+            }
 
-                // Fetch the current IOB subtitle
-                if let index = self.charts.iobPoints.closestIndexPriorToDate(Date()) {
-                    self.currentIOBDescription = String(describing: self.charts.iobPoints[index].y)
-                } else {
-                    self.currentIOBDescription = nil
-                }
-                // Fetch the current COB subtitle
-                if let index = self.charts.cobPoints.closestIndexPriorToDate(Date()) {
-                    self.currentCOBDescription = String(describing: self.charts.cobPoints[index].y)
-                } else {
-                    self.currentCOBDescription = nil
-                }
+            // Loop completion HUD
+            self.hudView.loopCompletionHUD.lastLoopCompleted = newLastLoopCompleted
+
+            // Net basal rate HUD
+            let date = newLastTempBasal?.startDate ?? Date()
+            if let scheduledBasal = self.deviceManager.loopManager.basalRateSchedule?.between(start: date,
+                                                                                end: date).first
+            {
+                let netBasal = NetBasal(
+                    lastTempBasal: newLastTempBasal,
+                    maxBasal: self.deviceManager.loopManager.settings.maximumBasalRatePerHour,
+                    scheduledBasal: scheduledBasal
+                )
+
+                self.hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percent, at: netBasal.startDate)
+            }
 
-                self.charts.prerender()
-
-                // Show/hide the recommended temp basal row
-                let oldRecommendedTempBasal = self.recommendedTempBasal
-                self.recommendedTempBasal = newRecommendedTempBasal
-                switch (oldRecommendedTempBasal, newRecommendedTempBasal) {
-                case (let old?, let new?) where old != new:
-                    self.tableView.reloadRows(at: [IndexPath(row: 0, section: Section.status.rawValue)], with: animated ? .top : .none)
-                case (.none, .some):
-                    self.tableView.insertRows(at: [IndexPath(row: 0, section: Section.status.rawValue)], with: animated ? .top : .none)
-                case (.some, .none):
-                    self.tableView.deleteRows(at: [IndexPath(row: 0, section: Section.status.rawValue)], with: animated ? .top : .none)
-                default:
-                    break
-                }
+            // Fetch the current IOB subtitle
+            if let index = self.charts.iobPoints.closestIndexPriorToDate(Date()) {
+                self.currentIOBDescription = String(describing: self.charts.iobPoints[index].y)
+            } else {
+                self.currentIOBDescription = nil
+            }
+            // Fetch the current COB subtitle
+            if let index = self.charts.cobPoints.closestIndexPriorToDate(Date()) {
+                self.currentCOBDescription = String(describing: self.charts.cobPoints[index].y)
+            } else {
+                self.currentCOBDescription = nil
+            }
 
-                for case let cell as ChartTableViewCell in self.tableView.visibleCells {
-                    cell.reloadChart()
+            self.charts.prerender()
+
+            // Show/hide the recommended temp basal row
+            let oldRecommendedTempBasal = self.recommendedTempBasal
+            self.recommendedTempBasal = newRecommendedTempBasal
+            switch (oldRecommendedTempBasal, newRecommendedTempBasal) {
+            case (let old?, let new?) where old != new:
+                self.tableView.reloadRows(at: [IndexPath(row: 0, section: Section.status.rawValue)], with: animated ? .top : .none)
+            case (.none, .some):
+                self.tableView.insertRows(at: [IndexPath(row: 0, section: Section.status.rawValue)], with: animated ? .top : .none)
+            case (.some, .none):
+                self.tableView.deleteRows(at: [IndexPath(row: 0, section: Section.status.rawValue)], with: animated ? .top : .none)
+            default:
+                break
+            }
 
-                    if let indexPath = self.tableView.indexPath(for: cell) {
-                        self.tableView(self.tableView, updateSubtitleFor: cell, at: indexPath)
-                    }
-                }
+            for case let cell as ChartTableViewCell in self.tableView.visibleCells {
+                cell.reloadChart()
 
-                self.reloading = false
+                if let indexPath = self.tableView.indexPath(for: cell) {
+                    self.tableView(self.tableView, updateSubtitleFor: cell, at: indexPath)
+                }
             }
         }
     }
@@ -396,17 +383,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         static let count = 4
     }
 
-    private lazy var charts: StatusChartsManager = {
-        let charts = StatusChartsManager(colors: .default, settings: .default)
-
-        charts.glucoseDisplayRange = (
-            min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
-            max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 175)
-        )
-
-        return charts
-    }()
-
     // MARK: Glucose
 
     private var eventualGlucoseDescription: String?
@@ -447,26 +423,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    // MARK: - HUD Data
-    
-    private var lastTempBasal: DoseEntry? {
-        didSet {
-            if let lastNetBasal = self.dataManager.loopManager.lastNetBasal {
-                DispatchQueue.main.async {
-                    self.hudView.basalRateHUD.setNetBasalRate(lastNetBasal.rate, percent: lastNetBasal.percent, at: lastNetBasal.startDate)
-                }
-            }
-        }
-    }
-
-    private var lastLoopCompleted: Date? {
-        didSet {
-            DispatchQueue.main.async {
-                self.hudView.loopCompletionHUD.lastLoopCompleted = self.lastLoopCompleted
-            }
-        }
-    }
-
     // MARK: - Toolbar data
 
     private var workoutMode: Bool? = nil {
@@ -528,7 +484,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
             self.tableView(tableView, updateSubtitleFor: cell, at: indexPath)
 
-            let alpha: CGFloat = charts.panGestureRecognizer?.state == .possible ? 1 : 0
+            let alpha: CGFloat = charts.gestureRecognizer?.state == .possible ? 1 : 0
             cell.titleLabel?.alpha = alpha
             cell.subtitleLabel?.alpha = alpha
 
@@ -641,14 +597,14 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
                 if recommendedTempBasal != nil && !settingTempBasal {
                     settingTempBasal = true
-                    self.dataManager.loopManager.enactRecommendedTempBasal { (success, error) -> Void in
+                    self.deviceManager.loopManager.enactRecommendedTempBasal { (error) in
                         DispatchQueue.main.async {
                             self.settingTempBasal = false
 
                             if let error = error {
-                                self.dataManager.logger.addError(error, fromSource: "TempBasal")
+                                self.deviceManager.logger.addError(error, fromSource: "TempBasal")
                                 self.presentAlertController(with: error)
-                            } else if success {
+                            } else {
                                 self.refreshContext.update(with: .status)
                                 self.reloadData()
                             }
@@ -659,43 +615,16 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    // MARK: - UIGestureRecognizer
-
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return true
-    }
-
-    @objc func handlePan(_ gestureRecognizer: UIGestureRecognizer) {
-        switch gestureRecognizer.state {
-        case .possible, .changed:
-            // Follow your dreams!
-            break
-        case .began, .cancelled, .ended, .failed:
-            for case let row as ChartTableViewCell in self.tableView.visibleCells {
-                let forwards = gestureRecognizer.state == .began
-                UIView.animate(withDuration: forwards ? 0.2 : 0.5, delay: forwards ? 0 : 1, animations: {
-                    let alpha: CGFloat = forwards ? 0 : 1
-                    row.titleLabel?.alpha = alpha
-                    row.subtitleLabel?.alpha = alpha
-                })
-            }
-        }
-    }
-
     // MARK: - Actions
 
     override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
         if identifier == CarbEntryEditViewController.className {
-            if let carbStore = dataManager.carbStore {
-                if carbStore.authorizationRequired {
-                    carbStore.authorize { (success, error) in
-                        if success {
-                            self.performSegue(withIdentifier: CarbEntryEditViewController.className, sender: sender)
-                        }
+            if deviceManager.loopManager.carbStore.authorizationRequired {
+                deviceManager.loopManager.carbStore.authorize { (success, error) in
+                    if success {
+                        self.performSegue(withIdentifier: CarbEntryEditViewController.className, sender: sender)
                     }
-                    return false
                 }
-            } else {
                 return false
             }
         }
@@ -714,45 +643,48 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
         switch targetViewController {
         case let vc as CarbEntryTableViewController:
-            vc.carbStore = dataManager.carbStore
+            vc.carbStore = deviceManager.loopManager.carbStore
             vc.hidesBottomBarWhenPushed = true
         case let vc as CarbEntryEditViewController:
-            if let carbStore = dataManager.carbStore {
-                vc.defaultAbsorptionTimes = carbStore.defaultAbsorptionTimes
-                vc.preferredUnit = carbStore.preferredUnit
-            }
+            vc.defaultAbsorptionTimes = deviceManager.loopManager.carbStore.defaultAbsorptionTimes
+            vc.preferredUnit = deviceManager.loopManager.carbStore.preferredUnit
         case let vc as InsulinDeliveryTableViewController:
-            vc.doseStore = dataManager.doseStore
+            vc.doseStore = deviceManager.loopManager.doseStore
             vc.hidesBottomBarWhenPushed = true
         case let vc as BolusViewController:
-            if let maxBolus = self.dataManager.maximumBolus {
-                vc.maxBolus = maxBolus
-            }
+            self.deviceManager.loopManager.getLoopState { (manager, state) in
+                let maximumBolus = manager.settings.maximumBolus
 
-            if let recommendation = sender as? BolusRecommendation {
-                vc.bolusRecommendation = recommendation
-            } else {
-                self.dataManager.loopManager.getRecommendedBolus { (recommendation, error) -> Void in
-                    if let error = error {
-                        self.dataManager.logger.addError(error, fromSource: "Bolus")
-                    } else if let recommendation = recommendation {
-                        DispatchQueue.main.async {
-                            vc.bolusRecommendation = recommendation
-                        }
+                let activeInsulin = state.insulinOnBoard?.value
+                let activeCarbohydrates = state.carbsOnBoard?.quantity.doubleValue(for: HKUnit.gram())
+                let bolusRecommendation: BolusRecommendation?
+
+                if let recommendation = sender as? BolusRecommendation {
+                    bolusRecommendation = recommendation
+                } else {
+                    do {
+                        bolusRecommendation = try state.recommendBolus()
+                    } catch let error {
+                        bolusRecommendation = nil
+                        self.deviceManager.logger.addError(error, fromSource: "Bolus")
                     }
                 }
-            }
-            self.dataManager.loopManager.getLoopStatus { (_, _, _, _, _, iob, cob, _) in
+
                 DispatchQueue.main.async {
+                    if let maxBolus = maximumBolus {
+                        vc.maxBolus = maxBolus
+                    }
+
                     vc.glucoseUnit = self.charts.glucoseUnit
-                    vc.activeInsulin = iob?.value
-                    vc.activeCarbohydrates = cob?.quantity.doubleValue(for: HKUnit.gram())
+                    vc.activeInsulin = activeInsulin
+                    vc.activeCarbohydrates = activeCarbohydrates
+                    vc.bolusRecommendation = bolusRecommendation
                 }
             }
         case let vc as PredictionTableViewController:
-            vc.dataManager = dataManager
+            vc.deviceManager = deviceManager
         case let vc as SettingsTableViewController:
-            vc.dataManager = dataManager
+            vc.dataManager = deviceManager
         default:
             break
         }
@@ -763,23 +695,21 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     /// - parameter segue: The unwind segue
     @IBAction func unwindFromEditing(_ segue: UIStoryboardSegue) {
         if let carbVC = segue.source as? CarbEntryEditViewController, let updatedEntry = carbVC.updatedCarbEntry {
-
-            dataManager.loopManager.addCarbEntryAndRecommendBolus(updatedEntry) { (recommendation, error) -> Void in
+            deviceManager.loopManager.addCarbEntryAndRecommendBolus(updatedEntry) { (result) -> Void in
                 DispatchQueue.main.async {
-                    self.refreshContext.update(with: .carbs)
-
-                    if let error = error {
+                    switch result {
+                    case .success(let recommendation):
+                        if self.active && self.visible, let bolus = recommendation?.amount, bolus > 0 {
+                            self.bolusState = .recommended
+                            self.performSegue(withIdentifier: BolusViewController.className, sender: recommendation)
+                        }
+                    case .failure(let error):
                         // Ignore bolus wizard errors
                         if error is CarbStore.CarbStoreError {
                             self.presentAlertController(with: error)
                         } else {
-                            self.dataManager.logger.addError(error, fromSource: "Bolus")
-                            self.reloadData()
+                            self.deviceManager.logger.addError(error, fromSource: "Bolus")
                         }
-                    } else if self.active && self.visible, let bolus = recommendation?.amount, bolus > 0 {
-                        self.performSegue(withIdentifier: BolusViewController.className, sender: recommendation)
-                    } else {
-                        self.reloadData()
                     }
                 }
             }
@@ -789,12 +719,12 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     @IBAction func unwindFromBolusViewController(_ segue: UIStoryboardSegue) {
         if let bolusViewController = segue.source as? BolusViewController {
             if let bolus = bolusViewController.bolus, bolus > 0 {
-                let startDate = Date()
-                dataManager.enactBolus(units: bolus) { (error) in
-                    if error != nil {
-                        NotificationManager.sendBolusFailureNotificationForAmount(bolus, atStartDate: startDate)
-                    }
+                self.bolusState = .enacting
+                deviceManager.enactBolus(units: bolus) { (_) in
+                    self.bolusState = nil
                 }
+            } else {
+                self.bolusState = nil
             }
         }
     }
@@ -820,10 +750,10 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     @IBAction func toggleWorkoutMode(_ sender: UIBarButtonItem) {
         if let workoutModeEnabled = workoutMode, workoutModeEnabled {
-            dataManager.disableWorkoutMode()
+            deviceManager.loopManager.disableWorkoutMode()
         } else {
             let vc = UIAlertController(workoutDurationSelectionHandler: { (endDate) in
-                self.dataManager.enableWorkoutMode(until: endDate)
+                self.deviceManager.loopManager.enableWorkoutMode(until: endDate)
             })
 
             present(vc, animated: true, completion: nil)
@@ -841,7 +771,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             let glucoseTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openCGMApp(_:)))
             hudView.glucoseHUD.addGestureRecognizer(glucoseTapGestureRecognizer)
             
-            if dataManager.cgm?.appURL != nil {
+            if deviceManager.cgm?.appURL != nil {
                 hudView.glucoseHUD.accessibilityHint = NSLocalizedString("Launches CGM app", comment: "Glucose HUD accessibility hint")
             }
 
@@ -855,15 +785,15 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     }
 
     @objc private func showLastError(_: Any) {
-        self.dataManager.loopManager.getLoopStatus { (_, _, _, _, _, _, _, error) -> Void in
-            if let error = error {
+        self.deviceManager.loopManager.getLoopState { (_, state) in
+            if let error = state.error {
                 self.presentAlertController(with: error)
             }
         }
     }
 
     @objc private func openCGMApp(_: Any) {
-        if let url = dataManager.cgm?.appURL, UIApplication.shared.canOpenURL(url) {
+        if let url = deviceManager.cgm?.appURL, UIApplication.shared.canOpenURL(url) {
             UIApplication.shared.open(url)
         }
     }
diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist
index 6b123c1cc..f5d44d4a7 100644
--- a/LoopTests/Info.plist
+++ b/LoopTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/LoopTests/KeychainManagerTests.swift b/LoopTests/KeychainManagerTests.swift
index 242849833..5035c399f 100644
--- a/LoopTests/KeychainManagerTests.swift
+++ b/LoopTests/KeychainManagerTests.swift
@@ -46,10 +46,15 @@ class KeychainManagerTests: XCTestCase {
         XCTAssertNil(manager.getDexcomShareCredentials())
 
         manager.setNightscoutURL(URL(string: "http://mysite.azurewebsites.net")!, secret: "ABCDEFG")
-        let nightscoutCredentials = manager.getNightscoutCredentials()!
+        var nightscoutCredentials = manager.getNightscoutCredentials()!
         XCTAssertEqual(URL(string: "http://mysite.azurewebsites.net")!, nightscoutCredentials.url)
         XCTAssertEqual("ABCDEFG", nightscoutCredentials.secret)
 
+        manager.setNightscoutURL(URL(string: "http://mysite.azurewebsites.net:4443")!, secret: "ABCDEFG")
+        nightscoutCredentials = manager.getNightscoutCredentials()!
+        XCTAssertEqual(URL(string: "http://mysite.azurewebsites.net:4443")!, nightscoutCredentials.url)
+        XCTAssertEqual("ABCDEFG", nightscoutCredentials.secret)
+
         manager.setNightscoutURL(nil, secret: nil)
         XCTAssertNil(manager.getNightscoutCredentials())
 
diff --git a/LoopUI/Info.plist b/LoopUI/Info.plist
index a48f18b76..b7b5a9d19 100644
--- a/LoopUI/Info.plist
+++ b/LoopUI/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/LoopUI/Managers/StatusChartsManager.swift b/LoopUI/Managers/StatusChartsManager.swift
index 5a89d9298..3f2325b9c 100644
--- a/LoopUI/Managers/StatusChartsManager.swift
+++ b/LoopUI/Managers/StatusChartsManager.swift
@@ -34,9 +34,11 @@ public final class StatusChartsManager {
 
     private let chartSettings: ChartSettings
 
+    private let labelsWidthY: CGFloat = 30
+
     /// The amount of horizontal space reserved for fixed margins
     public var fixedHorizontalMargin: CGFloat {
-        return chartSettings.leading + chartSettings.trailing + (chartSettings.labelsWidthY ?? 0) + chartSettings.labelsToAxisSpacingY
+        return chartSettings.leading + chartSettings.trailing + labelsWidthY + chartSettings.labelsToAxisSpacingY
     }
 
     private var integerFormatter: NumberFormatter {
@@ -51,7 +53,7 @@ public final class StatusChartsManager {
 
     private var guideLinesLayerSettings: ChartGuideLinesLayerSettings
 
-    public var panGestureRecognizer: UIPanGestureRecognizer?
+    public var gestureRecognizer: UIGestureRecognizer?
 
     public func didReceiveMemoryWarning() {
         xAxisValues = nil
@@ -108,7 +110,7 @@ public final class StatusChartsManager {
         }
     }
 
-    public var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliterUnit() {
+    public var glucoseUnit: HKUnit = HKUnit.milligramsPerDeciliter() {
         didSet {
             if glucoseUnit != oldValue {
                 // Regenerate the glucose display points
@@ -242,7 +244,7 @@ public final class StatusChartsManager {
     private var xAxisValues: [ChartAxisValue]? {
         didSet {
             if let xAxisValues = xAxisValues, xAxisValues.count > 1 {
-                xAxisModel = ChartAxisModel(axisValues: xAxisValues, lineColor: colors.axisLine)
+                xAxisModel = ChartAxisModel(axisValues: xAxisValues, lineColor: colors.axisLine, labelSpaceReservationMode: .fixed(20))
             } else {
                 xAxisModel = nil
             }
@@ -289,7 +291,7 @@ public final class StatusChartsManager {
     }
 
     private func generateGlucoseChartWithFrame(_ frame: CGRect) -> Chart? {
-        guard let xAxisModel = xAxisModel else {
+        guard let xAxisModel = xAxisModel, let xAxisValues = xAxisValues else {
             return nil
         }
 
@@ -299,7 +301,7 @@ public final class StatusChartsManager {
             return nil
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(points,
+        let yAxisValues = ChartAxisValuesStaticGenerator.generateYAxisValuesWithChartPoints(points,
             minSegmentCount: 2,
             maxSegmentCount: 4,
             multiple: glucoseUnit.glucoseUnitYAxisSegmentSize,
@@ -309,11 +311,11 @@ public final class StatusChartsManager {
             addPaddingSegmentIfEdge: false
         )
 
-        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine)
+        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine, labelSpaceReservationMode: .fixed(labelsWidthY))
 
         let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartSettings, chartFrame: frame, xModel: xAxisModel, yModel: yAxisModel)
 
-        let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
+        let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
         // The glucose targets
         var targetLayer: ChartPointsAreaLayer? = nil
@@ -321,24 +323,25 @@ public final class StatusChartsManager {
         if targetGlucosePoints.count > 1 {
             let alpha: CGFloat = targetOverridePoints.count > 1 ? 0.15 : 0.3
 
-            targetLayer = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: targetGlucosePoints, areaColor: colors.glucoseTint.withAlphaComponent(alpha), animDuration: 0, animDelay: 0, addContainerPoints: false)
+            targetLayer = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: targetGlucosePoints, areaColor: colors.glucoseTint.withAlphaComponent(alpha), animDuration: 0, animDelay: 0, addContainerPoints: false)
         }
 
         var targetOverrideLayer: ChartPointsAreaLayer? = nil
 
         if targetOverridePoints.count > 1 {
-            targetOverrideLayer = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: targetOverridePoints, areaColor: colors.glucoseTint.withAlphaComponent(0.3), animDuration: 0, animDelay: 0, addContainerPoints: false)
+            targetOverrideLayer = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: targetOverridePoints, areaColor: colors.glucoseTint.withAlphaComponent(0.3), animDuration: 0, animDelay: 0, addContainerPoints: false)
         }
 
         var targetOverrideDurationLayer: ChartPointsAreaLayer? = nil
 
         if targetOverrideDurationPoints.count > 1 {
-            targetOverrideDurationLayer = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: targetOverrideDurationPoints, areaColor: colors.glucoseTint.withAlphaComponent(0.3), animDuration: 0, animDelay: 0, addContainerPoints: false)
+            targetOverrideDurationLayer = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: targetOverrideDurationPoints, areaColor: colors.glucoseTint.withAlphaComponent(0.3), animDuration: 0, animDelay: 0, addContainerPoints: false)
         }
 
-        let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .xAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
+        // Grid lines
+        let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
 
-        let circles = ChartPointsScatterCirclesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: glucosePoints, displayDelay: 0, itemSize: CGSize(width: 4, height: 4), itemFillColor: colors.glucoseTint)
+        let circles = ChartPointsScatterCirclesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: glucosePoints, displayDelay: 0, itemSize: CGSize(width: 4, height: 4), itemFillColor: colors.glucoseTint, optimized: true)
 
         var alternatePrediction: ChartLayer?
 
@@ -346,7 +349,7 @@ public final class StatusChartsManager {
             // TODO: Bug in ChartPointsLineLayer requires a non-zero animation to draw the dash pattern
             let lineModel = ChartLineModel(chartPoints: altPoints, lineColor: colors.glucoseTint, lineWidth: 2, animDuration: 0.0001, animDelay: 0, dashPattern: [6, 5])
 
-            alternatePrediction = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+            alternatePrediction = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
         }
 
         var prediction: ChartLayer?
@@ -364,18 +367,17 @@ public final class StatusChartsManager {
                 dashPattern: [6, 5]
             )
 
-            prediction = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+            prediction = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
         }
 
-        if panGestureRecognizer != nil {
+        if gestureRecognizer != nil {
             glucoseChartCache = ChartPointsTouchHighlightLayerViewCache(
-                xAxis: xAxis,
-                yAxis: yAxis,
-                innerFrame: innerFrame,
+                xAxisLayer: xAxisLayer,
+                yAxisLayer: yAxisLayer,
+                axisLabelSettings: self.axisLabelSettings,
                 chartPoints: glucosePoints + (alternatePredictedGlucosePoints ?? predictedGlucosePoints),
                 tintColor: colors.glucoseTint,
-                labelCenterY: chartSettings.top,
-                gestureRecognizer: panGestureRecognizer
+                gestureRecognizer: gestureRecognizer
             )
         }
 
@@ -384,15 +386,15 @@ public final class StatusChartsManager {
             targetLayer,
             targetOverrideLayer,
             targetOverrideDurationLayer,
-            xAxis,
-            yAxis,
+            xAxisLayer,
+            yAxisLayer,
             glucoseChartCache?.highlightLayer,
             prediction,
             alternatePrediction,
             circles
         ]
 
-        return Chart(frame: frame, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
     }
 
     public func iobChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -408,7 +410,7 @@ public final class StatusChartsManager {
     }
 
     private func generateIOBChartWithFrame(_ frame: CGRect) -> Chart? {
-        guard let xAxisModel = xAxisModel else {
+        guard let xAxisModel = xAxisModel, let xAxisValues = xAxisValues else {
             return nil
         }
 
@@ -423,63 +425,62 @@ public final class StatusChartsManager {
             containerPoints.append(ChartPoint(x: last.x, y: ChartAxisValueInt(0)))
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(iobPoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 0.5, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
+        let yAxisValues = ChartAxisValuesStaticGenerator.generateYAxisValuesWithChartPoints(iobPoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 0.5, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
 
-        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine)
+        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine, labelSpaceReservationMode: .fixed(labelsWidthY))
 
         let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartSettings, chartFrame: frame, xModel: xAxisModel, yModel: yAxisModel)
 
-        let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
+        let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
         // The IOB area
         let lineModel = ChartLineModel(chartPoints: iobPoints, lineColor: UIColor.IOBTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
-        let iobLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+        let iobLine = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
 
         let iobArea: ChartPointsAreaLayer<ChartPoint>?
 
         if containerPoints.count > 1 {
-            iobArea = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: containerPoints, areaColor: UIColor.IOBTintColor.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
+            iobArea = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: containerPoints, areaColor: UIColor.IOBTintColor.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
         } else {
             iobArea = nil
         }
 
         // Grid lines
-        let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .xAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
+        let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
 
         // 0-line
         let dummyZeroChartPoint = ChartPoint(x: ChartAxisValueDouble(0), y: ChartAxisValueDouble(0))
-        let zeroGuidelineLayer = ChartPointsViewsLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: [dummyZeroChartPoint], viewGenerator: {(chartPointModel, layer, chart) -> UIView? in
+        let zeroGuidelineLayer = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: [dummyZeroChartPoint], viewGenerator: {(chartPointModel, layer, chart) -> UIView? in
             let width: CGFloat = 0.5
-            let viewFrame = CGRect(x: innerFrame.origin.x, y: chartPointModel.screenLoc.y - width / 2, width: innerFrame.size.width, height: width)
+            let viewFrame = CGRect(x: chart.contentView.bounds.minX, y: chartPointModel.screenLoc.y - width / 2, width: chart.contentView.bounds.size.width, height: width)
 
             let v = UIView(frame: viewFrame)
             v.backgroundColor = UIColor.IOBTintColor
             return v
         })
 
-        if panGestureRecognizer != nil {
+        if gestureRecognizer != nil {
             iobChartCache = ChartPointsTouchHighlightLayerViewCache(
-                xAxis: xAxis,
-                yAxis: yAxis,
-                innerFrame: innerFrame,
+                xAxisLayer: xAxisLayer,
+                yAxisLayer: yAxisLayer,
+                axisLabelSettings: self.axisLabelSettings,
                 chartPoints: iobPoints,
                 tintColor: UIColor.IOBTintColor,
-                labelCenterY: chartSettings.top,
-                gestureRecognizer: panGestureRecognizer
+                gestureRecognizer: gestureRecognizer
             )
         }
 
         let layers: [ChartLayer?] = [
             gridLayer,
-            xAxis,
-            yAxis,
+            xAxisLayer,
+            yAxisLayer,
             zeroGuidelineLayer,
             iobChartCache?.highlightLayer,
             iobArea,
             iobLine,
         ]
 
-        return Chart(frame: frame, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
     }
 
     public func cobChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -495,7 +496,7 @@ public final class StatusChartsManager {
     }
 
     private func generateCOBChartWithFrame(_ frame: CGRect) -> Chart? {
-        guard let xAxisModel = xAxisModel else {
+        guard let xAxisModel = xAxisModel, let xAxisValues = xAxisValues else {
             return nil
         }
 
@@ -510,52 +511,50 @@ public final class StatusChartsManager {
             containerPoints.append(ChartPoint(x: last.x, y: ChartAxisValueInt(0)))
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(cobPoints + cobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 10, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
+        let yAxisValues = ChartAxisValuesStaticGenerator.generateYAxisValuesWithChartPoints(cobPoints + cobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 10, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
 
-        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine)
+        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine, labelSpaceReservationMode: .fixed(labelsWidthY))
 
         let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartSettings, chartFrame: frame, xModel: xAxisModel, yModel: yAxisModel)
 
-        let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
+        let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
         // The COB area
         let lineModel = ChartLineModel(chartPoints: cobPoints, lineColor: UIColor.COBTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
-        let cobLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+        let cobLine = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
 
         let cobArea: ChartPointsAreaLayer<ChartPoint>?
 
         if containerPoints.count > 0 {
-            cobArea = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: containerPoints, areaColor: UIColor.COBTintColor.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
+            cobArea = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: containerPoints, areaColor: UIColor.COBTintColor.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
         } else {
             cobArea = nil
         }
 
         // Grid lines
-        let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .xAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
+        let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
 
-
-        if panGestureRecognizer != nil {
+        if gestureRecognizer != nil {
             cobChartCache = ChartPointsTouchHighlightLayerViewCache(
-                xAxis: xAxis,
-                yAxis: yAxis,
-                innerFrame: innerFrame,
+                xAxisLayer: xAxisLayer,
+                yAxisLayer: yAxisLayer,
+                axisLabelSettings: self.axisLabelSettings,
                 chartPoints: cobPoints,
                 tintColor: UIColor.COBTintColor,
-                labelCenterY: chartSettings.top,
-                gestureRecognizer: panGestureRecognizer
+                gestureRecognizer: gestureRecognizer
             )
         }
 
         let layers: [ChartLayer?] = [
             gridLayer,
-            xAxis,
-            yAxis,
+            xAxisLayer,
+            yAxisLayer,
             cobChartCache?.highlightLayer,
             cobArea,
             cobLine
         ]
 
-        return Chart(frame: frame, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
     }
 
     public func doseChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -571,28 +570,28 @@ public final class StatusChartsManager {
     }
 
     private func generateDoseChartWithFrame(_ frame: CGRect) -> Chart? {
-        guard let xAxisModel = xAxisModel else {
+        guard let xAxisModel = xAxisModel, let xAxisValues = xAxisValues else {
             return nil
         }
 
         let integerFormatter = self.integerFormatter
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(basalDosePoints + bolusDosePoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: log10(2) / 2, axisValueGenerator: { ChartAxisValueDoubleLog(screenLocDouble: $0, formatter: integerFormatter, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
+        let yAxisValues = ChartAxisValuesStaticGenerator.generateYAxisValuesWithChartPoints(basalDosePoints + bolusDosePoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: log10(2) / 2, axisValueGenerator: { ChartAxisValueDoubleLog(screenLocDouble: $0, formatter: integerFormatter, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
 
-        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine)
+        let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: colors.axisLine, labelSpaceReservationMode: .fixed(labelsWidthY))
 
         let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartSettings, chartFrame: frame, xModel: xAxisModel, yModel: yAxisModel)
 
-        let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
+        let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
         // The dose area
         let lineModel = ChartLineModel(chartPoints: basalDosePoints, lineColor: colors.doseTint, lineWidth: 2, animDuration: 0, animDelay: 0)
-        let doseLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+        let doseLine = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
 
         let doseArea: ChartPointsAreaLayer<ChartPoint>?
 
         if basalDosePoints.count > 1 {
-            doseArea = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: basalDosePoints, areaColor: colors.doseTint.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
+            doseArea = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: basalDosePoints, areaColor: colors.doseTint.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
         } else {
             doseArea = nil
         }
@@ -600,41 +599,40 @@ public final class StatusChartsManager {
         let bolusLayer: ChartPointsScatterDownTrianglesLayer<ChartPoint>?
 
         if bolusDosePoints.count > 0 {
-            bolusLayer = ChartPointsScatterDownTrianglesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: bolusDosePoints, displayDelay: 0, itemSize: CGSize(width: 12, height: 12), itemFillColor: colors.doseTint)
+            bolusLayer = ChartPointsScatterDownTrianglesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: bolusDosePoints, displayDelay: 0, itemSize: CGSize(width: 12, height: 12), itemFillColor: colors.doseTint)
         } else {
             bolusLayer = nil
         }
 
         // Grid lines
-        let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .xAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
+        let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
 
         // 0-line
         let dummyZeroChartPoint = ChartPoint(x: ChartAxisValueDouble(0), y: ChartAxisValueDouble(0))
-        let zeroGuidelineLayer = ChartPointsViewsLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: [dummyZeroChartPoint], viewGenerator: {(chartPointModel, layer, chart) -> UIView? in
+        let zeroGuidelineLayer = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: [dummyZeroChartPoint], viewGenerator: {(chartPointModel, layer, chart) -> UIView? in
             let width: CGFloat = 1
-            let viewFrame = CGRect(x: innerFrame.origin.x, y: chartPointModel.screenLoc.y - width / 2, width: innerFrame.size.width, height: width)
+            let viewFrame = CGRect(x: chart.contentView.bounds.minX, y: chartPointModel.screenLoc.y - width / 2, width: chart.contentView.bounds.size.width, height: width)
 
             let v = UIView(frame: viewFrame)
             v.backgroundColor = self.colors.doseTint
             return v
         })
 
-        if panGestureRecognizer != nil {
+        if gestureRecognizer != nil {
             doseChartCache = ChartPointsTouchHighlightLayerViewCache(
-                xAxis: xAxis,
-                yAxis: yAxis,
-                innerFrame: innerFrame,
+                xAxisLayer: xAxisLayer,
+                yAxisLayer: yAxisLayer,
+                axisLabelSettings: self.axisLabelSettings,
                 chartPoints: allDosePoints,
                 tintColor: colors.doseTint,
-                labelCenterY: chartSettings.top,
-                gestureRecognizer: panGestureRecognizer
+                gestureRecognizer: gestureRecognizer
             )
         }
 
         let layers: [ChartLayer?] = [
             gridLayer,
-            xAxis,
-            yAxis,
+            xAxisLayer,
+            yAxisLayer,
             zeroGuidelineLayer,
             doseChartCache?.highlightLayer,
             doseArea,
@@ -642,7 +640,7 @@ public final class StatusChartsManager {
             bolusLayer
         ]
         
-        return Chart(frame: frame, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
     }
 
     private func generateXAxisValues() {
@@ -660,9 +658,11 @@ public final class StatusChartsManager {
             )
         ]
 
-        let xAxisValues = ChartAxisValuesGenerator.generateXAxisValuesWithChartPoints(points,
-            minSegmentCount: 4,
-            maxSegmentCount: 10,
+        let segments = ceil(endDate.timeIntervalSince(startDate).hours)
+
+        let xAxisValues = ChartAxisValuesStaticGenerator.generateXAxisValuesWithChartPoints(points,
+            minSegmentCount: segments - 1,
+            maxSegmentCount: segments + 1,
             multiple: TimeInterval(hours: 1),
             axisValueGenerator: {
                 ChartAxisValueDate(
@@ -686,7 +686,8 @@ public final class StatusChartsManager {
         }
 
         if let calculator = targetPointsCalculator,
-           targetGlucosePoints.count == 0 {
+           targetGlucosePoints.count == 0
+        {
             calculator.calculate(xAxisValues)
             targetGlucosePoints = calculator.glucosePoints
             targetOverridePoints = calculator.overridePoints
@@ -697,7 +698,7 @@ public final class StatusChartsManager {
 
 private extension HKUnit {
     var glucoseUnitYAxisSegmentSize: Double {
-        if self == HKUnit.milligramsPerDeciliterUnit() {
+        if self == HKUnit.milligramsPerDeciliter() {
             return 25
         } else {
             return 1
diff --git a/LoopUI/Models/ChartAxisValueDoubleUnit.swift b/LoopUI/Models/ChartAxisValueDoubleUnit.swift
index cb612d87e..136939161 100644
--- a/LoopUI/Models/ChartAxisValueDoubleUnit.swift
+++ b/LoopUI/Models/ChartAxisValueDoubleUnit.swift
@@ -26,6 +26,6 @@ public final class ChartAxisValueDoubleUnit: ChartAxisValueDouble {
     }
 
     override public var description: String {
-        return "\(super.description) \(unitString)"
+        return formatter.string(from: scalar, unit: unitString) ?? ""
     }
 }
diff --git a/LoopUI/Views/ChartPointsScatterDownTrianglesLayer.swift b/LoopUI/Views/ChartPointsScatterDownTrianglesLayer.swift
index 2d3ff2e02..45504ad5d 100644
--- a/LoopUI/Views/ChartPointsScatterDownTrianglesLayer.swift
+++ b/LoopUI/Views/ChartPointsScatterDownTrianglesLayer.swift
@@ -10,12 +10,30 @@ import SwiftCharts
 
 
 public class ChartPointsScatterDownTrianglesLayer<T: ChartPoint>: ChartPointsScatterLayer<T> {
-
-    required public init(xAxis: ChartAxisLayer, yAxis: ChartAxisLayer, innerFrame: CGRect, chartPoints: [T], displayDelay: Float, itemSize: CGSize, itemFillColor: UIColor) {
-        super.init(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: chartPoints, displayDelay: displayDelay, itemSize: itemSize, itemFillColor: itemFillColor)
+    public required init(
+        xAxis: ChartAxis,
+        yAxis: ChartAxis,
+        chartPoints: [T],
+        displayDelay: Float,
+        itemSize: CGSize,
+        itemFillColor: UIColor,
+        optimized: Bool = false,
+        tapSettings: ChartPointsTapSettings<T>? = nil
+    ) {
+        // optimized must be set to false because `generateCGLayer` isn't public and can't be overridden
+        super.init(
+            xAxis: xAxis,
+            yAxis: yAxis,
+            chartPoints: chartPoints,
+            displayDelay: displayDelay,
+            itemSize: itemSize,
+            itemFillColor: itemFillColor,
+            optimized: false,
+            tapSettings: tapSettings
+        )
     }
 
-    override public func drawChartPointModel(context: CGContext, chartPointModel: ChartPointLayerModel<T>) {
+    public override func drawChartPointModel(_ context: CGContext, chartPointModel: ChartPointLayerModel<T>, view: UIView) {
         let w = self.itemSize.width
         let h = self.itemSize.height
 
diff --git a/LoopUI/Views/ChartPointsTouchHighlightLayerViewCache.swift b/LoopUI/Views/ChartPointsTouchHighlightLayerViewCache.swift
index e436d5e7c..3dfd55d40 100644
--- a/LoopUI/Views/ChartPointsTouchHighlightLayerViewCache.swift
+++ b/LoopUI/Views/ChartPointsTouchHighlightLayerViewCache.swift
@@ -26,22 +26,26 @@ final class ChartPointsTouchHighlightLayerViewCache {
 
     private lazy var labelX: UILabel = {
         let label = UILabel()
-        label.font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption1)
-        label.textColor = UIColor.secondaryLabelColor
+        label.font = self.axisLabelSettings.font
+        label.textColor = self.axisLabelSettings.fontColor
 
         return label
     }()
 
+    private let axisLabelSettings: ChartLabelSettings
+
     private(set) var highlightLayer: ChartPointsTouchHighlightLayer<ChartPoint, UIView>!
 
-    init(xAxis: ChartAxisLayer, yAxis: ChartAxisLayer, innerFrame: CGRect, chartPoints: [ChartPoint], tintColor: UIColor, labelCenterY: CGFloat, gestureRecognizer: UIPanGestureRecognizer? = nil) {
+    init(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, axisLabelSettings: ChartLabelSettings, chartPoints: [ChartPoint], tintColor: UIColor, gestureRecognizer: UIGestureRecognizer? = nil, onCompleteHighlight: (() -> Void)? = nil) {
+
+        self.axisLabelSettings = axisLabelSettings
 
         highlightLayer = ChartPointsTouchHighlightLayer(
-            xAxis: xAxis,
-            yAxis: yAxis,
-            innerFrame: innerFrame,
+            xAxis: xAxisLayer.axis,
+            yAxis: yAxisLayer.axis,
             chartPoints: chartPoints,
             gestureRecognizer: gestureRecognizer,
+            onCompleteHighlight: onCompleteHighlight,
             modelFilter: { (screenLoc, chartPointModels) -> ChartPointLayerModel<ChartPoint>? in
                 if let index = chartPointModels.map({ $0.screenLoc.x }).findClosestElementIndex(matching: screenLoc.x) {
                     return chartPointModels[index]
@@ -51,12 +55,16 @@ final class ChartPointsTouchHighlightLayerViewCache {
             },
             viewGenerator: { [unowned self] (chartPointModel, layer, chart) -> UIView? in
                 let containerView = self.containerView
-                containerView.frame = chart.bounds
+                containerView.frame = chart.contentView.bounds
                 containerView.alpha = 1  // This is animated to 0 when touch last ended
 
                 let xAxisOverlayView = self.xAxisOverlayView
                 if xAxisOverlayView.superview == nil {
-                    xAxisOverlayView.frame = xAxis.rect.offsetBy(dx: 0, dy: 1)
+                    xAxisOverlayView.frame = CGRect(
+                        origin: CGPoint(x: containerView.bounds.minX,
+                                        y: containerView.bounds.maxY + 1), // Don't clip X line
+                        size: xAxisLayer.frame.size
+                    )
                     xAxisOverlayView.backgroundColor = UIColor.white
                     xAxisOverlayView.isOpaque = true
                     containerView.addSubview(xAxisOverlayView)
@@ -74,9 +82,9 @@ final class ChartPointsTouchHighlightLayerViewCache {
 
                     label.text = text
                     label.sizeToFit()
-                    label.center.y = innerFrame.origin.y - 21
+                    label.center.y = containerView.frame.minY - 21
                     label.center.x = chartPointModel.screenLoc.x
-                    label.frame.origin.x = min(max(label.frame.origin.x, innerFrame.origin.x), innerFrame.maxX - label.frame.size.width)
+                    label.frame.origin.x = min(max(label.frame.origin.x, containerView.bounds.minX), containerView.bounds.maxX - label.frame.size.width)
                     label.frame.origin.makeIntegralInPlaceWithDisplayScale(chart.view.traitCollection.displayScale)
 
                     if label.superview == nil {
diff --git a/WatchApp Extension/ComplicationController.swift b/WatchApp Extension/ComplicationController.swift
index 29d21d309..ccf748ec0 100644
--- a/WatchApp Extension/ComplicationController.swift	
+++ b/WatchApp Extension/ComplicationController.swift	
@@ -20,7 +20,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     
     func getTimelineStartDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) {
         if let date = ExtensionDelegate.shared().lastContext?.glucoseDate {
-            handler(date as Date)
+            handler(date)
         } else {
             handler(nil)
         }
@@ -28,7 +28,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     
     func getTimelineEndDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) {
         if let date = ExtensionDelegate.shared().lastContext?.glucoseDate {
-            handler(date as Date)
+            handler(date)
         } else {
             handler(nil)
         }
diff --git a/WatchApp Extension/Controllers/StatusInterfaceController.swift b/WatchApp Extension/Controllers/StatusInterfaceController.swift
index 62a778101..8aac1f18b 100644
--- a/WatchApp Extension/Controllers/StatusInterfaceController.swift	
+++ b/WatchApp Extension/Controllers/StatusInterfaceController.swift	
@@ -25,7 +25,7 @@ final class StatusInterfaceController: WKInterfaceController, ContextUpdatable {
         lastContext = context
 
         if let date = context?.loopLastRunDate {
-            self.loopTimer.setDate(date as Date)
+            self.loopTimer.setDate(date)
             self.loopTimer.setHidden(false)
             self.loopTimer.start()
 
diff --git a/WatchApp Extension/ExtensionDelegate.swift b/WatchApp Extension/ExtensionDelegate.swift
index 0e00462b7..de3c30d51 100644
--- a/WatchApp Extension/ExtensionDelegate.swift	
+++ b/WatchApp Extension/ExtensionDelegate.swift	
@@ -9,6 +9,7 @@
 import WatchConnectivity
 import WatchKit
 import os
+import UserNotifications
 
 
 final class ExtensionDelegate: NSObject, WKExtensionDelegate {
@@ -26,8 +27,8 @@ final class ExtensionDelegate: NSObject, WKExtensionDelegate {
         // It seems, according to [this sample code](https://developer.apple.com/library/prerelease/content/samplecode/QuickSwitch/Listings/QuickSwitch_WatchKit_Extension_ExtensionDelegate_swift.html#//apple_ref/doc/uid/TP40016647-QuickSwitch_WatchKit_Extension_ExtensionDelegate_swift-DontLinkElementID_8)
         // that WCSession activation and delegation and WKWatchConnectivityRefreshBackgroundTask don't have any determinism,
         // and that KVO is the "recommended" way to deal with it.
-        session.addObserver(self, forKeyPath: "activationState", options: [], context: nil)
-        session.addObserver(self, forKeyPath: "hasContentPending", options: [], context: nil)
+        session.addObserver(self, forKeyPath: #keyPath(WCSession.activationState), options: [], context: nil)
+        session.addObserver(self, forKeyPath: #keyPath(WCSession.hasContentPending), options: [], context: nil)
 
         session.activate()
     }
@@ -40,6 +41,7 @@ final class ExtensionDelegate: NSObject, WKExtensionDelegate {
 
     func applicationDidFinishLaunching() {
         // Perform any final initialization of your application.
+        UNUserNotificationCenter.current().delegate = self
     }
 
     func applicationDidBecomeActive() {
@@ -170,6 +172,13 @@ extension ExtensionDelegate: WCSessionDelegate {
 }
 
 
+extension ExtensionDelegate: UNUserNotificationCenterDelegate {
+    func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        completionHandler([.badge, .sound, .alert])
+    }
+}
+
+
 extension ExtensionDelegate {
 
     /// Global shortcut to present an alert for a specific error out-of-context with a specific interface controller.
diff --git a/WatchApp Extension/Info.plist b/WatchApp Extension/Info.plist
index 6a31f21cd..973fcf9c8 100644
--- a/WatchApp Extension/Info.plist	
+++ b/WatchApp Extension/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/WatchApp Extension/PushNotificationPayload.apns b/WatchApp Extension/PushNotificationPayload.apns
index e793a02b3..edffb5756 100644
--- a/WatchApp Extension/PushNotificationPayload.apns	
+++ b/WatchApp Extension/PushNotificationPayload.apns	
@@ -1,16 +1,17 @@
 {
     "aps": {
         "alert": {
-            "body": "Test message",
-            "title": "Optional title"
+            "body": "RileyLink timed out. Check your pump before retrying.",
+            "title": "Bolus",
+            "subtitle": "3.5 U bolus failed"
         },
-        "category": "myCategory"
+        "category": "bolusFailure"
     },
     
     "WatchKit Simulator Actions": [
         {
-            "title": "First Button",
-            "identifier": "firstButtonAction"
+            "title": "Retry",
+            "identifier": "retryBolus"
         }
     ],
     
diff --git a/WatchApp/Base.lproj/Interface.storyboard b/WatchApp/Base.lproj/Interface.storyboard
index f58c6910b..6cccfe1bb 100644
--- a/WatchApp/Base.lproj/Interface.storyboard
+++ b/WatchApp/Base.lproj/Interface.storyboard
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rNf-Mh-tID">
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rNf-Mh-tID">
+    <device id="watch38" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="11077"/>
+        <deployment identifier="watchOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="12029"/>
     </dependencies>
     <scenes>
         <!--AddCarbsInterfaceController-->
@@ -227,11 +231,23 @@
         <!--Static Notification Interface Controller-->
         <scene sceneID="AEw-b0-oYE">
             <objects>
-                <notificationController id="YCC-NB-fut">
+                <notificationController id="YCC-NB-fut" customClass="NotificationController" customModule="WatchApp_Extension">
                     <items>
-                        <label alignment="left" text="Alert Label" id="XkS-y5-khE"/>
+                        <group width="1" alignment="left" layout="vertical" id="gMp-VZ-EBe">
+                            <items>
+                                <label alignment="left" text="Bolus Failed" id="jj3-Gq-HBy">
+                                    <fontDescription key="font" style="UICTFontTextStyleHeadline"/>
+                                </label>
+                                <label alignment="left" text="&lt;body&gt;" numberOfLines="0" id="XkS-y5-khE">
+                                    <fontDescription key="font" style="UICTFontTextStyleBody"/>
+                                </label>
+                            </items>
+                        </group>
                     </items>
-                    <notificationCategory key="notificationCategory" identifier="myCategory" id="JfB-70-Muf"/>
+                    <notificationCategory key="notificationCategory" identifier="bolusFailure" id="JfB-70-Muf">
+                        <color key="sashColor" red="1" green="0.58431372549019611" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </notificationCategory>
+                    <color key="backgroundColor" red="1" green="0.58431372549019611" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                     <connections>
                         <outlet property="notificationAlertLabel" destination="XkS-y5-khE" id="49B-RR-99y"/>
                     </connections>
diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist
index 5f898dc69..ba53550b5 100644
--- a/WatchApp/Info.plist
+++ b/WatchApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>