diff --git a/Cartfile b/Cartfile
index a07bfa0319..2d3f130fe4 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" == 2.0
+github "LoopKit/LoopKit" "dev"
 github "LoopKit/CGMBLEKit" "dev"
 github "i-schuetz/SwiftCharts" == 0.6.1
 github "mddub/dexcom-share-client-swift" == 0.4.1
 github "mddub/G4ShareSpy" == 0.3.3
-github "ps2/rileylink_ios" == 2.0.2
+github "ps2/rileylink_ios" "dev"
 github "LoopKit/Amplitude-iOS" "decreepify"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 8827b4175d..5c5672a187 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,7 +1,7 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "v2.1.0"
-github "LoopKit/LoopKit" "v2.0"
-github "i-schuetz/SwiftCharts" "6b55a26a7b0b95e49202ddc1db5404702fce114f"
+github "LoopKit/CGMBLEKit" "1f9d0f221b886f12bcb2c46dc0b551589b623210"
+github "LoopKit/LoopKit" "f2f82d9bd67cd329b4021b365b7ebdec4b39f0af"
+github "i-schuetz/SwiftCharts" "0.6.1"
 github "mddub/G4ShareSpy" "v0.3.3"
 github "mddub/dexcom-share-client-swift" "v0.4.1"
-github "ps2/rileylink_ios" "v2.0.2"
+github "ps2/rileylink_ios" "3b257bdfa5f01ebaa343c9e6e1c2140ffd2569a1"
diff --git a/Common/Extensions/NSUserDefaults.swift b/Common/Extensions/NSUserDefaults.swift
index 4ba5a594f5..7d5d73edde 100644
--- a/Common/Extensions/NSUserDefaults.swift
+++ b/Common/Extensions/NSUserDefaults.swift
@@ -9,8 +9,6 @@
 import Foundation
 import LoopKit
 import HealthKit
-import MinimedKit
-import RileyLinkKit
 
 
 extension UserDefaults {
@@ -18,12 +16,9 @@ extension UserDefaults {
     private enum Key: String {
         case basalRateSchedule = "com.loudnate.Naterade.BasalRateSchedule"
         case carbRatioSchedule = "com.loudnate.Naterade.CarbRatioSchedule"
-        case connectedPeripheralIDs = "com.loudnate.Naterade.ConnectedPeripheralIDs"
         case insulinModelSettings = "com.loopkit.Loop.insulinModelSettings"
         case loopSettings = "com.loopkit.Loop.loopSettings"
         case insulinSensitivitySchedule = "com.loudnate.Naterade.InsulinSensitivitySchedule"
-        case pumpSettings = "com.loopkit.Loop.PumpSettings"
-        case pumpState = "com.loopkit.Loop.PumpState"
     }
 
     var basalRateSchedule: BasalRateSchedule? {
@@ -52,15 +47,6 @@ extension UserDefaults {
         }
     }
 
-    var connectedPeripheralIDs: [String] {
-        get {
-            return array(forKey: Key.connectedPeripheralIDs.rawValue) as? [String] ?? []
-        }
-        set {
-            set(newValue, forKey: Key.connectedPeripheralIDs.rawValue)
-        }
-    }
-
     var insulinModelSettings: InsulinModelSettings? {
         get {
             if let rawValue = dictionary(forKey: Key.insulinModelSettings.rawValue) {
@@ -150,70 +136,4 @@ extension UserDefaults {
             set(newValue?.rawValue, forKey: Key.insulinSensitivitySchedule.rawValue)
         }
     }
-
-    var pumpSettings: PumpSettings? {
-        get {
-            if let raw = dictionary(forKey: Key.pumpSettings.rawValue) {
-                return PumpSettings(rawValue: raw)
-            } else {
-                // Migrate the version 0 case
-                let standard = UserDefaults.standard
-                defer {
-                    standard.removeObject(forKey: "com.loudnate.Naterade.PumpID")
-                    standard.removeObject(forKey: "com.loopkit.Loop.PumpRegion")
-                }
-
-                guard let pumpID = standard.string(forKey: "com.loudnate.Naterade.PumpID") else {
-                    return nil
-                }
-
-                let settings = PumpSettings(
-                    pumpID: pumpID,
-                    // Defaults to 0 / northAmerica
-                    pumpRegion: PumpRegion(rawValue: standard.integer(forKey: "com.loopkit.Loop.PumpRegion"))
-                )
-
-                self.pumpSettings = settings
-
-                return settings
-            }
-        }
-        set {
-            set(newValue?.rawValue, forKey: Key.pumpSettings.rawValue)
-        }
-    }
-
-    var pumpState: PumpState? {
-        get {
-            if let raw = dictionary(forKey: Key.pumpState.rawValue) {
-                return PumpState(rawValue: raw)
-            } else {
-                // Migrate the version 0 case
-                let standard = UserDefaults.standard
-                defer {
-                    standard.removeObject(forKey: "com.loudnate.Naterade.PumpModelNumber")
-                    standard.removeObject(forKey: "com.loudnate.Naterade.PumpTimeZone")
-                }
-
-                var state = PumpState()
-
-                if let pumpModelNumber = standard.string(forKey: "com.loudnate.Naterade.PumpModelNumber") {
-                    state.pumpModel = PumpModel(rawValue: pumpModelNumber)
-                }
-
-                if let offset = standard.object(forKey: "com.loudnate.Naterade.PumpTimeZone") as? NSNumber,
-                    let timeZone = TimeZone(secondsFromGMT: offset.intValue)
-                {
-                    state.timeZone = timeZone
-                }
-
-                self.pumpState = state
-
-                return state
-            }
-        }
-        set {
-            set(newValue?.rawValue, forKey: Key.pumpState.rawValue)
-        }
-    }
 }
diff --git a/Common/Models/CGM.swift b/Common/Models/CGM.swift
index a5efda95e6..0cfb219a51 100644
--- a/Common/Models/CGM.swift
+++ b/Common/Models/CGM.swift
@@ -6,12 +6,13 @@
 //
 
 import Foundation
+import LoopKit
 
 
 enum CGM {
     case g5(transmitterID: String?)
     case g4
-    case enlite
+    case usePump
 
     var appURL: URL? {
         switch self {
@@ -26,7 +27,7 @@ enum CGM {
                 }
             }
             return nil
-        case .enlite:
+        case .usePump:
             return nil
         }
     }
@@ -51,8 +52,8 @@ extension CGM: RawRepresentable {
             self = .g5(transmitterID: rawValue["transmitterID"] as? String)
         case .g4?:
             self = .g4
-        case .enlite?:
-            self = .enlite
+        case .usePump?:
+            self = .usePump
         case .none:
             return nil
         }
@@ -61,14 +62,14 @@ extension CGM: RawRepresentable {
     private enum CGMType: String {
         case g5
         case g4
-        case enlite
+        case usePump = "enlite"
     }
 
     private var type: CGMType {
         switch self {
         case .g5: return .g5
         case .g4: return .g4
-        case .enlite: return .enlite
+        case .usePump: return .usePump
         }
     }
 
@@ -90,7 +91,7 @@ extension CGM: RawRepresentable {
 extension CGM: Equatable {
     static func ==(lhs: CGM, rhs: CGM) -> Bool {
         switch (lhs, rhs) {
-        case (.g4, .g4), (.enlite, .enlite):
+        case (.g4, .g4), (.usePump, .usePump):
             return true
         case (.g5(let a), .g5(let b)):
             return a == b
diff --git a/Common/Models/GlucoseTrend.swift b/Common/Models/GlucoseTrend.swift
deleted file mode 100644
index 99b2999708..0000000000
--- a/Common/Models/GlucoseTrend.swift
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  GlucoseTrend.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 8/2/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import Foundation
-
-
-public enum GlucoseTrend: Int {
-    case upUpUp       = 1
-    case upUp         = 2
-    case up           = 3
-    case flat         = 4
-    case down         = 5
-    case downDown     = 6
-    case downDownDown = 7
-
-    var symbol: String {
-        switch self {
-        case .upUpUp:
-            return "⇈"
-        case .upUp:
-            return "↑"
-        case .up:
-            return "↗︎"
-        case .flat:
-            return "→"
-        case .down:
-            return "↘︎"
-        case .downDown:
-            return "↓"
-        case .downDownDown:
-            return "⇊"
-        }
-    }
-
-    var localizedDescription: String {
-        switch self {
-        case .upUpUp:
-            return NSLocalizedString("Rising very fast", comment: "Glucose trend up-up-up")
-        case .upUp:
-            return NSLocalizedString("Rising fast", comment: "Glucose trend up-up")
-        case .up:
-            return NSLocalizedString("Rising", comment: "Glucose trend up")
-        case .flat:
-            return NSLocalizedString("Flat", comment: "Glucose trend flat")
-        case .down:
-            return NSLocalizedString("Falling", comment: "Glucose trend down")
-        case .downDown:
-            return NSLocalizedString("Falling fast", comment: "Glucose trend down-down")
-        case .downDownDown:
-            return NSLocalizedString("Falling very fast", comment: "Glucose trend down-down-down")
-        }
-    }
-}
diff --git a/Common/Models/LoopSettings.swift b/Common/Models/LoopSettings.swift
index fbab2c1656..3e932b4813 100644
--- a/Common/Models/LoopSettings.swift
+++ b/Common/Models/LoopSettings.swift
@@ -6,7 +6,6 @@
 //
 
 import LoopKit
-import RileyLinkBLEKit
 
 
 struct LoopSettings {
diff --git a/Common/Models/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift
index c64f5b72cd..f385cf30cc 100644
--- a/Common/Models/StatusExtensionContext.swift
+++ b/Common/Models/StatusExtensionContext.swift
@@ -10,7 +10,6 @@
 import Foundation
 import HealthKit
 import LoopKit
-import LoopUI
 
 
 struct NetBasalContext {
@@ -154,12 +153,13 @@ extension PredictedGlucoseContext: RawRepresentable {
 
 struct StatusExtensionContext: RawRepresentable {
     typealias RawValue = [String: Any]
-    private let version = 4
+    private let version = 5
 
     var predictedGlucose: PredictedGlucoseContext?
     var lastLoopCompleted: Date?
     var netBasal: NetBasalContext?
     var batteryPercentage: Double?
+    var reservoirCapacity: Double?
     var sensor: SensorDisplayableContext?
     
     init() { }
@@ -179,6 +179,7 @@ struct StatusExtensionContext: RawRepresentable {
 
         lastLoopCompleted = rawValue["lastLoopCompleted"] as? Date
         batteryPercentage = rawValue["batteryPercentage"] as? Double
+        reservoirCapacity = rawValue["reservoirCapacity"] as? Double
 
         if let rawValue = rawValue["sensor"] as? SensorDisplayableContext.RawValue {
             sensor = SensorDisplayableContext(rawValue: rawValue)
@@ -194,6 +195,7 @@ struct StatusExtensionContext: RawRepresentable {
         raw["lastLoopCompleted"] = lastLoopCompleted
         raw["netBasal"] = netBasal?.rawValue
         raw["batteryPercentage"] = batteryPercentage
+        raw["reservoirCapacity"] = reservoirCapacity
         raw["sensor"] = sensor?.rawValue
         return raw
     }
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
index 7b5aa93db9..68d1856898 100644
--- a/Loop Status Extension/StatusViewController.swift	
+++ b/Loop Status Extension/StatusViewController.swift	
@@ -205,10 +205,8 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                 self.hudView.batteryHUD.batteryLevel = Double(batteryPercentage)
             }
 
-            if let reservoir = lastReservoirValue,
-                let capacity = defaults.pumpState?.pumpModel?.reservoirCapacity
-            {
-                self.hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(capacity))))
+            if let reservoir = lastReservoirValue, let capacity = context.reservoirCapacity {
+                self.hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / capacity)))
                 self.hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate)
             }
 
diff --git a/Loop Status Extension/UIColor+Widget.swift b/Loop Status Extension/UIColor+Widget.swift
index 5ae2e95efc..e97e76504e 100644
--- a/Loop Status Extension/UIColor+Widget.swift	
+++ b/Loop Status Extension/UIColor+Widget.swift	
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import LoopUI
+
 
 extension UIColor {
     @nonobjc static let axisLabelColor = subtitleLabelColor
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index c9e63e32c3..d3d4d73d20 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -25,8 +25,6 @@
 		43027F0F1DFE0EC900C51989 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
 		4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */; };
 		4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */; };
-		4302F4E51D4EA75100F0FCAF /* DoseStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */; };
-		43045E581F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43045E571F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift */; };
 		43076BF31DFDBC4B0012A723 /* it.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 43076BF21DFDBC4B0012A723 /* it.lproj */; };
 		4309786C1E73D2F500BEBC82 /* it.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 4309786B1E73D2F500BEBC82 /* it.lproj */; };
 		4309786E1E73DAD100BEBC82 /* CGM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4309786D1E73DAD100BEBC82 /* CGM.swift */; };
@@ -40,7 +38,6 @@
 		430B29952041F5CB00BA9F93 /* LoopSettings+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B29942041F5CB00BA9F93 /* LoopSettings+Loop.swift */; };
 		430D85891F44037000AF2D4F /* HUDViewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */; };
 		430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; };
-		430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */; };
 		4311FB9B1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */; };
 		4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */; };
 		4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315D2891CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift */; };
@@ -59,7 +56,6 @@
 		4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0341CFC0AE100E199AA /* WatchDataManager.swift */; };
 		432CF87520D8AC950066B889 /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0231CFBE2C500E199AA /* NSUserDefaults.swift */; };
 		432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */; };
-		433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */; };
 		433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */; };
 		4341F4EB1EDB92AC001C936B /* LogglyService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4341F4EA1EDB92AC001C936B /* LogglyService.swift */; };
 		43441A9C1EDB34810087958C /* StatusExtensionContext+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */; };
@@ -99,10 +95,11 @@
 		436961911F19D11E00447E89 /* ChartPointsContextFillLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4369618F1F19C86400447E89 /* ChartPointsContextFillLayer.swift */; };
 		436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0DA41D236A2A00104B24 /* LoopError.swift */; };
 		436D9BF81F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json in Resources */ = {isa = PBXBuildFile; fileRef = 436D9BF71F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json */; };
-		436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */; };
+		43709AEA20DF3F8200F941B3 /* MinimedKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43709AE920DF3F8200F941B3 /* MinimedKitUI.framework */; };
 		4374B5EF209D84BF00D17AA8 /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; };
 		4374B5F0209D857E00D17AA8 /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; };
 		4374B5F2209D897600D17AA8 /* Locked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5F1209D897600D17AA8 /* Locked.swift */; };
+		4374B5F4209D89A900D17AA8 /* TextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */; };
 		43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43776F8F1B8022E90074EA36 /* AppDelegate.swift */; };
 		43776F971B8022E90074EA36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F951B8022E90074EA36 /* Main.storyboard */; };
 		43776F991B8022E90074EA36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 43776F981B8022E90074EA36 /* Assets.xcassets */; };
@@ -117,7 +114,6 @@
 		437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */; };
 		437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */; };
 		438172D91F4E9E37003C3328 /* NewPumpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438172D81F4E9E37003C3328 /* NewPumpEvent.swift */; };
-		4381D2261F3C0FDD004ACCF9 /* RileyLinkDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4381D2251F3C0FDD004ACCF9 /* RileyLinkDevice.swift */; };
 		43846AD51D8FA67800799272 /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 43846AD41D8FA67800799272 /* Base.lproj */; };
 		43846ADB1D91057000799272 /* ContextUpdatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846ADA1D91057000799272 /* ContextUpdatable.swift */; };
 		438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849E91D297CB6003B3F23 /* NightscoutService.swift */; };
@@ -131,11 +127,9 @@
 		439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897361CD2F80600223065 /* AnalyticsManager.swift */; };
 		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 */; };
 		43A51E1F1EB6D62A000736CC /* CarbAbsorptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A51E1E1EB6D62A000736CC /* CarbAbsorptionViewController.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 */; };
 		43A9437F1B926B7B0051FA24 /* WatchApp Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 43A9437E1B926B7B0051FA24 /* WatchApp Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		43A943881B926B7B0051FA24 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A943871B926B7B0051FA24 /* ExtensionDelegate.swift */; };
@@ -158,6 +152,7 @@
 		43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C094491CACCC73001F6403 /* NotificationManager.swift */; };
 		43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C246A71D89990F0031F8D1 /* Crypto.framework */; };
 		43C2FAE11EB656A500364AFF /* GlucoseEffectVelocity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */; };
+		43C3B6EC20B650A80026CAFA /* SettingsImageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */; };
 		43C3B6ED20B884500026CAFA /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */; };
 		43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */; };
 		43C513191E864C4E001547C7 /* GlucoseRangeSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */; };
@@ -168,12 +163,14 @@
 		43D2E8231F00425400AE5CBF /* BolusViewController+LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D2E8221F00425400AE5CBF /* BolusViewController+LoopDataManager.swift */; };
 		43D381621EBD9759007F8C8F /* HeaderValuesTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */; };
 		43D848B01E7DCBE100DADCBC /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848AF1E7DCBE100DADCBC /* Result.swift */; };
+		43DAD00020A2736F000F8529 /* PersistedPumpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DACFFF20A2736F000F8529 /* PersistedPumpEvent.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 */; };
 		43DE92591C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */; };
 		43DE925A1C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */; };
 		43DE92611C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */; };
+		43DFB62320D4CAE7008A7BAE /* PumpManagerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6F620BBCAA30026CAFA /* PumpManagerState.swift */; };
 		43E0F0A51E46D1670064F7CE /* LevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E0F0A41E46D1670064F7CE /* LevelHUDView.swift */; };
 		43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E2D8C51D204678004DA55F /* KeychainManager.swift */; };
 		43E2D8C81D208D5B004DA55F /* KeychainManager+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E2D8C71D208D5B004DA55F /* KeychainManager+Loop.swift */; };
@@ -196,14 +193,12 @@
 		43E2D9191D222759004DA55F /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; };
 		43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */; };
 		43E397A31D56B9E40028E321 /* Glucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E397A21D56B9E40028E321 /* Glucose.swift */; };
-		43E5292B205F718500ACEB3B /* SensorValueGlucoseEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E5292A205F718500ACEB3B /* SensorValueGlucoseEvent.swift */; };
 		43E93FB51E4675E800EAB8DB /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; };
 		43E93FB61E469A4000EAB8DB /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; };
 		43E93FB71E469A5100EAB8DB /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
 		43F1C31A1F5DC87700395429 /* ChartPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438991661E91B563000EEF90 /* ChartPoint.swift */; };
 		43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C361D3BF32400C11ED6 /* UIAlertController.swift */; };
 		43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */; };
-		43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */; };
 		43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F5C2C81B929C09003EB13D /* HealthKit.framework */; };
 		43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */; };
 		43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */; };
@@ -218,7 +213,6 @@
 		4F20AE621E6B879C00D07A06 /* ReservoirVolumeHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */; };
 		4F20AE631E6B87B100D07A06 /* ChartContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4313EDDF1D8A6BF90060FA79 /* ChartContainerView.swift */; };
 		4F2C15741E0209F500E160D4 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
-		4F2C15751E0209FA00E160D4 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; };
 		4F2C15811E0495B200E160D4 /* WatchContext+WatchApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2C15801E0495B200E160D4 /* WatchContext+WatchApp.swift */; };
 		4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
 		4F2C15831E0757E600E160D4 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
@@ -247,8 +241,6 @@
 		4F7528A11DFE200B00C322D6 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; };
 		4F7528A21DFE200B00C322D6 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; };
 		4F7528A51DFE208C00C322D6 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
-		4F7528A71DFE20CE00C322D6 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; };
-		4F7528A91DFE212600C322D6 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; };
 		4F7528AA1DFE215100C322D6 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
 		4FAC02541E22F6B20087A773 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
 		4FB76FB01E8C3E8000B39636 /* SwiftCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */; };
@@ -269,7 +261,6 @@
 		4FF4D0F91E17268800846527 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */; };
 		4FF4D1001E18374700846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; };
 		4FF4D1011E18375000846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; };
-		540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */; };
 		7D7076351FE06EDE004AC8EA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076371FE06EDE004AC8EA /* Localizable.strings */; };
 		7D70763A1FE06EDF004AC8EA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D70763C1FE06EDF004AC8EA /* InfoPlist.strings */; };
 		7D70763F1FE06EDF004AC8EA /* ckcomplication.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076411FE06EDF004AC8EA /* ckcomplication.strings */; };
@@ -438,8 +429,6 @@
 /* Begin PBXFileReference section */
 		4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewController.swift; sourceTree = "<group>"; };
 		4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDeliveryTableViewController.swift; sourceTree = "<group>"; };
-		4302F4E41D4EA75100F0FCAF /* DoseStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DoseStore.swift; sourceTree = "<group>"; };
-		43045E571F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RileyLinkDeviceManager.swift; sourceTree = "<group>"; };
 		43076BF21DFDBC4B0012A723 /* it.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = it.lproj; sourceTree = "<group>"; };
 		4309786B1E73D2F500BEBC82 /* it.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = it.lproj; sourceTree = "<group>"; };
 		4309786D1E73DAD100BEBC82 /* CGM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGM.swift; sourceTree = "<group>"; };
@@ -451,7 +440,6 @@
 		430C1ABC1E5568A80067F1AE /* StatusChartsManager+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StatusChartsManager+LoopKit.swift"; sourceTree = "<group>"; };
 		430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HUDViewTableViewCell.swift; sourceTree = "<group>"; };
 		430DA58D1D4AEC230097D1CA /* NSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSBundle.swift; sourceTree = "<group>"; };
-		430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySentryPumpStatusMessageBody.swift; sourceTree = "<group>"; };
 		4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitleSubtitleTextFieldTableViewCell.swift; sourceTree = "<group>"; };
 		4313EDDF1D8A6BF90060FA79 /* ChartContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ChartContainerView.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryEditTableViewController.swift; sourceTree = "<group>"; };
@@ -472,7 +460,6 @@
 		4328E0341CFC0AE100E199AA /* WatchDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = WatchDataManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteDataManager.swift; sourceTree = "<group>"; };
 		4337615E1D52F487004A3647 /* GlucoseHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseHUDView.swift; sourceTree = "<group>"; };
-		433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PumpIDTableViewController.swift; sourceTree = "<group>"; };
 		433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandResponseViewController.swift; sourceTree = "<group>"; };
 		4341F4EA1EDB92AC001C936B /* LogglyService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogglyService.swift; sourceTree = "<group>"; };
 		43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StatusExtensionContext+LoopKit.swift"; sourceTree = "<group>"; };
@@ -506,9 +493,10 @@
 		4369618F1F19C86400447E89 /* ChartPointsContextFillLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsContextFillLayer.swift; sourceTree = "<group>"; };
 		436A0DA41D236A2A00104B24 /* LoopError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopError.swift; sourceTree = "<group>"; };
 		436D9BF71F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommended_temp_start_low_end_just_above_range.json; sourceTree = "<group>"; };
-		436FACED1D0BA636004E2427 /* InsulinDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDataSource.swift; sourceTree = "<group>"; };
+		43709AE920DF3F8200F941B3 /* MinimedKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MinimedKitUI.framework; path = Carthage/Build/iOS/MinimedKitUI.framework; sourceTree = "<group>"; };
 		4374B5EE209D84BE00D17AA8 /* OSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = "<group>"; };
 		4374B5F1209D897600D17AA8 /* Locked.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locked.swift; sourceTree = "<group>"; };
+		4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewCell.swift; sourceTree = "<group>"; };
 		43776F8C1B8022E90074EA36 /* Loop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Loop.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		43776F8F1B8022E90074EA36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		43776F961B8022E90074EA36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -528,7 +516,6 @@
 		437D9BA11D7B5203007245E8 /* Loop.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Loop.xcconfig; sourceTree = "<group>"; };
 		437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionTableViewController.swift; sourceTree = "<group>"; };
 		438172D81F4E9E37003C3328 /* NewPumpEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewPumpEvent.swift; sourceTree = "<group>"; };
-		4381D2251F3C0FDD004ACCF9 /* RileyLinkDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RileyLinkDevice.swift; sourceTree = "<group>"; };
 		43846AD41D8FA67800799272 /* Base.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Base.lproj; sourceTree = "<group>"; };
 		43846ADA1D91057000799272 /* ContextUpdatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextUpdatable.swift; sourceTree = "<group>"; };
 		438849E91D297CB6003B3F23 /* NightscoutService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutService.swift; sourceTree = "<group>"; };
@@ -544,11 +531,9 @@
 		439897361CD2F80600223065 /* AnalyticsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AnalyticsManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		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>"; };
 		43A51E1E1EB6D62A000736CC /* CarbAbsorptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbAbsorptionViewController.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; };
 		43A943751B926B7B0051FA24 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = "<group>"; };
 		43A9437E1B926B7B0051FA24 /* WatchApp Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "WatchApp Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -572,6 +557,8 @@
 		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 = SOURCE_ROOT; };
 		43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseEffectVelocity.swift; sourceTree = "<group>"; };
+		43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsImageTableViewCell.swift; sourceTree = "<group>"; };
+		43C3B6F620BBCAA30026CAFA /* PumpManagerState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PumpManagerState.swift; 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>"; };
 		43CA93361CB98079000026B5 /* MinimedKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MinimedKit.framework; path = Carthage/Build/iOS/MinimedKit.framework; sourceTree = SOURCE_ROOT; };
@@ -582,6 +569,7 @@
 		43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderValuesTableViewCell.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>"; };
+		43DACFFF20A2736F000F8529 /* PersistedPumpEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistedPumpEvent.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>"; };
@@ -609,13 +597,9 @@
 		43E2D90F1D20C581004DA55F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = StatusTableViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		43E397A21D56B9E40028E321 /* Glucose.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Glucose.swift; sourceTree = "<group>"; };
-		43E5292A205F718500ACEB3B /* SensorValueGlucoseEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SensorValueGlucoseEvent.swift; sourceTree = "<group>"; };
-		43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseTrend.swift; sourceTree = "<group>"; };
-		43EA28611D517E42001BC233 /* SensorDisplayable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SensorDisplayable.swift; sourceTree = "<group>"; };
 		43EDEE6B1CF2E12A00393BE3 /* Loop.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Loop.entitlements; sourceTree = "<group>"; };
 		43F41C361D3BF32400C11ED6 /* UIAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIAlertController.swift; sourceTree = "<group>"; };
 		43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiagnosticLogger.swift; sourceTree = "<group>"; };
-		43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioSelectionTableViewController.swift; sourceTree = "<group>"; };
 		43F5C2C81B929C09003EB13D /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
 		43F5C2D41B92A4A6003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		43F5C2D61B92A4DC003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -654,7 +638,6 @@
 		4FB76FCD1E8C835D00B39636 /* ChartColorPalette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartColorPalette.swift; sourceTree = "<group>"; };
 		4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSUserDefaults+StatusExtension.swift"; sourceTree = "<group>"; };
 		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>"; };
 		7D68AAA91FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		7D68AAAA1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = "<group>"; };
 		7D68AAAB1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainInterface.strings; sourceTree = "<group>"; };
@@ -724,6 +707,7 @@
 				43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */,
 				437AFEE7203688CF008C4892 /* LoopKitUI.framework in Frameworks */,
 				43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */,
+				43709AEA20DF3F8200F941B3 /* MinimedKitUI.framework in Frameworks */,
 				C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */,
 				437AFEE42035252A008C4892 /* RileyLinkBLEKit.framework in Frameworks */,
 				43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */,
@@ -826,15 +810,12 @@
 				43880F961D9D8052009061A8 /* ServiceAuthentication */,
 				43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */,
 				C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */,
-				540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */,
 				43E397A21D56B9E40028E321 /* Glucose.swift */,
 				43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */,
 				4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */,
-				436FACED1D0BA636004E2427 /* InsulinDataSource.swift */,
 				4374B5F1209D897600D17AA8 /* Locked.swift */,
 				436A0DA41D236A2A00104B24 /* LoopError.swift */,
 				430B29942041F5CB00BA9F93 /* LoopSettings+Loop.swift */,
-				430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */,
 				4F526D601DF8D9A900A04910 /* NetBasal.swift */,
 				438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */,
 				43D848AF1E7DCBE100DADCBC /* Result.swift */,
@@ -917,7 +898,6 @@
 			children = (
 				439BED291E76093C00B0AED5 /* CGMManager.swift */,
 				439BED2B1E760A7A00B0AED5 /* DexCGMManager.swift */,
-				439BED2D1E760BC600B0AED5 /* EnliteCGMManager.swift */,
 			);
 			path = CGM;
 			sourceTree = "<group>";
@@ -1004,13 +984,11 @@
 				4389916A1E91B689000EEF90 /* ChartSettings+Loop.swift */,
 				4F08DE8E1E7BB871006741EA /* CollectionType+Loop.swift */,
 				43CE7CDD1CA8B63E003CC1B0 /* Data.swift */,
-				4302F4E41D4EA75100F0FCAF /* DoseStore.swift */,
 				43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */,
 				C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */,
 				438172D81F4E9E37003C3328 /* NewPumpEvent.swift */,
 				43CEE6E51E56AFD400CB9116 /* NightscoutUploader.swift */,
-				4381D2251F3C0FDD004ACCF9 /* RileyLinkDevice.swift */,
-				43E5292A205F718500ACEB3B /* SensorValueGlucoseEvent.swift */,
+				43DACFFF20A2736F000F8529 /* PersistedPumpEvent.swift */,
 				43BFF0CA1E466C0900FF19A9 /* StateColorPalette.swift */,
 				43F41C361D3BF32400C11ED6 /* UIAlertController.swift */,
 				43BFF0BB1E45C80600FF19A9 /* UIColor+Loop.swift */,
@@ -1036,8 +1014,6 @@
 				4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */,
 				435CB6221F37967800C320C7 /* InsulinModelSettingsViewController.swift */,
 				437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */,
-				433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */,
-				43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */,
 				43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */,
 				43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */,
 				4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */,
@@ -1058,10 +1034,11 @@
 				43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */,
 				430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */,
 				438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */,
-				43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */,
+				43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */,
+				4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */,
 				43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
-				434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */,
 				4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
+				434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1080,8 +1057,8 @@
 				43A567681C94880B00334FAC /* LoopDataManager.swift */,
 				C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */,
 				43C094491CACCC73001F6403 /* NotificationManager.swift */,
+				43C3B6F620BBCAA30026CAFA /* PumpManagerState.swift */,
 				432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */,
-				43045E571F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift */,
 				430C1ABC1E5568A80067F1AE /* StatusChartsManager+LoopKit.swift */,
 				4F70C20F1DE8FAC5006380B7 /* StatusExtensionDataManager.swift */,
 				4328E0341CFC0AE100E199AA /* WatchDataManager.swift */,
@@ -1159,7 +1136,6 @@
 				4F08DE7D1E7BB6E5006741EA /* ChartAxisValueDoubleUnit.swift */,
 				4FB76FCD1E8C835D00B39636 /* ChartColorPalette.swift */,
 				4326BA631F3A44D9007CCAD4 /* ChartLineModel.swift */,
-				43EA28611D517E42001BC233 /* SensorDisplayable.swift */,
 				43BFF0C81E465B0A00FF19A9 /* StateColorPalette.swift */,
 			);
 			path = Models;
@@ -1201,7 +1177,6 @@
 				4309786D1E73DAD100BEBC82 /* CGM.swift */,
 				894B91CC1FF9F45900DA65F5 /* GlucoseRangeScheduleOverrideUserInfo.swift */,
 				430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */,
-				43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */,
 				430B298C2041F56500BA9F93 /* LoopSettings.swift */,
 				435400331C9F878D00D5819C /* SetBolusUserInfo.swift */,
 				4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */,
@@ -1233,6 +1208,7 @@
 		968DCD53F724DE56FFE51920 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				43709AE920DF3F8200F941B3 /* MinimedKitUI.framework */,
 				4344628420A7A3BE00C4BE6F /* CGMBLEKit.framework */,
 				4344628320A7A3BE00C4BE6F /* LoopKit.framework */,
 				4344628120A7A37E00C4BE6F /* CoreBluetooth.framework */,
@@ -1661,6 +1637,7 @@
 				"$(SRCROOT)/Carthage/Build/iOS/G4ShareSpy.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/RileyLinkKitUI.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/LoopKitUI.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/MinimedKitUI.framework",
 			);
 			name = "Copy Frameworks with Carthage";
 			outputPaths = (
@@ -1677,6 +1654,7 @@
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/G4ShareSpy.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/RileyLinkKitUI.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKitUI.framework",
+				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/MinimedKitUI.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -1712,19 +1690,16 @@
 				434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */,
 				43441A9C1EDB34810087958C /* StatusExtensionContext+LoopKit.swift in Sources */,
 				4FF4D1001E18374700846527 /* WatchContext.swift in Sources */,
-				4381D2261F3C0FDD004ACCF9 /* RileyLinkDevice.swift in Sources */,
 				430B298A2041F54A00BA9F93 /* NSUserDefaults.swift in Sources */,
 				4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */,
 				43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */,
 				4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */,
 				4311FB9B1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift in Sources */,
 				430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */,
-				43E5292B205F718500ACEB3B /* SensorValueGlucoseEvent.swift in Sources */,
 				43C513191E864C4E001547C7 /* GlucoseRangeSchedule.swift in Sources */,
 				43A51E1F1EB6D62A000736CC /* CarbAbsorptionViewController.swift in Sources */,
 				43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */,
 				437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */,
-				439BED2E1E760BC600B0AED5 /* EnliteCGMManager.swift in Sources */,
 				430B29932041F5B300BA9F93 /* UserDefaults+Loop.swift in Sources */,
 				4341F4EB1EDB92AC001C936B /* LogglyService.swift in Sources */,
 				43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */,
@@ -1732,14 +1707,12 @@
 				43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */,
 				434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */,
 				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 */,
 				43B260491ED248FB008CAA77 /* CarbEntryTableViewCell.swift in Sources */,
 				4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */,
 				435CB6271F37AE5600C320C7 /* WalshInsulinModel.swift in Sources */,
-				43045E581F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift in Sources */,
 				43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */,
 				C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */,
 				435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */,
@@ -1765,7 +1738,6 @@
 				4389916B1E91B689000EEF90 /* ChartSettings+Loop.swift in Sources */,
 				4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */,
 				4309786E1E73DAD100BEBC82 /* CGM.swift in Sources */,
-				43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */,
 				C178249A1E1999FA00D9D25C /* CaseCountable.swift in Sources */,
 				43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */,
 				4FB76FBB1E8C42CF00B39636 /* UIColor.swift in Sources */,
@@ -1776,9 +1748,9 @@
 				43BFF0C51E465A2D00FF19A9 /* UIColor+HIG.swift in Sources */,
 				4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */,
 				437CCAE01D285C7B0075D2C3 /* ServiceAuthentication.swift in Sources */,
+				4374B5F4209D89A900D17AA8 /* TextFieldTableViewCell.swift in Sources */,
 				4FC8C8011DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift in Sources */,
-				4302F4E51D4EA75100F0FCAF /* DoseStore.swift in Sources */,
-				430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */,
+				43DAD00020A2736F000F8529 /* PersistedPumpEvent.swift in Sources */,
 				4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */,
 				438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */,
 				43E93FB61E469A4000EAB8DB /* NumberFormatter.swift in Sources */,
@@ -1795,18 +1767,17 @@
 				43CEE6E61E56AFD400CB9116 /* NightscoutUploader.swift in Sources */,
 				4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */,
 				4F526D611DF8D9A900A04910 /* NetBasal.swift in Sources */,
-				540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */,
+				43C3B6EC20B650A80026CAFA /* SettingsImageTableViewCell.swift in Sources */,
 				436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */,
 				435CB6231F37967800C320C7 /* InsulinModelSettingsViewController.swift in Sources */,
 				43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */,
 				431E73481FF95A900069B5F7 /* PersistenceController.swift in Sources */,
 				439BED2C1E760A7A00B0AED5 /* DexCGMManager.swift in Sources */,
-				433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */,
 				43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */,
 				438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */,
 				434F54611D28859B002A9274 /* ServiceCredential.swift in Sources */,
 				4F70C2101DE8FAC5006380B7 /* StatusExtensionDataManager.swift in Sources */,
-				436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */,
+				43DFB62320D4CAE7008A7BAE /* PumpManagerState.swift in Sources */,
 				435CB6291F37B01300C320C7 /* InsulinModelSettings.swift in Sources */,
 				431A8C401EC6E8AB00823B9C /* CircleMaskView.swift in Sources */,
 				439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */,
@@ -1829,7 +1800,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4F2C15751E0209FA00E160D4 /* GlucoseTrend.swift in Sources */,
 				4F2C15741E0209F500E160D4 /* NSTimeInterval.swift in Sources */,
 				4FF4D1011E18375000846527 /* WatchContext.swift in Sources */,
 				435400311C9F744E00D5819C /* BolusSuggestionUserInfo.swift in Sources */,
@@ -1920,8 +1890,6 @@
 				4326BA641F3A44D9007CCAD4 /* ChartLineModel.swift in Sources */,
 				4374B5F0209D857E00D17AA8 /* OSLog.swift in Sources */,
 				4F7528AA1DFE215100C322D6 /* HKUnit.swift in Sources */,
-				4F7528A91DFE212600C322D6 /* GlucoseTrend.swift in Sources */,
-				4F7528A71DFE20CE00C322D6 /* SensorDisplayable.swift in Sources */,
 				4FB76FB61E8C426900B39636 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */,
 				4F2C15931E09BF2C00E160D4 /* HUDView.swift in Sources */,
 				43BFF0B71E45C20C00FF19A9 /* NumberFormatter.swift in Sources */,
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme
index ab563e3f5a..41e44bba86 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme	
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme
index 776c868dcc..bf36fe9307 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme
index 0cbbc7f5ee..b9703af9df 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme	
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
index 6eb351a805..f6b4e3f4a5 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme
index 337f33d7fa..e82af75cd8 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme
index e440b6f616..a4a52c9650 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme	
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
index 52c23e5485..74cad3e771 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Loop/AppDelegate.swift b/Loop/AppDelegate.swift
index 1b7e6a10dd..66fd94daef 100644
--- a/Loop/AppDelegate.swift
+++ b/Loop/AppDelegate.swift
@@ -21,9 +21,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
         NotificationManager.authorize(delegate: self)
 
-        let bundle = Bundle(for: type(of: self))
-        DiagnosticLogger.shared = DiagnosticLogger(subsystem: bundle.bundleIdentifier!, version: bundle.shortVersionString)
-        DiagnosticLogger.shared?.forCategory("AppDelegate").info(#function)
+        DiagnosticLogger.shared.forCategory("AppDelegate").info(#function)
 
         AnalyticsManager.shared.application(application, didFinishLaunchingWithOptions: launchOptions)
 
@@ -51,7 +49,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-        deviceManager.updateTimerTickPreference()
+        deviceManager.pumpManager?.updateBLEHeartbeatPreference()
     }
 
     func applicationWillTerminate(_ application: UIApplication) {
diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index ff516a3f5b..d0b5d509cd 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="74s-IX-WF0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" 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>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -20,7 +20,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <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" textLabel="B9F-K3-7RI" detailTextLabel="WHK-PZ-Ng1" style="IBUITableViewCellStyleValue1" id="vah-ss-3Ud" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" textLabel="B9F-K3-7RI" detailTextLabel="WHK-PZ-Ng1" style="IBUITableViewCellStyleValue1" id="vah-ss-3Ud" customClass="SwitchTableViewCell" customModule="LoopKitUI">
                                 <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">
@@ -35,7 +35,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="WHK-PZ-Ng1">
-                                            <rect key="frame" x="316" y="12" width="44" height="20.5"/>
+                                            <rect key="frame" x="315" y="12" width="44" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.5568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -48,7 +48,7 @@
                                 <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="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Pump ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="5TX-kX-nBo">
@@ -130,21 +130,21 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FBL-RL-faM" customClass="ChartContainerView" customModule="LoopUI">
-                                            <rect key="frame" x="0.0" y="26" width="375" height="170"/>
+                                            <rect key="frame" x="0.0" y="29" width="375" height="170"/>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="170" id="ogp-Hm-zo0"/>
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="749" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D4C-I2-dhA">
-                                            <rect key="frame" x="8" y="204" width="359" height="57"/>
+                                            <rect key="frame" x="16" y="207" width="343" height="52"/>
                                             <string key="text">Future glucose is predicted by combining the effects of multiple inputs. Use this tool to toggle various inputs to see how they compare to the final prediction.</string>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" red="0.55686274509803924" green="0.5607843137254902" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="eventually 92 mg/dL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E41-FN-nkk">
-                                            <rect key="frame" x="217" y="8" width="150" height="18"/>
+                                            <rect key="frame" x="209" y="11" width="150" height="18"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -176,13 +176,13 @@
                                     <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">
-                                            <rect key="frame" x="8" y="8" width="359" height="21"/>
+                                            <rect key="frame" x="16" y="11" width="343" height="21"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6m-qV-wWi">
-                                            <rect key="frame" x="8" y="31" width="359" height="25"/>
+                                            <rect key="frame" x="16" y="34" width="343" height="19"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -202,7 +202,7 @@
                                     <outlet property="titleLabel" destination="bIL-Ub-qYp" id="iKh-Nw-Q6u"/>
                                 </connections>
                             </tableViewCell>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" rowHeight="64" id="I71-cY-0y7" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" rowHeight="64" id="I71-cY-0y7" customClass="SwitchTableViewCell" customModule="LoopKitUI">
                                 <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">
@@ -210,13 +210,13 @@
                                     <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">
-                                            <rect key="frame" x="8" y="8" width="359" height="21"/>
+                                            <rect key="frame" x="16" y="11" width="343" height="21"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OFA-qT-ZAg">
-                                            <rect key="frame" x="8" y="31" width="359" height="25"/>
+                                            <rect key="frame" x="16" y="34" width="343" height="19"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -274,27 +274,27 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Glucose Change" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bq4-98-cQU">
-                                            <rect key="frame" x="8" y="8" width="119.5" height="18"/>
+                                            <rect key="frame" x="16" y="11" width="119.5" height="18"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MJM-pI-lcq" customClass="ChartContainerView" customModule="LoopUI">
-                                            <rect key="frame" x="0.0" y="26" width="375" height="130"/>
+                                            <rect key="frame" x="0.0" y="29" width="375" height="130"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="130" id="DPc-dp-Smc"/>
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="749" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IxU-As-glo">
-                                            <rect key="frame" x="8" y="222" width="359" height="87.5"/>
+                                            <rect key="frame" x="16" y="225" width="343" height="82"/>
                                             <string key="text">Observed changes in glucose, subtracting changes modeled from insulin delivery, can be used to estimate carbohydrate absorption.</string>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Qdk-Cl-ljQ">
-                                            <rect key="frame" x="8" y="164" width="109" height="50"/>
+                                            <rect key="frame" x="16" y="167" width="109" height="50"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yuD-Je-55e" customClass="CircleMaskView" customModule="Loop" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -315,7 +315,7 @@
                                             </constraints>
                                         </stackView>
                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="6T4-P6-RWt">
-                                            <rect key="frame" x="125" y="164" width="109" height="50"/>
+                                            <rect key="frame" x="133" y="167" width="109" height="50"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7dr-6C-JSN" customClass="CircleMaskView" customModule="Loop" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -368,10 +368,10 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="bottom" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="F07-Hl-8Ub">
-                                            <rect key="frame" x="15" y="0.0" width="345" height="66.5"/>
+                                            <rect key="frame" x="16" y="0.0" width="343" height="66.5"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" alignment="lastBaseline" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="W9e-ML-5se">
-                                                    <rect key="frame" x="0.0" y="0.0" width="228.5" height="66.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="227" height="66.5"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="4K4-8o-LZp">
                                                             <rect key="frame" x="0.0" y="12.5" width="27.5" height="54"/>
@@ -385,16 +385,16 @@
                                                             </subviews>
                                                         </stackView>
                                                         <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="xsa-fa-q0Q">
-                                                            <rect key="frame" x="29.5" y="0.0" width="199" height="59"/>
+                                                            <rect key="frame" x="29.5" y="0.0" width="197.5" height="59"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="g COB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SQx-au-ZcM">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="199" height="20.5"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="197.5" height="20.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEY-lo-WHp">
-                                                                    <rect key="frame" x="0.0" y="20.5" width="199" height="38.5"/>
+                                                                    <rect key="frame" x="0.0" y="20.5" width="197.5" height="38.5"/>
                                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                                     <color key="textColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -404,7 +404,7 @@
                                                     </subviews>
                                                 </stackView>
                                                 <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" alignment="lastBaseline" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="epB-PX-SMb">
-                                                    <rect key="frame" x="234.5" y="0.0" width="110.5" height="66.5"/>
+                                                    <rect key="frame" x="233" y="0.0" width="110" height="66.5"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="xH4-Sz-Jxf">
                                                             <rect key="frame" x="0.0" y="12.5" width="27.5" height="54"/>
@@ -418,16 +418,16 @@
                                                             </subviews>
                                                         </stackView>
                                                         <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="vVe-gm-YYF">
-                                                            <rect key="frame" x="29.5" y="0.0" width="81" height="59"/>
+                                                            <rect key="frame" x="29.5" y="0.0" width="80.5" height="59"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="g Total" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d3X-AN-tA5">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="81" height="20.5"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="80.5" height="20.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2YJ-xx-nmh">
-                                                                    <rect key="frame" x="0.0" y="20.5" width="81" height="38.5"/>
+                                                                    <rect key="frame" x="0.0" y="20.5" width="80.5" height="38.5"/>
                                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                                     <color key="textColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -463,32 +463,32 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="HkK-Uz-ji1">
-                                            <rect key="frame" x="8" y="63" width="367" height="2"/>
+                                            <rect key="frame" x="16" y="63" width="359" height="2"/>
                                             <color key="progressTintColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="0.40000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
                                             <color key="trackTintColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="0.050000000000000003" colorSpace="custom" customColorSpace="sRGB"/>
                                         </progressView>
                                         <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.40000000000000002" translatesAutoresizingMaskIntoConstraints="NO" id="Mxi-br-Hti">
-                                            <rect key="frame" x="8" y="63.5" width="367" height="2"/>
+                                            <rect key="frame" x="16" y="63.5" width="359" height="2"/>
                                             <color key="progressTintColor" red="0.38823529410000002" green="0.76862745098039209" blue="0.2196078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <color key="trackTintColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="0.050000000000000003" colorSpace="custom" customColorSpace="sRGB"/>
                                         </progressView>
                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="vg9-bq-Hwf">
-                                            <rect key="frame" x="8" y="11" width="359" height="44"/>
+                                            <rect key="frame" x="16" y="11" width="343" height="44"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="u18-by-vQw">
-                                                    <rect key="frame" x="0.0" y="0.0" width="319" height="44"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="303" height="44"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BbA-hn-OkN">
-                                                            <rect key="frame" x="0.0" y="0.0" width="319" height="20"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="303" height="20"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ufi-Kj-33k">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="275" height="20"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="259" height="20"/>
                                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aCb-Qs-bpu">
-                                                                    <rect key="frame" x="275" y="0.0" width="44" height="20"/>
+                                                                    <rect key="frame" x="259" y="0.0" width="44" height="20"/>
                                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                                     <color key="textColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -496,16 +496,16 @@
                                                             </subviews>
                                                         </stackView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xqU-HU-BMs">
-                                                            <rect key="frame" x="0.0" y="24" width="319" height="20"/>
+                                                            <rect key="frame" x="0.0" y="24" width="303" height="20"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Krd-Aa-ret">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="275" height="20"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="259" height="20"/>
                                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                                     <color key="textColor" red="0.38823529410000002" green="0.85490196080000003" blue="0.21960784310000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J7x-W5-gwo">
-                                                                    <rect key="frame" x="275" y="0.0" width="44" height="20"/>
+                                                                    <rect key="frame" x="259" y="0.0" width="44" height="20"/>
                                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                                     <color key="textColor" red="0.38823529410000002" green="0.85490196080000003" blue="0.21960784310000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -515,7 +515,7 @@
                                                     </subviews>
                                                 </stackView>
                                                 <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Uploading" translatesAutoresizingMaskIntoConstraints="NO" id="PHg-Vp-8VS">
-                                                    <rect key="frame" x="327" y="0.0" width="32" height="44"/>
+                                                    <rect key="frame" x="311" y="0.0" width="32" height="44"/>
                                                 </imageView>
                                             </subviews>
                                         </stackView>
@@ -610,13 +610,13 @@
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="3.5 U/hour @ 12:12 PM" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gz-kZ-iF1">
-                                            <rect key="frame" x="169" y="13" width="198" height="18"/>
+                                            <rect key="frame" x="177" y="16" width="182" height="12"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recommended Basal" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k3F-Na-7mn">
-                                            <rect key="frame" x="8" y="13" width="153" height="18"/>
+                                            <rect key="frame" x="16" y="16" width="153" height="12"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -652,19 +652,19 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Glucose" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tuw-av-A3x">
-                                            <rect key="frame" x="8" y="8" width="60" height="18"/>
+                                            <rect key="frame" x="16" y="11" width="60" height="18"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="eventually 92 mg/dL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rse-x8-amW">
-                                            <rect key="frame" x="217" y="8" width="150" height="18"/>
+                                            <rect key="frame" x="209" y="11" width="150" height="18"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ADL-hs-cfT" customClass="ChartContainerView" customModule="LoopUI">
-                                            <rect key="frame" x="0.0" y="26" width="375" height="174"/>
+                                            <rect key="frame" x="0.0" y="29" width="375" height="171"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </view>
                                     </subviews>
@@ -746,7 +746,7 @@
                                             <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">
-                                                    <rect key="frame" x="16" y="8" width="348" height="36"/>
+                                                    <rect key="frame" x="24" y="11" width="332" height="33"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -796,20 +796,20 @@
                                             <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">
-                                                    <rect key="frame" x="15" y="21" width="196" height="21"/>
+                                                    <rect key="frame" x="23" y="21" width="180" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="U" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVz-dr-xLU">
-                                                    <rect key="frame" x="347" y="21" width="13" height="21"/>
+                                                    <rect key="frame" x="339" y="21" width="13" height="21"/>
                                                     <accessibility key="accessibilityConfiguration" label="Units"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5QS-Yf-Pua">
-                                                    <rect key="frame" x="219" y="44" width="120" height="0.0"/>
+                                                    <rect key="frame" x="211" y="44" width="120" height="0.0"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="120" id="1mG-Iv-efE"/>
                                                     </constraints>
@@ -841,13 +841,13 @@
                                             <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">
-                                                    <rect key="frame" x="15" y="21" width="196" height="21"/>
+                                                    <rect key="frame" x="23" y="21" width="180" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0.0" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7LT-50-ZzK">
-                                                    <rect key="frame" x="219" y="12" width="120" height="32"/>
+                                                    <rect key="frame" x="211" y="12" width="120" height="32"/>
                                                     <accessibility key="accessibilityConfiguration" label="Bolus Amount"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="120" id="hZ2-Aq-FHT"/>
@@ -859,7 +859,7 @@
                                                     </connections>
                                                 </textField>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="U" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BR0-dr-Fj2">
-                                                    <rect key="frame" x="347" y="21" width="13" height="21"/>
+                                                    <rect key="frame" x="339" y="21" width="13" height="21"/>
                                                     <accessibility key="accessibilityConfiguration" label="Units"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -885,7 +885,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ya0-9b-ZAS">
-                                                    <rect key="frame" x="162" y="8" width="51" height="28"/>
+                                                    <rect key="frame" x="162" y="11" width="51" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
                                                     <state key="normal" title="Deliver"/>
                                                     <connections>
@@ -1033,14 +1033,14 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m4y-ya-ryt" customClass="ChartContainerView" customModule="LoopUI">
-                                            <rect key="frame" x="0.0" y="8" width="375" height="170"/>
+                                            <rect key="frame" x="0.0" y="11" width="375" height="170"/>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="170" id="6cy-yd-uxX"/>
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="749" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PJv-p9-cFe">
-                                            <rect key="frame" x="8" y="186" width="359" height="75"/>
+                                            <rect key="frame" x="16" y="189" width="343" height="70"/>
                                             <string key="text">An insulin activity model is used to estimate effects of insulin on glucose levels. An accurate model can help prevent insulin stacking and safely recommend corrective treatments.</string>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" red="0.5568627451" green="0.56078431370000004" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -1069,18 +1069,18 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cpo-Po-gFM">
-                                            <rect key="frame" x="8" y="8" width="42" height="20.5"/>
+                                            <rect key="frame" x="16" y="11" width="42" height="20.5"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l7l-mw-Oc9">
-                                            <rect key="frame" x="8" y="30.5" width="319" height="25.5"/>
+                                            <rect key="frame" x="16" y="33.5" width="311" height="19.5"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="4 hour" textAlignment="right" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Wk3-xv-IM5">
-                                            <rect key="frame" x="58" y="7.5" width="269" height="21"/>
+                                            <rect key="frame" x="66" y="10.5" width="261" height="21"/>
                                             <nil key="textColor"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <textInputTraits key="textInputTraits"/>
@@ -1136,8 +1136,8 @@
         <image name="workout" width="30" height="29"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="UnO-ql-F0K"/>
-        <segue reference="Isc-NM-GBt"/>
+        <segue reference="viB-eQ-p7y"/>
+        <segue reference="PC7-vP-CUY"/>
         <segue reference="76q-VW-DX3"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Loop/Extensions/DoseStore.swift b/Loop/Extensions/DoseStore.swift
deleted file mode 100644
index 89cb286982..0000000000
--- a/Loop/Extensions/DoseStore.swift
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-//  DoseStore.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 7/31/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import LoopKit
-import MinimedKit
-
-
-// Bridges support for MinimedKit data types
-extension LoopDataManager {
-    /**
-     Adds and persists new pump events.
-     */
-    func addPumpEvents(_ pumpEvents: [TimestampedHistoryEvent], from model: MinimedKit.PumpModel, completion: @escaping (_ error: DoseStore.DoseStoreError?) -> Void) {
-        var events: [NewPumpEvent] = []
-        var lastTempBasalAmount: DoseEntry?
-        // Always assume the sequence may have started rewound. LoopKit will ignore unmatched resume events.
-        var isRewound = true
-        var title: String
-
-        for event in pumpEvents {
-            var dose: DoseEntry?
-            var eventType: LoopKit.PumpEventType?
-
-            switch event.pumpEvent {
-            case let bolus as BolusNormalPumpEvent:
-                // For entries in-progress, use the programmed amount
-                let units = event.isMutable() ? bolus.programmed : bolus.amount
-
-                dose = DoseEntry(type: .bolus, startDate: event.date, endDate: event.date.addingTimeInterval(bolus.duration), value: units, unit: .units)
-            case is SuspendPumpEvent:
-                dose = DoseEntry(suspendDate: event.date)
-            case is ResumePumpEvent:
-                dose = DoseEntry(resumeDate: event.date)
-            case let temp as TempBasalPumpEvent:
-                if case .Absolute = temp.rateType {
-                    lastTempBasalAmount = DoseEntry(type: .tempBasal, startDate: event.date, value: temp.rate, unit: .unitsPerHour)
-                }
-            case let temp as TempBasalDurationPumpEvent:
-                if let amount = lastTempBasalAmount, amount.startDate == event.date {
-                    dose = DoseEntry(
-                        type: .tempBasal,
-                        startDate: event.date,
-                        endDate: event.date.addingTimeInterval(TimeInterval(minutes: Double(temp.duration))),
-                        value: amount.unitsPerHour,
-                        unit: .unitsPerHour
-                    )
-                }
-            case let basal as BasalProfileStartPumpEvent:
-                dose = DoseEntry(
-                    type: .basal,
-                    startDate: event.date,
-                    // Use the maximum-possible duration for a basal entry; its true duration will be reconciled against other entries.
-                    endDate: event.date.addingTimeInterval(.hours(24)),
-                    value: basal.scheduleEntry.rate,
-                    unit: .unitsPerHour
-                )
-            case is RewindPumpEvent:
-                eventType = .rewind
-
-                /* 
-                 No insulin is delivered between the beginning of a rewind until the suggested fixed prime is delivered or cancelled.
- 
-                 If the fixed prime is cancelled, it is never recorded in history. It is possible to cancel a fixed prime and perform one manually some time later, but basal delivery will have resumed during that period.
-                 
-                 We take the conservative approach and assume delivery is paused only between the Rewind and the first Prime event.
-                 */
-                dose = DoseEntry(suspendDate: event.date)
-                isRewound = true
-            case is PrimePumpEvent:
-                eventType = .prime
-
-                if isRewound {
-                    isRewound = false
-                    dose = DoseEntry(resumeDate: event.date)
-                }
-            case let alarm as PumpAlarmPumpEvent:
-                eventType = .alarm
-
-                if case .noDelivery = alarm.alarmType {
-                    dose = DoseEntry(suspendDate: event.date)
-                }
-                break
-            case let alarm as ClearAlarmPumpEvent:
-                eventType = .alarmClear
-
-                if case .noDelivery = alarm.alarmType {
-                    dose = DoseEntry(resumeDate: event.date)
-                }
-                break
-            default:
-                break
-            }
-
-            title = String(describing: event.pumpEvent)
-            events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title, type: eventType))
-        }
-
-        addPumpEvents(events, completion: completion)
-    }
-}
diff --git a/Loop/Extensions/NightscoutUploader.swift b/Loop/Extensions/NightscoutUploader.swift
index dab1795786..ab81c2f85f 100644
--- a/Loop/Extensions/NightscoutUploader.swift
+++ b/Loop/Extensions/NightscoutUploader.swift
@@ -5,14 +5,12 @@
 //  Copyright © 2017 LoopKit Authors. All rights reserved.
 //
 
-import CoreData
 import LoopKit
-import MinimedKit
 import NightscoutUploadKit
 
 
 extension NightscoutUploader: CarbStoreSyncDelegate {
-    static let logger = DiagnosticLogger.shared!.forCategory("NightscoutUploader")
+    static let logger = DiagnosticLogger.shared.forCategory("NightscoutUploader")
 
     public func carbStore(_ carbStore: CarbStore, hasEntriesNeedingUpload entries: [StoredCarbEntry], completion: @escaping ([StoredCarbEntry]) -> Void) {
         var created = [StoredCarbEntry]()
@@ -72,21 +70,20 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
 
 
 extension NightscoutUploader {
-    func upload(_ events: [PersistedPumpEvent], from pumpModel: PumpModel, completion: @escaping (NightscoutUploadKit.Either<[URL], Error>) -> Void) {
+    func upload(_ events: [PersistedPumpEvent], fromSource source: String, completion: @escaping (NightscoutUploadKit.Either<[URL], Error>) -> Void) {
         var objectIDURLs = [URL]()
-        var timestampedPumpEvents = [TimestampedHistoryEvent]()
+        var treatments = [NightscoutTreatment]()
 
         for event in events {
-            objectIDURLs.append(event.objectIDURL)
-
-            if let raw = event.raw, raw.count > 0, let type = MinimedKit.PumpEventType(rawValue: raw[0])?.eventType, let pumpEvent = type.init(availableData: raw, pumpModel: pumpModel) {
-                timestampedPumpEvents.append(TimestampedHistoryEvent(pumpEvent: pumpEvent, date: event.date))
+            guard let treatment = event.treatment(enteredBy: source) else {
+                continue
             }
-        }
 
-        let nsEvents = NightscoutPumpEvents.translate(timestampedPumpEvents, eventSource: "loop://\(UIDevice.current.name)", includeCarbs: false)
+            objectIDURLs.append(event.objectIDURL)
+            treatments.append(treatment)
+        }
 
-        self.upload(nsEvents) { (result) in
+        self.upload(treatments) { (result) in
             switch result {
             case .success( _):
                 completion(.success(objectIDURLs))
diff --git a/Loop/Extensions/PersistedPumpEvent.swift b/Loop/Extensions/PersistedPumpEvent.swift
new file mode 100644
index 0000000000..9851db0587
--- /dev/null
+++ b/Loop/Extensions/PersistedPumpEvent.swift
@@ -0,0 +1,52 @@
+//
+//  PersistedPumpEvent.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import LoopKit
+import NightscoutUploadKit
+
+
+extension PersistedPumpEvent {
+    func treatment(enteredBy source: String) -> NightscoutTreatment? {
+        // Doses can be inferred from other types of events, e.g. a No Delivery Alarm type indicates a suspend in delivery.
+        // At the moment, Nightscout only supports straightforward events
+        guard let type = type, let dose = dose, dose.type.pumpEventType == type else {
+            return nil
+        }
+
+        switch dose.type {
+        case .basal:
+            return nil
+        case .bolus:
+            let duration = dose.endDate.timeIntervalSince(dose.startDate)
+
+            return BolusNightscoutTreatment(
+                timestamp: dose.startDate,
+                enteredBy: source,
+                bolusType: duration > 0 ? .Square : .Normal,
+                amount: dose.units,
+                programmed: dose.units,  // Persisted pump events are always completed
+                unabsorbed: 0,  // The pump's reported IOB isn't relevant, nor stored
+                duration: duration,
+                carbs: 0,
+                ratio: 0
+            )
+        case .resume:
+            return PumpResumeTreatment(timestamp: dose.startDate, enteredBy: source)
+        case .suspend:
+            return PumpSuspendTreatment(timestamp: dose.startDate, enteredBy: source)
+        case .tempBasal:
+            return TempBasalNightscoutTreatment(
+                timestamp: dose.startDate,
+                enteredBy: source,
+                temp: .Absolute,  // DoseEntry only supports .absolute types
+                rate: dose.unitsPerHour,
+                absolute: dose.unitsPerHour,
+                duration: Int(dose.endDate.timeIntervalSince(dose.startDate).minutes)
+            )
+        }
+    }
+}
diff --git a/Loop/Extensions/RileyLinkDevice.swift b/Loop/Extensions/RileyLinkDevice.swift
deleted file mode 100644
index 4f90bdbaee..0000000000
--- a/Loop/Extensions/RileyLinkDevice.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  RileyLinkDevice.swift
-//  Loop
-//
-//  Copyright © 2017 LoopKit Authors. All rights reserved.
-//
-
-import HealthKit
-import MinimedKit
-import RileyLinkKit
-import RileyLinkBLEKit
-
-
-extension RileyLinkDevice.Status {
-    func device(settings: PumpSettings?, pumpState: PumpState?) -> HKDevice {
-        return HKDevice(
-            name: name,
-            manufacturer: "Medtronic",
-            model: pumpState?.pumpModel?.rawValue,
-            hardwareVersion: nil,
-            firmwareVersion: radioFirmwareVersion?.description,
-            softwareVersion: String(RileyLinkKitVersionNumber),
-            localIdentifier: settings?.pumpID,
-            udiDeviceIdentifier: nil
-        )
-    }
-}
diff --git a/Loop/Extensions/SensorValueGlucoseEvent.swift b/Loop/Extensions/SensorValueGlucoseEvent.swift
deleted file mode 100644
index f20b7da6c6..0000000000
--- a/Loop/Extensions/SensorValueGlucoseEvent.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  SensorValueGlucoseEvent.swift
-//  Loop
-//
-//  Copyright © 2018 LoopKit Authors. All rights reserved.
-//
-
-import MinimedKit
-
-
-extension SensorValueGlucoseEvent {
-    var glucoseSyncIdentifier: String? {
-        let date = timestamp
-
-        guard
-            let year = date.year,
-            let month = date.month,
-            let day = date.day,
-            let hour = date.hour,
-            let minute = date.minute,
-            let second = date.second
-        else {
-            return nil
-        }
-
-        return "\(year)-\(month)-\(day) \(hour)-\(minute)-\(second)"
-    }
-}
diff --git a/Loop/Extensions/UIColor+Loop.swift b/Loop/Extensions/UIColor+Loop.swift
index 132895f5f5..1301fc72f9 100644
--- a/Loop/Extensions/UIColor+Loop.swift
+++ b/Loop/Extensions/UIColor+Loop.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import LoopUI
+
 
 extension UIColor {
     @nonobjc static let axisLabelColor = secondaryLabelColor
diff --git a/Loop/Extensions/UserDefaults+Loop.swift b/Loop/Extensions/UserDefaults+Loop.swift
index 50b6516730..c60fff89fc 100644
--- a/Loop/Extensions/UserDefaults+Loop.swift
+++ b/Loop/Extensions/UserDefaults+Loop.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import LoopKit
-import MinimedKit
 
 
 extension UserDefaults {
@@ -20,15 +19,17 @@ extension UserDefaults {
             shared.basalRateSchedule = standard.basalRateSchedule
             shared.carbRatioSchedule = standard.carbRatioSchedule
             shared.cgm               = standard.cgm
-            shared.connectedPeripheralIDs = standard.connectedPeripheralIDs
             shared.loopSettings      = standard.loopSettings
             shared.insulinModelSettings = standard.insulinModelSettings
             shared.insulinSensitivitySchedule = standard.insulinSensitivitySchedule
-            shared.preferredInsulinDataSource = standard.preferredInsulinDataSource
-            shared.batteryChemistry  = standard.batteryChemistry
         }
 
         shared?.removeObject(forKey: "com.loopkit.Loop.insulinCounteractionEffects")
+        shared?.removeObject(forKey: "com.loopkit.Loop.BatteryChemistry")
+        shared?.removeObject(forKey: "com.loudnate.Loop.PreferredInsulinDataSource")
+        shared?.removeObject(forKey: "com.loopkit.Loop.PumpState")
+        shared?.removeObject(forKey: "com.loopkit.Loop.PumpSettings")
+        shared?.removeObject(forKey: "com.loudnate.Naterade.ConnectedPeripheralIDs")
 
         return shared ?? standard
     }()
@@ -37,33 +38,19 @@ extension UserDefaults {
 
 extension UserDefaults {
     private enum Key: String {
-        case batteryChemistry = "com.loopkit.Loop.BatteryChemistry"
-        case preferredInsulinDataSource = "com.loudnate.Loop.PreferredInsulinDataSource"
+        case pumpManagerState = "com.loopkit.Loop.PumpManagerState"
     }
 
-    var preferredInsulinDataSource: InsulinDataSource? {
+    var pumpManager: PumpManager? {
         get {
-            return InsulinDataSource(rawValue: integer(forKey: Key.preferredInsulinDataSource.rawValue))
-        }
-        set {
-            if let preferredInsulinDataSource = newValue {
-                set(preferredInsulinDataSource.rawValue, forKey: Key.preferredInsulinDataSource.rawValue)
-            } else {
-                removeObject(forKey: Key.preferredInsulinDataSource.rawValue)
+            guard let rawValue = dictionary(forKey: Key.pumpManagerState.rawValue) else {
+                return nil
             }
-        }
-    }
 
-    var batteryChemistry: BatteryChemistryType? {
-        get {
-            return BatteryChemistryType(rawValue: integer(forKey: Key.batteryChemistry.rawValue))
+            return PumpManagerFromRawValue(rawValue)
         }
         set {
-            if let batteryChemistry = newValue {
-                set(batteryChemistry.rawValue, forKey: Key.batteryChemistry.rawValue)
-            } else {
-                removeObject(forKey: Key.batteryChemistry.rawValue)
-            }
+            set(newValue?.rawValue, forKey: Key.pumpManagerState.rawValue)
         }
     }
 }
diff --git a/Loop/Managers/AnalyticsManager.swift b/Loop/Managers/AnalyticsManager.swift
index baaa444257..076b8326c7 100644
--- a/Loop/Managers/AnalyticsManager.swift
+++ b/Loop/Managers/AnalyticsManager.swift
@@ -25,7 +25,7 @@ final class AnalyticsManager: IdentifiableClass {
             amplitudeService = AmplitudeService(APIKey: nil)
         }
 
-        logger = DiagnosticLogger.shared?.forCategory(type(of: self).className)
+        logger = DiagnosticLogger.shared.forCategory(type(of: self).className)
     }
 
     static let shared = AnalyticsManager()
@@ -61,10 +61,6 @@ final class AnalyticsManager: IdentifiableClass {
 
     // MARK: - Config Events
 
-    func didChangeRileyLinkConnectionState() {
-        logEvent("RileyLink Connection", outOfSession: true)
-    }
-
     func transmitterTimeDidDrift(_ drift: TimeInterval) {
         logEvent("Transmitter time change", withProperties: ["value" : drift], outOfSession: true)
     }
@@ -133,6 +129,7 @@ final class AnalyticsManager: IdentifiableClass {
         }
     }
 
+
     // MARK: - Loop Events
 
     func didAddCarbsFromWatch(_ carbs: Double) {
diff --git a/Loop/Managers/CGM/CGMManager.swift b/Loop/Managers/CGM/CGMManager.swift
index 801f52aad6..86fcdc97ef 100644
--- a/Loop/Managers/CGM/CGMManager.swift
+++ b/Loop/Managers/CGM/CGMManager.swift
@@ -7,64 +7,12 @@
 
 import HealthKit
 import LoopKit
-import LoopUI
-
-
-/// Describes the result of a CGM manager operation
-///
-/// - noData: No new data was available or retrieved
-/// - newData: New glucose data was received and stored
-/// - error: An error occurred while receiving or store data
-enum CGMResult {
-    case noData
-    case newData([NewGlucoseSample])
-    case error(Error)
-}
-
-
-protocol CGMManagerDelegate: class {
-    /// Asks the delegate for a date with which to filter incoming glucose data
-    ///
-    /// - Parameter manager: The manager instance
-    /// - Returns: The date data occuring on or after which should be kept
-    func startDateToFilterNewData(for manager: CGMManager) -> Date?
-
-    /// Informs the delegate that the device has updated with a new result
-    ///
-    /// - Parameters:
-    ///   - manager: The manager instance
-    ///   - result: The result of the update
-    func cgmManager(_ manager: CGMManager, didUpdateWith result: CGMResult) -> Void
-}
-
-
-protocol CGMManager: CustomDebugStringConvertible {
-    var delegate: CGMManagerDelegate? { get set }
-
-    /// Whether the device is capable of waking the app
-    var providesBLEHeartbeat: Bool { get }
-
-    /// The length of time to keep samples in HealthKit before removal. Return nil to never remove samples.
-    var managedDataInterval: TimeInterval? { get }
-
-    var sensorState: SensorDisplayable? { get }
-
-    /// The representation of the device for use in HealthKit
-    var device: HKDevice? { get }
-
-    /// Performs a manual fetch of glucose data from the device, if necessary
-    ///
-    /// - Parameters:
-    ///   - deviceManager: The device manager instance to use for fetching
-    ///   - completion: A closure called when operation has completed
-    func fetchNewDataIfNeeded(with deviceManager: DeviceDataManager, _ completion: @escaping (CGMResult) -> Void) -> Void
-}
 
 
 extension CGM {
     func createManager() -> CGMManager? {
         switch self {
-        case .enlite:
+        case .usePump:
             return nil
         case .g4:
             return G4CGMManager()
diff --git a/Loop/Managers/CGM/DexCGMManager.swift b/Loop/Managers/CGM/DexCGMManager.swift
index 3fb10a830a..94a08b4abc 100644
--- a/Loop/Managers/CGM/DexCGMManager.swift
+++ b/Loop/Managers/CGM/DexCGMManager.swift
@@ -8,7 +8,6 @@
 import G4ShareSpy
 import HealthKit
 import LoopKit
-import LoopUI
 import ShareClient
 import CGMBLEKit
 
@@ -18,19 +17,21 @@ class DexCGMManager: CGMManager {
         return false
     }
 
-    weak var delegate: CGMManagerDelegate? {
+    let shouldSyncToRemoteService = false
+
+    weak var cgmManagerDelegate: CGMManagerDelegate? {
         didSet {
-            shareManager?.delegate = delegate
+            shareManager?.cgmManagerDelegate = cgmManagerDelegate
         }
     }
 
-    func fetchNewDataIfNeeded(with deviceManager: DeviceDataManager, _ completion: @escaping (CGMResult) -> Void) {
+    func fetchNewDataIfNeeded(_ completion: @escaping (CGMResult) -> Void) {
         guard let shareManager = shareManager else {
             completion(.noData)
             return
         }
 
-        shareManager.fetchNewDataIfNeeded(with: deviceManager, completion)
+        shareManager.fetchNewDataIfNeeded(completion)
     }
 
     var sensorState: SensorDisplayable? {
@@ -58,10 +59,12 @@ class DexCGMManager: CGMManager {
 
 
 final class ShareClientManager: CGMManager {
-    weak var delegate: CGMManagerDelegate?
+    weak var cgmManagerDelegate: CGMManagerDelegate?
 
     let providesBLEHeartbeat = false
 
+    let shouldSyncToRemoteService = false
+
     var sensorState: SensorDisplayable? {
         return latestBackfill
     }
@@ -70,8 +73,8 @@ final class ShareClientManager: CGMManager {
 
     fileprivate var latestBackfill: ShareGlucose?
 
-    func fetchNewDataIfNeeded(with deviceManager: DeviceDataManager, _ completion: @escaping (CGMResult) -> Void) {
-        guard let shareClient = deviceManager.remoteDataManager.shareService.client else {
+    func fetchNewDataIfNeeded(_ completion: @escaping (CGMResult) -> Void) {
+        guard let shareClient = RemoteDataManager().shareService.client else {
             completion(.noData)
             return
         }
@@ -93,7 +96,7 @@ final class ShareClientManager: CGMManager {
             }
 
             // Ignore glucose values that are up to a minute newer than our previous value, to account for possible time shifting in Share data
-            let startDate = self.delegate?.startDateToFilterNewData(for: self)?.addingTimeInterval(TimeInterval(minutes: 1))
+            let startDate = self.cgmManagerDelegate?.startDateToFilterNewData(for: self)?.addingTimeInterval(TimeInterval(minutes: 1))
             let newGlucose = glucose.filterDateRange(startDate, nil).filter({ $0.isStateValid }).map {
                 return NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, syncIdentifier: "\($0.startDate.timeIntervalSince1970)", device: self.device)
             }
@@ -118,7 +121,7 @@ final class ShareClientManager: CGMManager {
 
 final class G5CGMManager: DexCGMManager, TransmitterDelegate {
     private let transmitter: Transmitter?
-    let logger = DiagnosticLogger.shared!.forCategory("G5CGMManager")
+    let logger = DiagnosticLogger.shared.forCategory("G5CGMManager")
 
     init(transmitterID: String?) {
         if let transmitterID = transmitterID {
@@ -166,14 +169,14 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
         return true
     }
 
-    override func fetchNewDataIfNeeded(with deviceManager: DeviceDataManager, _ completion: @escaping (CGMResult) -> Void) {
+    override func fetchNewDataIfNeeded(_ completion: @escaping (CGMResult) -> Void) {
         // If our last glucose was less than 4.5 minutes ago, don't fetch.
         guard !dataIsFresh else {
             completion(.noData)
             return
         }
 
-        super.fetchNewDataIfNeeded(with: deviceManager, completion)
+        super.fetchNewDataIfNeeded(completion)
     }
 
     override var device: HKDevice? {
@@ -204,12 +207,12 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
 
     func transmitter(_ transmitter: Transmitter, didError error: Error) {
         logger.error(error)
-        delegate?.cgmManager(self, didUpdateWith: .error(error))
+        cgmManagerDelegate?.cgmManager(self, didUpdateWith: .error(error))
     }
 
     func transmitter(_ transmitter: Transmitter, didRead glucose: Glucose) {
         guard glucose != latestReading else {
-            delegate?.cgmManager(self, didUpdateWith: .noData)
+            cgmManagerDelegate?.cgmManager(self, didUpdateWith: .noData)
             return
         }
 
@@ -217,16 +220,16 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
 
         guard glucose.state.hasReliableGlucose else {
             logger.error(String(describing: glucose.state))
-            delegate?.cgmManager(self, didUpdateWith: .error(CalibrationError.unreliableState(glucose.state)))
+            cgmManagerDelegate?.cgmManager(self, didUpdateWith: .error(CalibrationError.unreliableState(glucose.state)))
             return
         }
         
         guard let quantity = glucose.glucose else {
-            delegate?.cgmManager(self, didUpdateWith: .noData)
+            cgmManagerDelegate?.cgmManager(self, didUpdateWith: .noData)
             return
         }
 
-        self.delegate?.cgmManager(self, didUpdateWith: .newData([
+        cgmManagerDelegate?.cgmManager(self, didUpdateWith: .newData([
             NewGlucoseSample(
                 date: glucose.readDate,
                 quantity: quantity,
@@ -256,7 +259,7 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
             return
         }
 
-        self.delegate?.cgmManager(self, didUpdateWith: .newData(samples))
+        cgmManagerDelegate?.cgmManager(self, didUpdateWith: .newData(samples))
     }
 
     func transmitter(_ transmitter: Transmitter, didReadUnknownData data: Data) {
@@ -298,14 +301,14 @@ final class G4CGMManager: DexCGMManager, ReceiverDelegate {
         return true
     }
 
-    override func fetchNewDataIfNeeded(with deviceManager: DeviceDataManager, _ completion: @escaping (CGMResult) -> Void) {
+    override func fetchNewDataIfNeeded(_ completion: @escaping (CGMResult) -> Void) {
         // If our last glucose was less than 4.5 minutes ago, don't fetch.
         guard !dataIsFresh else {
             completion(.noData)
             return
         }
 
-        super.fetchNewDataIfNeeded(with: deviceManager, completion)
+        super.fetchNewDataIfNeeded(completion)
     }
 
     override var device: HKDevice? {
@@ -342,7 +345,7 @@ final class G4CGMManager: DexCGMManager, ReceiverDelegate {
         latestReading = latest
 
         // In the event that some of the glucose history was already backfilled from Share, don't overwrite it.
-        let includeAfter = delegate?.startDateToFilterNewData(for: self)?.addingTimeInterval(TimeInterval(minutes: 1))
+        let includeAfter = cgmManagerDelegate?.startDateToFilterNewData(for: self)?.addingTimeInterval(TimeInterval(minutes: 1))
 
         let validGlucose = glucoseHistory.filter({
             $0.isStateValid
@@ -350,11 +353,11 @@ final class G4CGMManager: DexCGMManager, ReceiverDelegate {
             NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: $0.isDisplayOnly, syncIdentifier: String(describing: $0.sequence), device: self.device)
         })
 
-        self.delegate?.cgmManager(self, didUpdateWith: .newData(validGlucose))
+        self.cgmManagerDelegate?.cgmManager(self, didUpdateWith: .newData(validGlucose))
     }
 
     func receiver(_ receiver: Receiver, didError error: Error) {
-        delegate?.cgmManager(self, didUpdateWith: .error(error))
+        cgmManagerDelegate?.cgmManager(self, didUpdateWith: .error(error))
     }
 
     func receiver(_ receiver: Receiver, didLogBluetoothEvent event: String) {
diff --git a/Loop/Managers/CGM/EnliteCGMManager.swift b/Loop/Managers/CGM/EnliteCGMManager.swift
deleted file mode 100644
index 87df81b2d0..0000000000
--- a/Loop/Managers/CGM/EnliteCGMManager.swift
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-//  EnliteCGMManager.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 3/12/17.
-//  Copyright © 2017 LoopKit Authors. All rights reserved.
-//
-
-import HealthKit
-import LoopKit
-import LoopUI
-import MinimedKit
-import RileyLinkKit
-
-
-final class EnliteCGMManager: CGMManager {
-    let providesBLEHeartbeat = false
-
-    weak var delegate: CGMManagerDelegate?
-
-    var sensorState: SensorDisplayable?
-
-    let managedDataInterval: TimeInterval? = nil
-
-    func fetchNewDataIfNeeded(with deviceManager: DeviceDataManager, _ completion: @escaping (CGMResult) -> Void) {
-        deviceManager.rileyLinkManager.getDevices { (devices) in
-            guard let device = devices.firstConnected else {
-                completion(.error(LoopError.connectionError))
-                return
-            }
-
-            guard let ops = deviceManager.pumpOps else {
-                completion(.error(LoopError.configurationError("Pump ID")))
-                return
-            }
-
-            let latestGlucoseDate = self.delegate?.startDateToFilterNewData(for: self) ?? Date(timeIntervalSinceNow: TimeInterval(hours: -24))
-
-            guard latestGlucoseDate.timeIntervalSinceNow <= TimeInterval(minutes: -4.5) else {
-                completion(.noData)
-                return
-            }
-
-            ops.runSession(withName: "Fetch Enlite History", using: device) { (session) in
-                do {
-                    let events = try session.getGlucoseHistoryEvents(since: latestGlucoseDate.addingTimeInterval(.minutes(1)))
-                    _ = deviceManager.remoteDataManager.nightscoutService.uploader?.processGlucoseEvents(events, source: device.deviceURI)
-
-                    if let latestSensorEvent = events.compactMap({ $0.glucoseEvent as? RelativeTimestampedGlucoseEvent }).last {
-                        self.sensorState = EnliteSensorDisplayable(latestSensorEvent)
-                    }
-
-                    let unit = HKUnit.milligramsPerDeciliter
-                    let glucoseValues: [NewGlucoseSample] = events
-                        // TODO: Is the { $0.date > latestGlucoseDate } filter duplicative?
-                        .filter({ $0.glucoseEvent is SensorValueGlucoseEvent && $0.date > latestGlucoseDate })
-                        .map {
-                            let glucoseEvent = $0.glucoseEvent as! SensorValueGlucoseEvent
-                            let quantity = HKQuantity(unit: unit, doubleValue: Double(glucoseEvent.sgv))
-                            return NewGlucoseSample(date: $0.date, quantity: quantity, isDisplayOnly: false, syncIdentifier: glucoseEvent.glucoseSyncIdentifier ?? UUID().uuidString, device: self.device)
-                        }
-
-                    completion(.newData(glucoseValues))
-                } catch let error {
-                    completion(.error(error))
-                }
-            }
-        }
-    }
-
-    var device: HKDevice? = nil
-
-    var debugDescription: String {
-        return [
-            "## EnliteCGMManager",
-            "sensorState: \(String(describing: sensorState))",
-            ""
-        ].joined(separator: "\n")
-    }
-}
-
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index d4a6d294a1..5abaecb740 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -6,372 +6,238 @@
 //  Copyright © 2015 Nathan Racklyeft. All rights reserved.
 //
 
-import Foundation
-import CoreData
 import HealthKit
 import LoopKit
-import LoopUI
-import MinimedKit
-import NightscoutUploadKit
-import RileyLinkKit
-import RileyLinkKitUI
-import RileyLinkBLEKit
+import LoopKitUI
 
 
 final class DeviceDataManager {
 
     private let queue = DispatchQueue(label: "com.loopkit.DeviceManagerQueue", qos: .utility)
 
-    let logger = DiagnosticLogger.shared!
+    var pumpManager: PumpManagerUI? {
+        didSet {
+            setupPump()
+
+            UserDefaults.appGroup.pumpManager = pumpManager
+        }
+    }
 
-    private let log = DiagnosticLogger.shared?.forCategory("DeviceManager")
+    let logger = DiagnosticLogger.shared
+
+    private let log = DiagnosticLogger.shared.forCategory("DeviceManager")
 
     /// Remember the launch date of the app for diagnostic reporting
     private let launchDate = Date()
 
-    /// Manages all the RileyLinks
-    let rileyLinkManager: RileyLinkDeviceManager
-
     /// Manages authentication for remote services
     let remoteDataManager = RemoteDataManager()
 
     private var nightscoutDataManager: NightscoutDataManager!
 
-    // TODO: Isolate to queue
-    private var latestPumpStatus: RileyLinkKit.PumpStatus?
-
-    // Main queue access only
-    private(set) var lastError: (date: Date, error: Error)?
-
-    /// Isolated to queue
-    private var lastTimerTick: Date = .distantPast
-
+    var lastError: (date: Date, error: Error)? {
+        return lockedLastError.value
+    }
     private func setLastError(error: Error) {
-        DispatchQueue.main.async { // Synchronize writes
-            self.lastError = (date: Date(), error: error)
-            // TODO: Notify observers of change
-        }
+        lockedLastError.value = (date: Date(), error: error)
     }
+    private let lockedLastError: Locked<(date: Date, error: Error)?> = Locked(nil)
 
-    // TODO: Isolate to queue
-    // Returns a value in the range 0 - 1
-    var pumpBatteryChargeRemaining: Double? {
-        get {
-            if let status = latestPumpStatusFromMySentry {
-                return Double(status.batteryRemainingPercent) / 100
-            } else if let status = latestPumpStatus {
-                return batteryChemistry.chargeRemaining(at: status.batteryVolts)
-            } else {
-                return statusExtensionManager.context?.batteryPercentage
-            }
-        }
-    }
+    // MARK: - CGM
 
-    // Battery monitor
-    private func observeBatteryDuring(_ block: () -> Void) {
-        let oldVal = pumpBatteryChargeRemaining
-        block()
-        if let newVal = pumpBatteryChargeRemaining {
-            if newVal == 0 {
-                NotificationManager.sendPumpBatteryLowNotification()
+    var cgm: CGM? = UserDefaults.appGroup.cgm {
+        didSet {
+            if cgm != oldValue {
+                setupCGM()
             }
 
-            if let oldVal = oldVal, newVal - oldVal >= 0.5 {
-                AnalyticsManager.shared.pumpBatteryWasReplaced()
-            }
+            UserDefaults.appGroup.cgm = cgm
         }
     }
 
-    // MARK: - RileyLink
-
-    @objc private func deviceStatusDidChange(_ note: Notification) {
-        switch note.name {
-        case Notification.Name.DeviceConnectionStateDidChange,
-             Notification.Name.DeviceNameDidChange:
-            updateDoseStoreDeviceFromRileyLink(state: pumpState)
-        default:
-            break
-        }
-    }
+    private(set) var cgmManager: CGMManager?
 
-    private func updateDoseStoreDeviceFromRileyLink(state: PumpState?) {
-        // Update the HKDevice to include the name, pump model, or connection status change
-        rileyLinkManager.getDevices { (devices) in
-            devices.firstConnected?.getStatus { (status) in
-                // Don't assume loopManager has been initialized yet
-                self.loopManager?.doseStore.device = status.device(settings: self.pumpSettings, pumpState: state)
-            }
+    /// TODO: Isolate to queue
+    private func setupCGM() {
+        if case .usePump? = cgm, let pumpManager = pumpManager as? CGMManager {
+            cgmManager = pumpManager
+        } else {
+            cgmManager = cgm?.createManager()
         }
-    }
 
-    @objc private func deviceStateDidChange(_ note: Notification) {
-        guard
-            let device = note.object as? RileyLinkDevice,
-            let deviceState = note.userInfo?[RileyLinkDevice.notificationDeviceStateKey] as? DeviceState
-            else {
-                return
-        }
+        cgmManager?.cgmManagerDelegate = self
+        loopManager.glucoseStore.managedDataInterval = cgmManager?.managedDataInterval
 
-        queue.async {
-            self.deviceStates[device.peripheralIdentifier] = deviceState
-        }
+        pumpManager?.updateBLEHeartbeatPreference()
     }
 
-    /**
-     Called when a new idle message is received by the RileyLink.
-
-     Only MySentryPumpStatus messages are handled.
-
-     - parameter note: The notification object
-     */
-    @objc private func receivedRileyLinkPacketNotification(_ note: Notification) {
-        guard let device = note.object as? RileyLinkDevice,
-            let packet = note.userInfo?[RileyLinkDevice.notificationPacketKey] as? RFPacket,
-            let data = MinimedPacket(encodedData: packet.data)?.data,
-            let message = PumpMessage(rxData: data),
-            let address = pumpSettings?.pumpID,
-            message.address.hexadecimalString == address,
-            case .mySentry = message.packetType
-        else {
-            return
-        }
+    private func setupPump() {
+        pumpManager?.pumpManagerDelegate = self
 
-        queue.async {
-            switch message.messageBody {
-            case let body as MySentryPumpStatusMessageBody:
-                self.updatePumpStatus(body, from: device)
-            case is MySentryAlertMessageBody, is MySentryAlertClearedMessageBody:
-                break
-            case let body:
-                // TODO: I think we've learned everything we're going to learn here.
-                self.logger.forCategory("MySentry").info(["messageType": Int(message.messageType.rawValue), "messageBody": body.txData.hexadecimalString])
-            }
+        // Proliferate PumpModel preferences to DoseStore
+        if let pumpRecordsBasalProfileStartEvents = pumpManager?.pumpRecordsBasalProfileStartEvents {
+            loopManager?.doseStore.pumpRecordsBasalProfileStartEvents = pumpRecordsBasalProfileStartEvents
         }
-    }
 
-    @objc private func receivedRileyLinkTimerTickNotification(_: Notification) {
-        queue.async {
-            self.lastTimerTick = Date()
-
-            self.cgmManager?.fetchNewDataIfNeeded(with: self) { (result) in
-                if case .newData = result {
-                    AnalyticsManager.shared.didFetchNewCGMData()
-                }
+        setupCGM()
+    }
 
-                // TODO: Isolate to queue?
-                self.cgmManager(self.cgmManager!, didUpdateWith: result)
-            }
-        }
+    var sensorInfo: SensorDisplayable? {
+        return cgmManager?.sensorState
     }
 
-    func connectToRileyLink(_ device: RileyLinkDevice) {
-        queue.async {
-            self.connectedPeripheralIDs.insert(device.peripheralIdentifier.uuidString)
+    // MARK: - Configuration
 
-            self.rileyLinkManager.connect(device)
+    // MARK: - WatchKit
 
-            AnalyticsManager.shared.didChangeRileyLinkConnectionState()
-        }
-    }
+    fileprivate var watchManager: WatchDataManager!
 
-    func disconnectFromRileyLink(_ device: RileyLinkDevice) {
-        queue.async {
-            self.connectedPeripheralIDs.remove(device.peripheralIdentifier.uuidString)
+    // MARK: - Status Extension
 
-            self.rileyLinkManager.disconnect(device)
+    fileprivate var statusExtensionManager: StatusExtensionDataManager!
 
-            AnalyticsManager.shared.didChangeRileyLinkConnectionState()
+    // MARK: - Initialization
 
-            if self.connectedPeripheralIDs.count == 0 {
-                NotificationManager.clearPendingNotificationRequests()
-            }
-        }
-    }
+    private(set) var loopManager: LoopDataManager!
 
-    /// TODO: Isolate to queue
-    func updateTimerTickPreference() {
-        queue.async {
-            /// Controls the management of the RileyLink timer tick, which is a reliably-changing BLE
-            /// characteristic which can cause the app to wake. For most users, the G5/G6 Transmitter and
-            /// G4 Receiver are reliable as hearbeats, but users who find their resources extremely constrained
-            /// due to greedy apps or older devices may choose to always enable the timer by always setting `true`
-            self.rileyLinkManager.timerTickEnabled = self.isPumpDataStale() || !(self.cgmManager?.providesBLEHeartbeat == true)
-        }
-    }
+    init() {
+        pumpManager = UserDefaults.appGroup.pumpManager as? PumpManagerUI
 
-    /**
-     Attempts to fix an extended communication failure between a RileyLink device and the pump
+        remoteDataManager.delegate = self
+        statusExtensionManager = StatusExtensionDataManager(deviceDataManager: self)
+        loopManager = LoopDataManager(
+            lastLoopCompleted: statusExtensionManager.context?.lastLoopCompleted,
+            lastTempBasal: statusExtensionManager.context?.netBasal?.tempBasal
+        )
+        watchManager = WatchDataManager(deviceManager: self)
+        nightscoutDataManager = NightscoutDataManager(deviceDataManager: self)
 
-     - parameter device: The RileyLink device
-     */
-    private func troubleshootPumpComms(using device: RileyLinkDevice) {
-        /// TODO: Isolate to queue?
-        // Ensuring timer tick is enabled will allow more tries to bring the pump data up-to-date.
-        updateTimerTickPreference()
+        loopManager.delegate = self
+        loopManager.carbStore.syncDelegate = remoteDataManager.nightscoutService.uploader
+        loopManager.doseStore.delegate = self
 
-        guard let pumpOps = pumpOps else {
-            return
-        }
+        setupPump()
+    }
+}
 
-        // How long we should wait before we re-tune the RileyLink
-        let tuneTolerance = TimeInterval(minutes: 14)
 
-        let deviceState = deviceStates[device.peripheralIdentifier, default: DeviceState()]
-        let lastTuned = deviceState.lastTuned ?? .distantPast
+extension DeviceDataManager: RemoteDataManagerDelegate {
+    func remoteDataManagerDidUpdateServices(_ dataManager: RemoteDataManager) {
+        loopManager.carbStore.syncDelegate = dataManager.nightscoutService.uploader
+    }
+}
 
-        if lastTuned.timeIntervalSinceNow <= -tuneTolerance {
-            pumpOps.runSession(withName: "Tune pump", using: device) { (session) in
-                do {
-                    let scanResult = try session.tuneRadio(current: deviceState.lastValidFrequency)
-                    self.logger.addError("Device \(device.name ?? "") auto-tuned to \(scanResult.bestFrequency) MHz", fromSource: "RileyLink")
 
-                    self.queue.async {
-                        self.deviceStates[device.peripheralIdentifier] = DeviceState(
-                            lastTuned: Date(),
-                            lastValidFrequency: scanResult.bestFrequency
-                        )
+extension DeviceDataManager: CGMManagerDelegate {
+    func cgmManager(_ manager: CGMManager, didUpdateWith result: CGMResult) {
+        /// TODO: Isolate to queue
+        switch result {
+        case .newData(let values):
+            loopManager.addGlucose(values) { result in
+                if manager.shouldSyncToRemoteService {
+                    switch result {
+                    case .success(let values):
+                        self.nightscoutDataManager.uploadGlucose(values, sensorState: manager.sensorState)
+                    case .failure:
+                        break
                     }
-                } catch let error {
-                    self.logger.addError("Device \(device.name ?? "") auto-tune failed with error: \(error)", fromSource: "RileyLink")
-                    self.rileyLinkManager.deprioritize(device)
-                    self.setLastError(error: error)
                 }
+
+                self.pumpManager?.assertCurrentPumpData()
             }
-        } else {
-            rileyLinkManager.deprioritize(device)
+        case .noData:
+            pumpManager?.assertCurrentPumpData()
+        case .error(let error):
+            self.setLastError(error: error)
+            pumpManager?.assertCurrentPumpData()
         }
-    }
 
-    // MARK: Pump data
+        pumpManager?.updateBLEHeartbeatPreference()
+    }
 
-    /// TODO: Isolate to queue
-    fileprivate var latestPumpStatusFromMySentry: MySentryPumpStatusMessageBody? {
-        didSet {
-            if let manager = cgmManager as? EnliteCGMManager {
-                manager.sensorState = latestPumpStatusFromMySentry
-            }
-        }
+    func startDateToFilterNewData(for manager: CGMManager) -> Date? {
+        return loopManager.glucoseStore.latestGlucose?.startDate
     }
+}
 
-    /**
-     Handles receiving a MySentry status message, which are only posted by MM x23 pumps.
 
-     This message has two important pieces of info about the pump: reservoir volume and battery.
+extension DeviceDataManager: PumpManagerDelegate {
+    func pumpManager(_ pumpManager: PumpManager, didAdjustPumpClockBy adjustment: TimeInterval) {
+        AnalyticsManager.shared.pumpTimeDidDrift(adjustment)
+    }
 
-     Because the RileyLink must actively listen for these packets, they are not a reliable heartbeat. However, we can still use them to assert glucose data is current.
+    func pumpManagerDidUpdatePumpBatteryChargeRemaining(_ pumpManager: PumpManager, oldValue: Double?) {
+        if let newValue = pumpManager.pumpBatteryChargeRemaining {
+            if newValue == 0 {
+                NotificationManager.sendPumpBatteryLowNotification()
+            }
 
-     - parameter status: The status message body
-     - parameter device: The RileyLink that received the message
-     */
-    private func updatePumpStatus(_ status: MySentryPumpStatusMessageBody, from device: RileyLinkDevice) {
-        dispatchPrecondition(condition: .onQueue(queue))
+            if let oldValue = oldValue, newValue - oldValue >= 0.5 {
+                AnalyticsManager.shared.pumpBatteryWasReplaced()
+            }
+        }
+    }
 
-        var pumpDateComponents = status.pumpDateComponents
-        var glucoseDateComponents = status.glucoseDateComponents
+    func pumpManagerDidUpdateState(_ pumpManager: PumpManager) {
+        UserDefaults.appGroup.pumpManager = pumpManager
+    }
 
-        pumpDateComponents.timeZone = pumpState?.timeZone
-        glucoseDateComponents?.timeZone = pumpState?.timeZone
+    func pumpManagerBLEHeartbeatDidFire(_ pumpManager: PumpManager) {
+        cgmManager?.fetchNewDataIfNeeded { (result) in
+            if case .newData = result {
+                AnalyticsManager.shared.didFetchNewCGMData()
+            }
 
-        // The pump sends the same message 3x, so ignore it if we've already seen it.
-        guard status != latestPumpStatusFromMySentry, let pumpDate = pumpDateComponents.date else {
-            return
+            if let manager = self.cgmManager {
+                // TODO: Isolate to queue?
+                self.cgmManager(manager, didUpdateWith: result)
+            }
         }
+    }
 
-        observeBatteryDuring {
-            latestPumpStatusFromMySentry = status
-        }
+    func pumpManagerShouldProvideBLEHeartbeat(_ pumpManager: PumpManager) -> Bool {
+        return !(cgmManager?.providesBLEHeartbeat == true)
+    }
 
-        // Gather PumpStatus from MySentry packet
-        let pumpStatus: NightscoutUploadKit.PumpStatus?
-        if let pumpID = pumpSettings?.pumpID {
-            let batteryStatus = BatteryStatus(percent: status.batteryRemainingPercent)
-            let iobStatus = IOBStatus(timestamp: pumpDate, iob: status.iob)
+    func pumpManager(_ pumpManager: PumpManager, didUpdateStatus status: PumpManagerStatus) {
+        loopManager.doseStore.device = status.device
+        // Update the pump-schedule based settings
+        loopManager.setScheduleTimeZone(status.timeZone)
+        nightscoutDataManager.upload(pumpStatus: status)
+    }
 
-            pumpStatus = NightscoutUploadKit.PumpStatus(clock: pumpDate, pumpID: pumpID, iob: iobStatus, battery: batteryStatus, reservoir: status.reservoirRemainingUnits)
-        } else {
-            pumpStatus = nil
-            logger.addError("Could not interpret pump clock: \(pumpDateComponents)", fromSource: "RileyLink")
-        }
+    func pumpManagerWillDeactivate(_ pumpManager: PumpManager) {
+        loopManager.doseStore.resetPumpData()
+        self.pumpManager = nil
+    }
 
-        device.getStatus { (deviceStatus) in
-            // Trigger device status upload, even if something is wrong with pumpStatus
-            self.queue.async {
-                self.nightscoutDataManager.uploadDeviceStatus(pumpStatus, rileylinkDevice: deviceStatus, deviceState: self.deviceStates[device.peripheralIdentifier])
-
-                if case .active(glucose: let glucose) = status.glucose {
-                    // Enlite data is included
-                    if let date = glucoseDateComponents?.date {
-                        let sample = NewGlucoseSample(
-                            date: date,
-                            quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(glucose)),
-                            isDisplayOnly: false,
-                            syncIdentifier: status.glucoseSyncIdentifier ?? UUID().uuidString,
-                            device: deviceStatus.device(settings: self.pumpSettings, pumpState: self.pumpState)
-                        )
-
-                        self.loopManager.addGlucose([sample])
-                    }
-                }
-            }
-        }
+    func pumpManager(_ pumpManager: PumpManager, didUpdatePumpRecordsBasalProfileStartEvents pumpRecordsBasalProfileStartEvents: Bool) {
+        loopManager.doseStore.pumpRecordsBasalProfileStartEvents = pumpRecordsBasalProfileStartEvents
+    }
 
-        switch status.glucose {
-        case .off:
-            // Enlite is disabled, so assert glucose from another source
-            cgmManager?.fetchNewDataIfNeeded(with: self) { (result) in
-                switch result {
-                case .newData(let values):
-                    self.loopManager.addGlucose(values)
-                case .noData:
-                    break
-                case .error(let error):
-                    self.setLastError(error: error)
-                    break
-                }
-            }
-        default:
-            break
-        }
+    func pumpManager(_ pumpManager: PumpManager, didError error: PumpManagerError) {
+        setLastError(error: error)
+        nightscoutDataManager.uploadLoopStatus(loopError: error)
+    }
 
-        // Upload sensor glucose to Nightscout
-        remoteDataManager.nightscoutService.uploader?.uploadSGVFromMySentryPumpStatus(status, device: device.deviceURI)
+    func pumpManager(_ pumpManager: PumpManager, didReadPumpEvents events: [NewPumpEvent], completion: @escaping (_ error: Error?) -> Void) {
+        loopManager.addPumpEvents(events) { (error) in
+            if let error = error {
+                self.log.error("Failed to addPumpEvents to DoseStore: \(error)")
+            }
 
-        // Sentry packets are sent in groups of 3, 5s apart. Wait 11s before allowing the loop data to continue to avoid conflicting comms.
-        queue.asyncAfter(deadline: .now() + .seconds(11)) {
-            self.updateReservoirVolume(status.reservoirRemainingUnits, at: pumpDate, withTimeLeft: TimeInterval(minutes: Double(status.reservoirRemainingMinutes)))
+            completion(error)
         }
     }
 
-    /**
-     Store a new reservoir volume and notify observers of new pump data.
-
-     - parameter units:    The number of units remaining
-     - parameter date:     The date the reservoir was read
-     - parameter timeLeft: The approximate time before the reservoir is empty
-     */
-    private func updateReservoirVolume(_ units: Double, at date: Date, withTimeLeft timeLeft: TimeInterval?) {
+    func pumpManager(_ pumpManager: PumpManager, didReadReservoirValue units: Double, at date: Date, completion: @escaping (_ result: PumpManagerResult<(newValue: ReservoirValue, lastValue: ReservoirValue?, areStoredValuesContinuous: Bool)>) -> Void) {
         loopManager.addReservoirValue(units, at: date) { (result) in
-            /// TODO: Isolate to queue
-
             switch result {
             case .failure(let error):
-                self.setLastError(error: error)
-                self.logger.addError(error, fromSource: "DoseStore")
+                self.logger.addError(error, fromSource: "Bolus")
+                completion(.failure(error))
             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 let error = error {
-                            self.setLastError(error: error)
-                        }
-
-                        if error == nil || areStoredValuesContinuous {
-                            self.loopManager.loop()
-                        }
-                    }
-                } else {
-                    self.loopManager.loop()
-                }
+                completion(.success((newValue: newValue, lastValue: lastValue, areStoredValuesContinuous: areStoredValuesContinuous)))
 
                 // Send notifications for low reservoir if necessary
                 if let previousVolume = lastValue?.unitVolume {
@@ -384,7 +250,7 @@ final class DeviceDataManager {
 
                     for threshold in warningThresholds {
                         if newValue.unitVolume <= threshold && previousVolume > threshold {
-                            NotificationManager.sendPumpReservoirLowNotificationForAmount(newValue.unitVolume, andTimeRemaining: timeLeft)
+                            NotificationManager.sendPumpReservoirLowNotificationForAmount(newValue.unitVolume, andTimeRemaining: nil)
                         }
                     }
 
@@ -393,432 +259,19 @@ final class DeviceDataManager {
                     }
                 }
             }
-
-            // New reservoir data means we may want to adjust our timer tick requirements
-            self.updateTimerTickPreference()
-        }
-    }
-
-    /// TODO: Isolate to queue
-    /// 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) {
-        rileyLinkManager.getDevices { (devices) in
-            guard let device = devices.firstConnected else {
-                completion(LoopError.connectionError)
-                return
-            }
-
-            guard let ops = self.pumpOps else {
-                completion(LoopError.configurationError("Pump ID"))
-                return
-            }
-
-            ops.runSession(withName: "Fetch Pump History", using: device) { (session) in
-                do {
-                    let startDate = self.loopManager.doseStore.pumpEventQueryAfterDate
-
-                    let (events, model) = try session.getHistoryEvents(since: startDate)
-                    self.loopManager.addPumpEvents(events, from: model) { (error) in
-                        if let error = error {
-                            self.logger.addError("Failed to store history: \(error)", fromSource: "DoseStore")
-                        }
-
-                        completion(error)
-                    }
-                } catch let error {
-                    self.troubleshootPumpComms(using: device)
-                    self.logger.addError("Failed to fetch history: \(error)", fromSource: "RileyLink")
-
-                    completion(error)
-                }
-            }
         }
     }
 
-    /// TODO: Isolate to queue
-    private func isPumpDataStale() -> Bool {
-        // How long should we wait before we poll for new pump data?
-        let pumpStatusAgeTolerance = rileyLinkManager.idleListeningEnabled ? TimeInterval(minutes: 6) : TimeInterval(minutes: 4)
-
-        return isReservoirDataOlderThan(timeIntervalSinceNow: -pumpStatusAgeTolerance)
+    func pumpManagerRecommendsLoop(_ pumpManager: PumpManager) {
+        loopManager.loop()
     }
 
-    private func isReservoirDataOlderThan(timeIntervalSinceNow: TimeInterval) -> Bool {
-        var lastReservoirDate = loopManager.doseStore.lastReservoirValue?.startDate ?? .distantPast
-
-        // Look for reservoir data from MySentry that hasn't yet been written (due to 11-second imposed delay)
-        if let sentryStatus = latestPumpStatusFromMySentry, let timeZone = pumpState?.timeZone {
-            var components = sentryStatus.pumpDateComponents
-            components.timeZone = timeZone
-
-            lastReservoirDate = max(components.date ?? .distantPast, lastReservoirDate)
-        }
-
-        return lastReservoirDate.timeIntervalSinceNow <= timeIntervalSinceNow
+    func startDateToFilterNewPumpEvents(for manager: PumpManager) -> Date {
+        return loopManager.doseStore.pumpEventQueryAfterDate
     }
 
-    /**
-     Ensures pump data is current by either waking and polling, or ensuring we're listening to sentry packets.
-     */
-    /// TODO: Isolate to queue
-    private func assertCurrentPumpData() {
-        rileyLinkManager.assertIdleListening(forcingRestart: true)
-
-        guard isPumpDataStale() else {
-            return
-        }
-
-        self.log?.debug("Pump data is stale, fetching.")
-
-        rileyLinkManager.getDevices { (devices) in
-            guard let device = devices.firstConnected else {
-                let error = LoopError.connectionError
-                self.logger.addError("Failed to fetch pump status: \(error)", fromSource: "RileyLink")
-                self.setLastError(error: error)
-                return
-            }
-
-            guard let ops = self.pumpOps else {
-                let error = LoopError.configurationError("Pump ID")
-                self.setLastError(error: error)
-                return
-            }
-
-            ops.runSession(withName: "Get Pump Status", using: device) { (session) in
-                let nsPumpStatus: NightscoutUploadKit.PumpStatus?
-                do {
-                    let status = try session.getCurrentPumpStatus()
-                    guard let date = status.clock.date else {
-                        assertionFailure("Could not interpret a valid date from \(status.clock) in the system calendar")
-                        return
-                    }
-
-                    // Check if the clock should be reset
-                    if abs(date.timeIntervalSinceNow) > .seconds(20) {
-                        self.logger.addError("Pump clock is more than 20 seconds off. Resetting.", fromSource: "RileyLink")
-                        AnalyticsManager.shared.pumpTimeDidDrift(date.timeIntervalSinceNow)
-                        try session.setTime { () -> DateComponents in
-                            let calendar = Calendar(identifier: .gregorian)
-                            return calendar.dateComponents([.year, .month, .day, .hour, .minute, .second], from: Date())
-                        }
-                    }
-
-                    self.observeBatteryDuring {
-                        self.latestPumpStatus = status
-                    }
-
-                    self.updateReservoirVolume(status.reservoir, at: date, withTimeLeft: nil)
-                    let battery = NightscoutUploadKit.BatteryStatus(voltage: status.batteryVolts.value, 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)
-                } catch let error {
-                    self.logger.addError("Failed to fetch pump status: \(error)", fromSource: "RileyLink")
-                    self.setLastError(error: error)
-                    self.troubleshootPumpComms(using: device)
-                    self.nightscoutDataManager.uploadLoopStatus(loopError: error)
-                    nsPumpStatus = nil
-                }
-
-                device.getStatus { (status) in
-                    self.queue.async {
-                        self.nightscoutDataManager.uploadDeviceStatus(nsPumpStatus, rileylinkDevice: status, deviceState: self.deviceStates[device.peripheralIdentifier])
-                    }
-                }
-            }
-        }
-    }
-
-    /// TODO: Isolate to queue
-    /// Send a bolus command and handle the result
-    ///
-    /// - 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, 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 {
-            notify(nil)
-            return
-        }
-
-        guard let ops = pumpOps else {
-            notify(LoopError.configurationError("Pump ID"))
-            return
-        }
-
-        // If we don't have recent pump data, or the pump was recently rewound, read new pump data before bolusing.
-        let shouldReadReservoir = isReservoirDataOlderThan(timeIntervalSinceNow: .minutes(-6))
-
-        ops.runSession(withName: "Bolus", using: rileyLinkManager.firstConnectedDevice) { (session) in
-            guard let session = session else {
-                notify(LoopError.connectionError)
-                return
-            }
-
-            if shouldReadReservoir {
-                do {
-                    let reservoir = try session.getRemainingInsulin()
-
-                    self.loopManager.addReservoirValue(reservoir.units, at: reservoir.clock.date!) { (result) in
-                        switch result {
-                        case .failure(let error):
-                            self.logger.addError(error, fromSource: "Bolus")
-                        case .success:
-                            break
-                        }
-                    }
-                } catch let error as PumpOpsError {
-                    self.logger.addError("Failed to fetch pump status: \(error)", fromSource: "RileyLink")
-                    notify(SetBolusError.certain(error))
-                    return
-                } catch let error as PumpCommandError {
-                    self.logger.addError("Failed to fetch pump status: \(error)", fromSource: "RileyLink")
-                    switch error {
-                    case .arguments(let error):
-                        notify(SetBolusError.certain(error))
-                    case .command(let error):
-                        notify(SetBolusError.certain(error))
-                    }
-                    return
-                } catch let error {
-                    notify(error)
-                    return
-                }
-            }
-
-            do {
-                let semaphore = DispatchSemaphore(value: 0)
-                self.loopManager.addRequestedBolus(units: units, at: Date()) {
-                    semaphore.signal()
-                }
-                semaphore.wait()
-
-                try session.setNormalBolus(units: units)
-                self.loopManager.addConfirmedBolus(units: units, at: Date()) {
-                    notify(nil)
-                }
-            } catch let error {
-                self.logger.addError(error, fromSource: "Bolus")
-                notify(error)
-            }
-        }
-    }
-
-    // MARK: - CGM
-
-    var cgm: CGM? = UserDefaults.appGroup.cgm {
-        didSet {
-            if cgm != oldValue {
-                setupCGM()
-            }
-
-            UserDefaults.appGroup.cgm = cgm
-        }
-    }
-
-    private(set) var cgmManager: CGMManager?
-
-    /// TODO: Isolate to queue
-    private func setupCGM() {
-        cgmManager = cgm?.createManager()
-        cgmManager?.delegate = self
-        loopManager.glucoseStore.managedDataInterval = cgmManager?.managedDataInterval
-
-        updateTimerTickPreference()
-    }
-
-    var sensorInfo: SensorDisplayable? {
-        return cgmManager?.sensorState
-    }
-
-    // MARK: - Configuration
-
-    // MARK: Pump
-
-    /// TODO: Isolate to queue
-    private var connectedPeripheralIDs: Set<String> = Set(UserDefaults.appGroup.connectedPeripheralIDs) {
-        didSet {
-            UserDefaults.appGroup.connectedPeripheralIDs = Array(connectedPeripheralIDs)
-        }
-    }
-
-    // TODO: Isolate to queue
-    private var deviceStates: [UUID: DeviceState] = [:]
-
-    func getStateForDevice(_ device: RileyLinkDevice, completion: @escaping (_ deviceState: DeviceState, _ pumpState: PumpState?, _ pumpSettings: PumpSettings?, _ pumpOps: PumpOps?) -> Void) {
-        queue.async {
-            completion(self.deviceStates[device.peripheralIdentifier, default: DeviceState()], self.pumpState, self.pumpSettings, self.pumpOps)
-        }
-    }
-
-    private(set) var pumpOps: PumpOps? {
-        didSet {
-            if pumpOps == nil {
-                UserDefaults.appGroup.pumpState = nil
-            }
-        }
-    }
-
-    private(set) var pumpSettings: PumpSettings? {
-        get {
-            return UserDefaults.appGroup.pumpSettings
-        }
-        set {
-            if let settings = newValue {
-                if let pumpOps = pumpOps {
-                    pumpOps.updateSettings(settings)
-                } else {
-                    pumpOps = PumpOps(pumpSettings: settings, pumpState: nil, delegate: self)
-                }
-            } else {
-                pumpOps = nil
-                loopManager.doseStore.resetPumpData()
-            }
-
-            UserDefaults.appGroup.pumpSettings = newValue
-        }
-    }
-
-    func setPumpID(_ pumpID: String?) {
-        var newValue = pumpID
-
-        if newValue?.count != 6 {
-            newValue = nil
-        }
-
-        if let newValue = newValue {
-            if pumpSettings != nil {
-                pumpSettings?.pumpID = newValue
-            } else {
-                pumpSettings = PumpSettings(pumpID: newValue)
-            }
-        }
-    }
-
-    func setPumpRegion(_ pumpRegion: PumpRegion) {
-        pumpSettings?.pumpRegion = pumpRegion
-    }
-
-    var pumpState: PumpState? {
-        return UserDefaults.appGroup.pumpState
-    }
-
-    // TODO: Isolate to queue
-    /// The user's preferred method of fetching insulin data from the pump
-    var preferredInsulinDataSource = UserDefaults.appGroup.preferredInsulinDataSource ?? .pumpHistory {
-        didSet {
-            UserDefaults.appGroup.preferredInsulinDataSource = preferredInsulinDataSource
-        }
-    }
-
-    // TODO: Isolate to queue
-    /// The pump battery chemistry, for voltage -> percentage calculation
-    var batteryChemistry = UserDefaults.appGroup.batteryChemistry ?? .alkaline {
-        didSet {
-            UserDefaults.appGroup.batteryChemistry = batteryChemistry
-        }
-    }
-
-    // MARK: - WatchKit
-
-    fileprivate var watchManager: WatchDataManager!
-
-    // MARK: - Status Extension
-
-    fileprivate var statusExtensionManager: StatusExtensionDataManager!
-
-    // MARK: - Initialization
-
-    private(set) var loopManager: LoopDataManager!
-
-    init() {
-        rileyLinkManager = RileyLinkDeviceManager(
-            autoConnectIDs: connectedPeripheralIDs
-        )
-
-        // Pump communication
-        var idleListeningEnabled = true
-
-        if let pumpSettings = UserDefaults.appGroup.pumpSettings {
-            let pumpState = self.pumpState
-
-            idleListeningEnabled = pumpState?.pumpModel?.hasMySentry ?? true
-
-            self.pumpOps = PumpOps(pumpSettings: pumpSettings, pumpState: pumpState, delegate: self)
-        }
-
-        rileyLinkManager.idleListeningState = idleListeningEnabled ? LoopSettings.idleListeningEnabledDefaults : .disabled
-
-        // Listen for device notifications
-        NotificationCenter.default.addObserver(self, selector: #selector(receivedRileyLinkPacketNotification(_:)), name: .DevicePacketReceived, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(receivedRileyLinkTimerTickNotification(_:)), name: .DeviceTimerDidTick, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(deviceStatusDidChange(_:)), name: .DeviceConnectionStateDidChange, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(deviceStatusDidChange(_:)), name: .DeviceNameDidChange, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(deviceStateDidChange(_:)), name: .DeviceStateDidChange, object: nil)
-
-        NotificationCenter.default.addObserver(self, selector: #selector(deviceStatusDidChange(_:)), name: .ManagerDevicesDidChange, object: rileyLinkManager)
-
-        remoteDataManager.delegate = self
-        statusExtensionManager = StatusExtensionDataManager(deviceDataManager: self)
-        loopManager = LoopDataManager(
-            lastLoopCompleted: statusExtensionManager.context?.lastLoopCompleted,
-            lastTempBasal: statusExtensionManager.context?.netBasal?.tempBasal
-        )
-        watchManager = WatchDataManager(deviceDataManager: self)
-        nightscoutDataManager = NightscoutDataManager(deviceDataManager: self)
-
-        loopManager.delegate = self
-        loopManager.carbStore.syncDelegate = remoteDataManager.nightscoutService.uploader
-        loopManager.doseStore.delegate = self
-        // Proliferate PumpModel preferences to DoseStore
-        if let pumpModel = pumpState?.pumpModel {
-            loopManager.doseStore.pumpRecordsBasalProfileStartEvents = pumpModel.recordsBasalProfileStartEvents
-        }
-
-        setupCGM()
-    }
-}
-
-
-extension DeviceDataManager: RemoteDataManagerDelegate {
-    func remoteDataManagerDidUpdateServices(_ dataManager: RemoteDataManager) {
-        loopManager.carbStore.syncDelegate = dataManager.nightscoutService.uploader
-    }
-}
-
-
-extension DeviceDataManager: CGMManagerDelegate {
-    func cgmManager(_ manager: CGMManager, didUpdateWith result: CGMResult) {
-        /// TODO: Isolate to queue
-        switch result {
-        case .newData(let values):
-            loopManager.addGlucose(values) { _ in
-                self.assertCurrentPumpData()
-            }
-        case .noData:
-            self.assertCurrentPumpData()
-            break
-        case .error(let error):
-            self.setLastError(error: error)
-            self.assertCurrentPumpData()
-        }
-
-        updateTimerTickPreference()
-    }
-
-    func startDateToFilterNewData(for manager: CGMManager) -> Date? {
-        return loopManager.glucoseStore.latestGlucose?.startDate
+    func startDateToFilterNewReservoirEvents(for manager: PumpManager) -> Date {
+        return loopManager.doseStore.lastReservoirValue?.startDate ?? .distantPast
     }
 }
 
@@ -829,17 +282,17 @@ extension DeviceDataManager: DoseStoreDelegate {
         completion completionHandler: @escaping (_ uploadedObjectIDURLs: [URL]) -> Void
     ) {
         /// TODO: Isolate to queue
-        guard let uploader = remoteDataManager.nightscoutService.uploader, let pumpModel = pumpState?.pumpModel else {
+        guard let uploader = remoteDataManager.nightscoutService.uploader else {
             completionHandler(pumpEvents.map({ $0.objectIDURL }))
             return
         }
 
-        uploader.upload(pumpEvents, from: pumpModel) { (result) in
+        uploader.upload(pumpEvents, fromSource: "loop://\(UIDevice.current.name)") { (result) in
             switch result {
             case .success(let objects):
                 completionHandler(objects)
             case .failure(let error):
-                let logger = DiagnosticLogger.shared!.forCategory("NightscoutUploader")
+                let logger = DiagnosticLogger.shared.forCategory("NightscoutUploader")
                 logger.error(error)
                 completionHandler([])
             }
@@ -847,6 +300,28 @@ extension DeviceDataManager: DoseStoreDelegate {
     }
 }
 
+extension DeviceDataManager {
+    func enactBolus(units: Double, at startDate: Date = Date(), completion: @escaping (_ error: Error?) -> Void) {
+        guard let pumpManager = pumpManager else {
+            completion(LoopError.configurationError("Pump Manager"))
+            return
+        }
+
+        pumpManager.enactBolus(units: units, at: startDate, willRequest: { (units, date) in
+            self.loopManager.addRequestedBolus(units: units, at: date, completion: nil)
+        }) { (error) in
+            if let error = error {
+                self.log.error(error)
+                NotificationManager.sendBolusFailureNotification(for: error, units: units, at: startDate)
+                completion(error)
+            } else {
+                self.loopManager.addConfirmedBolus(units: units, at: Date()) {
+                    completion(nil)
+                }
+            }
+        }
+    }
+}
 
 extension DeviceDataManager: LoopDataManagerDelegate {
     func loopDataManager(
@@ -854,84 +329,23 @@ extension DeviceDataManager: LoopDataManagerDelegate {
         didRecommendBasalChange basal: (recommendation: TempBasalRecommendation, date: Date),
         completion: @escaping (_ result: Result<DoseEntry>) -> Void
     ) {
-        guard let pumpOps = pumpOps else {
-            completion(.failure(LoopError.configurationError("Pump ID")))
+        guard let pumpManager = pumpManager else {
+            completion(.failure(LoopError.configurationError("Pump Manager")))
             return
         }
 
-        pumpOps.runSession(withName: "Set Temp Basal", using: rileyLinkManager.firstConnectedDevice) { (session) in
-            guard let session = session else {
-                completion(.failure(LoopError.connectionError))
-                return
-            }
-
-            do {
-                let response = try session.setTempBasal(basal.recommendation.unitsPerHour, duration: basal.recommendation.duration)
-
-                let now = Date()
-                let endDate = now.addingTimeInterval(response.timeRemaining)
-                let startDate = endDate.addingTimeInterval(-basal.recommendation.duration)
-                completion(.success(DoseEntry(
-                    type: .tempBasal,
-                    startDate: startDate,
-                    endDate: endDate,
-                    value: response.rate,
-                    unit: .unitsPerHour
-                )))
-
-                // Continue below
-            } catch let error {
-                completion(.failure(error))
-                return
-            }
-
-            do {
-                // If we haven't fetched history in a while, our preferredInsulinDataSource is probably .reservoir, so
-                // let's take advantage of the pump radio being on.
-                if self.loopManager.doseStore.lastAddedPumpEvents.timeIntervalSinceNow < .minutes(-4) {
-                    let clock = try session.getTime()
-                    // Check if the clock should be reset
-                    if let date = clock.date, abs(date.timeIntervalSinceNow) > .seconds(20) {
-                        self.logger.addError("Pump clock is more than 20 seconds off. Resetting.", fromSource: "RileyLink")
-                        AnalyticsManager.shared.pumpTimeDidDrift(date.timeIntervalSinceNow)
-                        try session.setTime { () -> DateComponents in
-                            let calendar = Calendar(identifier: .gregorian)
-                            return calendar.dateComponents([.year, .month, .day, .hour, .minute, .second], from: Date())
-                        }
-                    }
-
-                    self.fetchPumpHistory { (error) in
-                        if let error = error {
-                            self.logger.addError("Post-basal history fetch failed: \(error)", fromSource: "RileyLink")
-                        }
-                    }
+        pumpManager.enactTempBasal(
+            unitsPerHour: basal.recommendation.unitsPerHour,
+            for: basal.recommendation.duration,
+            completion: { result in
+                switch result {
+                case .success(let doseEntry):
+                    completion(.success(doseEntry))
+                case .failure(let error):
+                    completion(.failure(error))
                 }
-            } catch let error {
-                self.logger.addError("Post-basal time sync failed: \(error)", fromSource: "RileyLink")
             }
-        }
-    }
-}
-
-
-extension DeviceDataManager: PumpOpsDelegate {
-    func pumpOps(_ pumpOps: PumpOps, didChange state: PumpState) {
-        if let sentrySupported = pumpState?.pumpModel?.hasMySentry {
-            rileyLinkManager.idleListeningState = sentrySupported ? LoopSettings.idleListeningEnabledDefaults : .disabled
-        }
-
-        UserDefaults.appGroup.pumpState = state
-
-        // Update the pump-schedule based settings
-        loopManager.setScheduleTimeZone(state.timeZone)
-
-        // Update the HKDevice to include the model change
-        updateDoseStoreDeviceFromRileyLink(state: state)
-
-        // Update the preference for basal profile start events
-        if let recordsBasalProfileStartEvents = state.pumpModel?.recordsBasalProfileStartEvents {
-            loopManager.doseStore.pumpRecordsBasalProfileStartEvents = recordsBasalProfileStartEvents
-        }
+        )
     }
 }
 
@@ -944,21 +358,12 @@ extension DeviceDataManager: CustomDebugStringConvertible {
             "## DeviceDataManager",
             "launchDate: \(launchDate)",
             "cgm: \(String(describing: cgm))",
-            "connectedPeripheralIDs: \(String(reflecting: connectedPeripheralIDs))",
-            "deviceStates: \(String(reflecting: deviceStates))",
             "lastError: \(String(describing: lastError))",
-            "lastTimerTick: \(String(describing: lastTimerTick))",
-            "latestPumpStatus: \(String(describing: latestPumpStatus))",
-            "latestPumpStatusFromMySentry: \(String(describing: latestPumpStatusFromMySentry))",
-            "pumpBatteryChargeRemaining: \(String(reflecting: pumpBatteryChargeRemaining))",
-            "pumpSettings: \(String(reflecting: pumpSettings))",
-            "pumpState: \(String(reflecting: pumpState))",
-            "preferredInsulinDataSource: \(preferredInsulinDataSource)",
             "sensorInfo: \(String(reflecting: sensorInfo))",
             "",
-            cgmManager != nil ? String(reflecting: cgmManager!) : "",
+            cgmManager != nil ? String(reflecting: cgmManager!) : "cgmManager: nil",
             "",
-            String(reflecting: rileyLinkManager),
+            pumpManager != nil ? String(reflecting: pumpManager!) : "pumpManager: nil",
             "",
             String(reflecting: statusExtensionManager!),
         ].joined(separator: "\n")
diff --git a/Loop/Managers/DiagnosticLogger.swift b/Loop/Managers/DiagnosticLogger.swift
index 1914fa2a3e..cac510f461 100644
--- a/Loop/Managers/DiagnosticLogger.swift
+++ b/Loop/Managers/DiagnosticLogger.swift
@@ -12,14 +12,6 @@ import os.log
 
 final class DiagnosticLogger {
     private let isSimulator: Bool = TARGET_OS_SIMULATOR != 0
-    let subsystem: String
-    let version: String
-
-    private var mLabService: MLabService {
-        didSet {
-            try! KeychainManager().setMLabDatabaseName(mLabService.databaseName, APIKey: mLabService.APIKey)
-        }
-    }
 
     var logglyService: LogglyService {
         didSet {
@@ -29,15 +21,13 @@ final class DiagnosticLogger {
 
     let remoteLogLevel: OSLogType
 
-    static var shared: DiagnosticLogger?
+    static let shared: DiagnosticLogger = DiagnosticLogger()
 
-    init(subsystem: String, version: String) {
-        self.subsystem = subsystem
-        self.version = version
+    init() {
         remoteLogLevel = isSimulator ? .fault : .info
 
         // Delete the mLab credentials as they're no longer supported
-        mLabService = MLabService(databaseName: nil, APIKey: nil)
+        try! KeychainManager().setMLabDatabaseName(nil, APIKey: nil)
 
         let customerToken = KeychainManager().getLogglyCustomerToken()
         logglyService = LogglyService(customerToken: customerToken)
diff --git a/Loop/Managers/DoseMath.swift b/Loop/Managers/DoseMath.swift
index a7c26ef130..1192d01cc5 100644
--- a/Loop/Managers/DoseMath.swift
+++ b/Loop/Managers/DoseMath.swift
@@ -103,7 +103,7 @@ extension InsulinCorrection {
 }
 
 
-struct TempBasalRecommendation {
+struct TempBasalRecommendation: Equatable {
     let unitsPerHour: Double
     let duration: TimeInterval
 
@@ -113,12 +113,6 @@ struct TempBasalRecommendation {
     }
 }
 
-extension TempBasalRecommendation: Equatable {
-    static func ==(lhs: TempBasalRecommendation, rhs: TempBasalRecommendation) -> Bool {
-        return lhs.unitsPerHour == rhs.unitsPerHour && lhs.duration == rhs.duration
-    }
-}
-
 
 extension TempBasalRecommendation {
     /// Equates the recommended rate with another rate
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
index 7120e9c3ec..555854f0a0 100644
--- a/Loop/Managers/LoopDataManager.swift
+++ b/Loop/Managers/LoopDataManager.swift
@@ -52,7 +52,7 @@ final class LoopDataManager {
         insulinSensitivitySchedule: InsulinSensitivitySchedule? = UserDefaults.appGroup.insulinSensitivitySchedule,
         settings: LoopSettings = UserDefaults.appGroup.loopSettings ?? LoopSettings()
     ) {
-        self.logger = DiagnosticLogger.shared!.forCategory("LoopDataManager")
+        self.logger = DiagnosticLogger.shared.forCategory("LoopDataManager")
         self.lockedLastLoopCompleted = Locked(lastLoopCompleted)
         self.lastTempBasal = lastTempBasal
         self.settings = settings
@@ -253,6 +253,10 @@ extension LoopDataManager {
             doseStore.basalProfile = newValue
             UserDefaults.appGroup.basalRateSchedule = newValue
             notify(forChange: .preferences)
+
+            if let newValue = newValue, let oldValue = doseStore.basalProfile, newValue.items != oldValue.items {
+                AnalyticsManager.shared.didChangeBasalRateSchedule()
+            }
         }
     }
 
diff --git a/Loop/Managers/NightscoutDataManager.swift b/Loop/Managers/NightscoutDataManager.swift
index bafc50aa5b..09c2a7483b 100644
--- a/Loop/Managers/NightscoutDataManager.swift
+++ b/Loop/Managers/NightscoutDataManager.swift
@@ -10,26 +10,24 @@ import Foundation
 import NightscoutUploadKit
 import HealthKit
 import LoopKit
-import RileyLinkKit
-import RileyLinkBLEKit
 
 
 final class NightscoutDataManager {
 
-    unowned let deviceDataManager: DeviceDataManager
+    unowned let deviceManager: DeviceDataManager
     
     // Last time we uploaded device status
     var lastDeviceStatusUpload: Date?
 
     init(deviceDataManager: DeviceDataManager) {
-        self.deviceDataManager = deviceDataManager
+        self.deviceManager = deviceDataManager
 
         NotificationCenter.default.addObserver(self, selector: #selector(loopDataUpdated(_:)), name: .LoopDataUpdated, object: deviceDataManager.loopManager)
     }
     
     @objc func loopDataUpdated(_ note: Notification) {
         guard
-            deviceDataManager.remoteDataManager.nightscoutService.uploader != nil,
+            deviceManager.remoteDataManager.nightscoutService.uploader != nil,
             let rawContext = note.userInfo?[LoopDataManager.LoopUpdateContextKey] as? LoopDataManager.LoopUpdateContext.RawValue,
             let context = LoopDataManager.LoopUpdateContext(rawValue: rawContext),
             case .tempBasal = context
@@ -37,7 +35,7 @@ final class NightscoutDataManager {
             return
         }
 
-        deviceDataManager.loopManager.getLoopState { (manager, state) in
+        deviceManager.loopManager.getLoopState { (manager, state) in
             var loopError = state.error
             let recommendedBolus: Double?
 
@@ -79,7 +77,7 @@ final class NightscoutDataManager {
 
     func uploadLoopStatus(insulinOnBoard: InsulinValue? = nil, carbsOnBoard: CarbValue? = nil, predictedGlucose: [GlucoseValue]? = nil, recommendedTempBasal: (recommendation: TempBasalRecommendation, date: Date)? = nil, recommendedBolus: Double? = nil, lastTempBasal: DoseEntry? = nil, loopError: Error? = nil) {
 
-        guard deviceDataManager.remoteDataManager.nightscoutService.uploader != nil else {
+        guard deviceManager.remoteDataManager.nightscoutService.uploader != nil else {
             return
         }
         
@@ -132,7 +130,7 @@ final class NightscoutDataManager {
 
         let loopStatus = LoopStatus(name: loopName, version: loopVersion, timestamp: statusTime, iob: iob, cob: cob, predicted: predicted, recommendedTempBasal: recommended, recommendedBolus: recommendedBolus, enacted: loopEnacted, failureReason: loopError)
         
-        uploadDeviceStatus(nil, loopStatus: loopStatus, includeUploaderStatus: false)
+        upload(pumpStatus: nil, loopStatus: loopStatus, deviceName: nil, firmwareVersion: nil, lastValidFrequency: nil, lastTuned: nil, uploaderStatus: getUploaderStatus())
 
     }
     
@@ -149,13 +147,27 @@ final class NightscoutDataManager {
         return UploaderStatus(name: uploaderDevice.name, timestamp: Date(), battery: battery)
     }
 
-    func uploadDeviceStatus(_ pumpStatus: NightscoutUploadKit.PumpStatus? = nil, loopStatus: LoopStatus? = nil, rileylinkDevice: RileyLinkDevice.Status? = nil, deviceState: DeviceState? = nil, includeUploaderStatus: Bool = true) {
+    func upload(pumpStatus: PumpManagerStatus) {
+        upload(
+            pumpStatus: pumpStatus.pumpStatus,
+            deviceName: pumpStatus.device?.name,
+            firmwareVersion: pumpStatus.device?.firmwareVersion,
+            lastValidFrequency: pumpStatus.lastValidFrequency,
+            lastTuned: pumpStatus.lastTuned
+        )
+    }
+
+    func upload(pumpStatus: NightscoutUploadKit.PumpStatus?, deviceName: String?, firmwareVersion: String?, lastValidFrequency: Measurement<UnitFrequency>?, lastTuned: Date?) {
+        upload(pumpStatus: pumpStatus, loopStatus: nil, deviceName: deviceName, firmwareVersion: firmwareVersion, lastValidFrequency: lastValidFrequency, lastTuned: lastTuned, uploaderStatus: nil)
+    }
 
-        guard let uploader = deviceDataManager.remoteDataManager.nightscoutService.uploader else {
+    private func upload(pumpStatus: NightscoutUploadKit.PumpStatus?, loopStatus: LoopStatus?, deviceName: String?, firmwareVersion: String?, lastValidFrequency: Measurement<UnitFrequency>?, lastTuned: Date?, uploaderStatus: UploaderStatus?) {
+
+        guard let uploader = deviceManager.remoteDataManager.nightscoutService.uploader else {
             return
         }
         
-        if pumpStatus == nil && loopStatus == nil && includeUploaderStatus {
+        if pumpStatus == nil && loopStatus == nil && uploaderStatus != nil {
             // If we're just uploading phone status, limit it to once every 5 minutes
             if self.lastDeviceStatusUpload != nil && self.lastDeviceStatusUpload!.timeIntervalSinceNow > -(TimeInterval(minutes: 5)) {
                 return
@@ -164,17 +176,15 @@ final class NightscoutDataManager {
 
         let uploaderDevice = UIDevice.current
 
-        let uploaderStatus: UploaderStatus? = includeUploaderStatus ? getUploaderStatus() : nil
-
         var radioAdapter: NightscoutUploadKit.RadioAdapter? = nil
 
-        if let device = rileylinkDevice {
+        if let firmwareVersion = firmwareVersion {
             radioAdapter = NightscoutUploadKit.RadioAdapter(
                 hardware: "RileyLink",
-                frequency: deviceState?.lastValidFrequency?.value,
-                name: device.name ?? "Unknown",
-                lastTuned: deviceState?.lastTuned,
-                firmwareVersion: device.firmwareDescription,
+                frequency: lastValidFrequency?.value,
+                name: deviceName ?? "Unknown",
+                lastTuned: lastTuned,
+                firmwareVersion: firmwareVersion,
                 RSSI: nil, // TODO: device.RSSI,
                 pumpRSSI: nil // TODO: device.pumpRSSI
             )
@@ -186,4 +196,70 @@ final class NightscoutDataManager {
         self.lastDeviceStatusUpload = Date()
         uploader.uploadDeviceStatus(deviceStatus)
     }
+
+    func uploadGlucose(_ values: [GlucoseValue], sensorState: SensorDisplayable?) {
+        guard let uploader = deviceManager.remoteDataManager.nightscoutService.uploader else {
+            return
+        }
+
+        let device = "loop://\(UIDevice.current.name)"
+        let direction: String? = {
+            switch sensorState?.trendType {
+            case .up?:
+                return "SingleUp"
+            case .upUp?, .upUpUp?:
+                return "DoubleUp"
+            case .down?:
+                return "SingleDown"
+            case .downDown?, .downDownDown?:
+                return "DoubleDown"
+            case .flat?:
+                return "Flat"
+            case .none:
+                return nil
+            }
+        }()
+
+        for value in values {
+            uploader.uploadSGV(
+                glucoseMGDL: Int(value.quantity.doubleValue(for: .milligramsPerDeciliter)),
+                at: value.startDate,
+                direction: direction,
+                device: device
+            )
+        }
+    }
+}
+
+
+private extension PumpManagerStatus {
+    var batteryStatus: NightscoutUploadKit.BatteryStatus? {
+        return NightscoutUploadKit.BatteryStatus(
+            percent: battery?.percent != nil ? Int(battery!.percent! * 100) : nil,
+            voltage: battery?.voltage?.converted(to: .volts).value,
+            status: {
+                switch battery?.state {
+                case .normal?:
+                    return .normal
+                case .low?:
+                    return .low
+                case .none:
+                    return nil
+                }
+            }()
+        )
+    }
+
+    var pumpStatus: NightscoutUploadKit.PumpStatus {
+        return PumpStatus(
+            clock: date,
+            pumpID: device?.localIdentifier ?? "",
+            iob: nil,
+            battery: batteryStatus,
+            suspended: isSuspended,
+            bolusing: isBolusing,
+            reservoir: remainingReservoir?.doubleValue(for: .internationalUnit()),
+            secondsFromGMT: timeZone.secondsFromGMT()
+        )
+    }
 }
diff --git a/Loop/Managers/NotificationManager.swift b/Loop/Managers/NotificationManager.swift
index 18e6ae97b9..ac4daa78c1 100644
--- a/Loop/Managers/NotificationManager.swift
+++ b/Loop/Managers/NotificationManager.swift
@@ -8,8 +8,7 @@
 
 import UIKit
 import UserNotifications
-
-import RileyLinkKit
+import LoopKit
 
 
 struct NotificationManager {
@@ -65,7 +64,7 @@ struct NotificationManager {
         notification.title = NSLocalizedString("Bolus", comment: "The notification title for a bolus failure")
 
         switch error {
-        case let error as RileyLinkKit.SetBolusError:
+        case let error as SetBolusError:
             notification.subtitle = error.errorDescriptionWithUnits(units)
             notification.body = String(format: "%@ %@", error.failureReason!, error.recoverySuggestion!)
         case let error as LocalizedError:
diff --git a/Loop/Managers/PumpManagerState.swift b/Loop/Managers/PumpManagerState.swift
new file mode 100644
index 0000000000..02b9830d2a
--- /dev/null
+++ b/Loop/Managers/PumpManagerState.swift
@@ -0,0 +1,36 @@
+//
+//  PumpManagerState.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+import LoopKit
+import MinimedKit
+
+
+let allPumpManagers: [String: PumpManager.Type] = [
+    MinimedPumpManager.managerIdentifier: MinimedPumpManager.self
+]
+
+
+func PumpManagerFromRawValue(_ rawValue: [String: Any]) -> PumpManager? {
+    guard let managerIdentifier = rawValue["managerIdentifier"] as? String,
+        let rawState = rawValue["state"] as? PumpManager.RawStateValue,
+        let Manager = allPumpManagers[managerIdentifier]
+    else {
+        return nil
+    }
+
+    return Manager.init(rawState: rawState)
+}
+
+extension PumpManager {
+    var rawValue: [String: Any] {
+        return [
+            "managerIdentifier": type(of: self).managerIdentifier,
+            "state": self.rawState
+        ]
+    }
+}
diff --git a/Loop/Managers/RileyLinkDeviceManager.swift b/Loop/Managers/RileyLinkDeviceManager.swift
deleted file mode 100644
index 3a999fcfd6..0000000000
--- a/Loop/Managers/RileyLinkDeviceManager.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  RileyLinkDeviceManager.swift
-//  Loop
-//
-//  Copyright © 2017 LoopKit Authors. All rights reserved.
-//
-
-import RileyLinkBLEKit
-
-extension RileyLinkDeviceManager {
-    func firstConnectedDevice(_ completion: @escaping (_ device: RileyLinkDevice?) -> Void) {
-        getDevices { (devices) in
-            completion(devices.firstConnected)
-        }
-    }
-}
diff --git a/Loop/Managers/StatusExtensionDataManager.swift b/Loop/Managers/StatusExtensionDataManager.swift
index e42cbe5264..f2011e96c0 100644
--- a/Loop/Managers/StatusExtensionDataManager.swift
+++ b/Loop/Managers/StatusExtensionDataManager.swift
@@ -9,14 +9,13 @@
 import HealthKit
 import UIKit
 import LoopKit
-import LoopUI
 
 
 final class StatusExtensionDataManager {
-    unowned let dataManager: DeviceDataManager
+    unowned let deviceManager: DeviceDataManager
 
     init(deviceDataManager: DeviceDataManager) {
-        self.dataManager = deviceDataManager
+        self.deviceManager = deviceDataManager
 
         NotificationCenter.default.addObserver(self, selector: #selector(update(_:)), name: .LoopDataUpdated, object: deviceDataManager.loopManager)
     }
@@ -30,7 +29,7 @@ final class StatusExtensionDataManager {
     }
 
     @objc private func update(_ notification: Notification) {
-        guard let unit = (dataManager.loopManager.glucoseStore.preferredUnit ?? context?.predictedGlucose?.unit) else {
+        guard let unit = (deviceManager.loopManager.glucoseStore.preferredUnit ?? context?.predictedGlucose?.unit) else {
             return
         }
 
@@ -42,8 +41,8 @@ final class StatusExtensionDataManager {
     }
 
     private func createContext(glucoseUnit: HKUnit, _ completionHandler: @escaping (_ context: StatusExtensionContext?) -> Void) {
-        dataManager.loopManager.getLoopState { (manager, state) in
-            let dataManager = self.dataManager
+        deviceManager.loopManager.getLoopState { (manager, state) in
+            let dataManager = self.deviceManager
             var context = StatusExtensionContext()
         
             #if IOS_SIMULATOR
@@ -100,9 +99,8 @@ final class StatusExtensionDataManager {
                 context.netBasal = NetBasalContext(rate: netBasal.rate, percentage: netBasal.percent, start: netBasal.start, end: netBasal.end)
             }
 
-            if let batteryPercentage = dataManager.pumpBatteryChargeRemaining {
-                context.batteryPercentage = batteryPercentage
-            }
+            context.batteryPercentage = dataManager.pumpManager?.pumpBatteryChargeRemaining
+            context.reservoirCapacity = dataManager.pumpManager?.pumpReservoirCapacity
 
             if let sensorInfo = dataManager.sensorInfo {
                 context.sensor = SensorDisplayableContext(
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
index 07ed7ab91c..df3329f72a 100644
--- a/Loop/Managers/WatchDataManager.swift
+++ b/Loop/Managers/WatchDataManager.swift
@@ -14,14 +14,14 @@ import LoopKit
 
 final class WatchDataManager: NSObject, WCSessionDelegate {
 
-    unowned let deviceDataManager: DeviceDataManager
+    unowned let deviceManager: DeviceDataManager
 
-    init(deviceDataManager: DeviceDataManager) {
-        self.deviceDataManager = deviceDataManager
+    init(deviceManager: DeviceDataManager) {
+        self.deviceManager = deviceManager
 
         super.init()
 
-        NotificationCenter.default.addObserver(self, selector: #selector(updateWatch(_:)), name: .LoopDataUpdated, object: deviceDataManager.loopManager)
+        NotificationCenter.default.addObserver(self, selector: #selector(updateWatch(_:)), name: .LoopDataUpdated, object: deviceManager.loopManager)
 
         watchSession?.delegate = self
         watchSession?.activate()
@@ -51,8 +51,8 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
         case .tempBasal:
             break
         case .preferences:
-            let activeOverrideContext = deviceDataManager.loopManager.settings.glucoseTargetRangeSchedule?.activeOverrideContext
-            let configuredOverrideContexts = deviceDataManager.loopManager.settings.glucoseTargetRangeSchedule?.configuredOverrideContexts ?? []
+            let activeOverrideContext = deviceManager.loopManager.settings.glucoseTargetRangeSchedule?.activeOverrideContext
+            let configuredOverrideContexts = deviceManager.loopManager.settings.glucoseTargetRangeSchedule?.configuredOverrideContexts ?? []
             defer {
                 lastActiveOverrideContext = activeOverrideContext
                 lastConfiguredOverrideContexts = configuredOverrideContexts
@@ -105,14 +105,14 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
                 do {
                     try session.updateApplicationContext(context.rawValue)
                 } catch let error {
-                    deviceDataManager.logger.addError(error, fromSource: "WCSession")
+                    deviceManager.logger.addError(error, fromSource: "WCSession")
                 }
             }
         }
     }
 
     private func createWatchContext(_ completion: @escaping (_ context: WatchContext?) -> Void) {
-        let loopManager = deviceDataManager.loopManager!
+        let loopManager = deviceManager.loopManager!
 
         let glucose = loopManager.glucoseStore.latestGlucose
         let reservoir = loopManager.doseStore.lastReservoirValue
@@ -126,7 +126,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
             context.recommendedBolusDose = state.recommendedBolus?.recommendation.amount
             context.maxBolus = manager.settings.maximumBolus
 
-            context.cgm = self.deviceDataManager.cgm
+            context.cgm = self.deviceManager.cgm
 
             if let glucoseTargetRangeSchedule = manager.settings.glucoseTargetRangeSchedule {
                 if let override = glucoseTargetRangeSchedule.override {
@@ -137,12 +137,12 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
                     )
                 }
 
-                let configuredOverrideContexts = self.deviceDataManager.loopManager.settings.glucoseTargetRangeSchedule?.configuredOverrideContexts ?? []
+                let configuredOverrideContexts = self.deviceManager.loopManager.settings.glucoseTargetRangeSchedule?.configuredOverrideContexts ?? []
                 let configuredUserInfoOverrideContexts = configuredOverrideContexts.map { $0.correspondingUserInfoContext }
                 context.configuredOverrideContexts = configuredUserInfoOverrideContexts
             }
 
-            if let trend = self.deviceDataManager.sensorInfo?.trendType {
+            if let trend = self.deviceManager.sensorInfo?.trendType {
                 context.glucoseTrendRawValue = trend.rawValue
             }
 
@@ -153,19 +153,19 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
     private func addCarbEntryFromWatchMessage(_ message: [String: Any], completionHandler: ((_ units: Double?) -> Void)? = nil) {
         if let carbEntry = CarbEntryUserInfo(rawValue: message) {
             let newEntry = NewCarbEntry(
-                quantity: HKQuantity(unit: deviceDataManager.loopManager.carbStore.preferredUnit, doubleValue: carbEntry.value),
+                quantity: HKQuantity(unit: deviceManager.loopManager.carbStore.preferredUnit, doubleValue: carbEntry.value),
                 startDate: carbEntry.startDate,
                 foodType: nil,
-                absorptionTime: carbEntry.absorptionTimeType.absorptionTimeFromDefaults(deviceDataManager.loopManager.carbStore.defaultAbsorptionTimes)
+                absorptionTime: carbEntry.absorptionTimeType.absorptionTimeFromDefaults(deviceManager.loopManager.carbStore.defaultAbsorptionTimes)
             )
 
-            deviceDataManager.loopManager.addCarbEntryAndRecommendBolus(newEntry) { (result) in
+            deviceManager.loopManager.addCarbEntryAndRecommendBolus(newEntry) { (result) in
                 switch result {
                 case .success(let recommendation):
                     AnalyticsManager.shared.didAddCarbsFromWatch(carbEntry.value)
                     completionHandler?(recommendation?.amount)
                 case .failure(let error):
-                    self.deviceDataManager.logger.addError(error, fromSource: error is CarbStore.CarbStoreError ? "CarbStore" : "Bolus")
+                    self.deviceManager.logger.addError(error, fromSource: error is CarbStore.CarbStoreError ? "CarbStore" : "Bolus")
                     completionHandler?(nil)
                 }
             }
@@ -180,11 +180,11 @@ 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.loopManager.settings.maximumBolus).rawValue)
+                replyHandler(BolusSuggestionUserInfo(recommendedBolus: units ?? 0, maxBolus: self.deviceManager.loopManager.settings.maximumBolus).rawValue)
             }
         case SetBolusUserInfo.name?:
             if let bolus = SetBolusUserInfo(rawValue: message as SetBolusUserInfo.RawValue) {
-                self.deviceDataManager.enactBolus(units: bolus.value, at: bolus.startDate) { (error) in
+                self.deviceManager.enactBolus(units: bolus.value, at: bolus.startDate) { (error) in
                     if error == nil {
                         AnalyticsManager.shared.didSetBolusFromWatch(bolus.value)
                     }
@@ -200,7 +200,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
                 // to prevent the Watch context being unnecessarily sent in response to the override being enabled
                 let previousActiveOverrideContext = lastActiveOverrideContext
                 lastActiveOverrideContext = overrideContext
-                let overrideSuccess = deviceDataManager.loopManager.settings.glucoseTargetRangeSchedule?.setOverride(overrideContext, from: overrideUserInfo.startDate, until: overrideUserInfo.effectiveEndDate)
+                let overrideSuccess = deviceManager.loopManager.settings.glucoseTargetRangeSchedule?.setOverride(overrideContext, from: overrideUserInfo.startDate, until: overrideUserInfo.effectiveEndDate)
 
                 if overrideSuccess == false {
                     lastActiveOverrideContext = previousActiveOverrideContext
@@ -209,7 +209,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
                 replyHandler([:])
             } else {
                 lastActiveOverrideContext = nil
-                deviceDataManager.loopManager.settings.glucoseTargetRangeSchedule?.clearOverride()
+                deviceManager.loopManager.settings.glucoseTargetRangeSchedule?.clearOverride()
                 replyHandler([:])
             }
         default:
@@ -225,7 +225,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
         switch activationState {
         case .activated:
             if let error = error {
-                deviceDataManager.logger.addError(error, fromSource: "WCSession")
+                deviceManager.logger.addError(error, fromSource: "WCSession")
             }
         case .inactive, .notActivated:
             break
@@ -234,7 +234,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
 
     func session(_ session: WCSession, didFinish userInfoTransfer: WCSessionUserInfoTransfer, error: Error?) {
         if let error = error {
-            deviceDataManager.logger.addError(error, fromSource: "WCSession")
+            deviceManager.logger.addError(error, fromSource: "WCSession")
         }
     }
 
diff --git a/Loop/Models/EnliteSensorDisplayable.swift b/Loop/Models/EnliteSensorDisplayable.swift
deleted file mode 100644
index aeb891616b..0000000000
--- a/Loop/Models/EnliteSensorDisplayable.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  EnliteSensorDisplayable.swift
-//  Loop
-//
-//  Created by Timothy Mecklem on 12/28/16.
-//  Copyright © 2016 LoopKit Authors. All rights reserved.
-//
-
-import Foundation
-import LoopUI
-import MinimedKit
-
-
-struct EnliteSensorDisplayable: SensorDisplayable {
-    public let isStateValid: Bool
-    public let trendType: LoopUI.GlucoseTrend?
-    public let isLocal: Bool
-
-    public init?(_ event: RelativeTimestampedGlucoseEvent) {
-        isStateValid = event.isStateValid
-        trendType = event.trendType
-        isLocal = event.isLocal
-    }
-}
-
-extension RelativeTimestampedGlucoseEvent {
-    var isStateValid: Bool {
-        return self is SensorValueGlucoseEvent
-    }
-
-    var trendType: LoopUI.GlucoseTrend? {
-        return nil
-    }
-
-    var isLocal: Bool {
-        return true
-    }
-}
diff --git a/Loop/Models/Glucose.swift b/Loop/Models/Glucose.swift
index 791ba627f9..533449f76a 100644
--- a/Loop/Models/Glucose.swift
+++ b/Loop/Models/Glucose.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import LoopUI
+import LoopKit
 import CGMBLEKit
 
 
diff --git a/Loop/Models/GlucoseG4.swift b/Loop/Models/GlucoseG4.swift
index 380ad48c1b..e545f48336 100644
--- a/Loop/Models/GlucoseG4.swift
+++ b/Loop/Models/GlucoseG4.swift
@@ -10,7 +10,6 @@ import Foundation
 import G4ShareSpy
 import HealthKit
 import LoopKit
-import LoopUI
 
 
 extension GlucoseG4: GlucoseValue {
diff --git a/Loop/Models/InsulinDataSource.swift b/Loop/Models/InsulinDataSource.swift
deleted file mode 100644
index 618c178604..0000000000
--- a/Loop/Models/InsulinDataSource.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  InsulinDataSource.swift
-//  Loop
-//
-//  Created by Nathan Racklyeft on 6/10/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import Foundation
-
-
-enum InsulinDataSource: Int, CustomStringConvertible {
-    case pumpHistory = 0
-    case reservoir
-
-    var description: String {
-        switch self {
-        case .pumpHistory:
-            return NSLocalizedString("Event History", comment: "Describing the pump history insulin data source")
-        case .reservoir:
-            return NSLocalizedString("Reservoir", comment: "Describing the reservoir insulin data source")
-        }
-    }
-}
diff --git a/Loop/Models/LoopError.swift b/Loop/Models/LoopError.swift
index 103fa481dd..a72144ac84 100644
--- a/Loop/Models/LoopError.swift
+++ b/Loop/Models/LoopError.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import RileyLinkKit
+import LoopKit
 
 
 enum LoopError: Error {
diff --git a/Loop/Models/LoopSettings+Loop.swift b/Loop/Models/LoopSettings+Loop.swift
index 3f00feb5b3..32ba973f0a 100644
--- a/Loop/Models/LoopSettings+Loop.swift
+++ b/Loop/Models/LoopSettings+Loop.swift
@@ -5,15 +5,8 @@
 //  Copyright © 2018 LoopKit Authors. All rights reserved.
 //
 
-import RileyLinkBLEKit
-
 
 // MARK: - Static configuration
-extension LoopSettings {
-    static let idleListeningEnabledDefaults: RileyLinkDevice.IdleListeningState = .enabled(timeout: .minutes(4), channel: 0)
-}
-
-
 extension LoopSettings {
     var enabledEffects: PredictionInputEffect {
         var inputs = PredictionInputEffect.all
diff --git a/Loop/Models/MySentryPumpStatusMessageBody.swift b/Loop/Models/MySentryPumpStatusMessageBody.swift
deleted file mode 100644
index e2d4830fdf..0000000000
--- a/Loop/Models/MySentryPumpStatusMessageBody.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-//  MySentryPumpStatusMessageBody.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 7/28/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import LoopKit
-import LoopUI
-import MinimedKit
-
-
-extension MySentryPumpStatusMessageBody: SensorDisplayable {
-    public var isStateValid: Bool {
-        switch glucose {
-        case .active:
-            return true
-        default:
-            return false
-        }
-    }
-
-    public var trendType: LoopUI.GlucoseTrend? {
-        guard case .active = glucose else {
-            return nil
-        }
-
-        switch glucoseTrend {
-        case .down:
-            return .down
-        case .downDown:
-            return .downDown
-        case .up:
-            return .up
-        case .upUp:
-            return .upUp
-        case .flat:
-            return .flat
-        }
-    }
-
-    public var isLocal: Bool {
-        return true
-    }
-
-    var batteryPercentage: Int {
-        return batteryRemainingPercent
-    }
-
-    var glucoseSyncIdentifier: String? {
-        guard let date = glucoseDateComponents,
-            let year = date.year,
-            let month = date.month,
-            let day = date.day,
-            let hour = date.hour,
-            let minute = date.minute,
-            let second = date.second
-        else {
-            return nil
-        }
-
-        return "\(year)-\(month)-\(day) \(hour)-\(minute)-\(second)"
-    }
-}
diff --git a/Loop/Models/ServiceAuthentication/MLabService.swift b/Loop/Models/ServiceAuthentication/MLabService.swift
index 7465669283..f88b633f3e 100644
--- a/Loop/Models/ServiceAuthentication/MLabService.swift
+++ b/Loop/Models/ServiceAuthentication/MLabService.swift
@@ -12,95 +12,6 @@ import Foundation
 private let mLabAPIHost = URL(string: "https://api.mongolab.com/api/1/databases")!
 
 
-class MLabService: ServiceAuthentication {
-    var credentials: [ServiceCredential]
-
-    let title: String = NSLocalizedString("mLab", comment: "The title of the mLab service")
-
-    init(databaseName: String?, APIKey: String?) {
-        credentials = [
-            ServiceCredential(
-                title: NSLocalizedString("Database", comment: "The title of the mLab database name credential"),
-                placeholder: "nightscoutdb",
-                isSecret: false,
-                keyboardType: .asciiCapable,
-                value: databaseName
-            ),
-            ServiceCredential(
-                title: NSLocalizedString("API Key", comment: "The title of the mLab API Key credential"),
-                placeholder: nil,
-                isSecret: false,
-                keyboardType: .asciiCapable,
-                value: APIKey
-            )
-        ]
-
-        if databaseName != nil && APIKey != nil {
-            isAuthorized = true
-        }
-    }
-
-    var databaseName: String? {
-        return credentials[0].value
-    }
-
-    var APIKey: String? {
-        return credentials[1].value
-    }
-
-    var isAuthorized: Bool = false
-
-    func verify(_ completion: @escaping (_ success: Bool, _ error: Error?) -> Void) {
-        guard let APIURL = APIURLForCollection("") else {
-            completion(false, nil)
-            return
-        }
-
-        URLSession.shared.dataTask(with: APIURL, completionHandler: { (_, response, error) in
-            var error: Error? = error
-            if error == nil, let response = response as? HTTPURLResponse, response.statusCode >= 300 {
-                error = LoopError.connectionError
-            }
-
-            completion(true, error)
-        }).resume()
-    }
-
-    func reset() {
-        credentials[0].reset()
-        credentials[1].reset()
-        isAuthorized = false
-    }
-
-    private func APIURLForCollection(_ collection: String) -> URL? {
-        guard let databaseName = databaseName, let APIKey = APIKey else {
-            return nil
-        }
-
-        let APIURL = mLabAPIHost.appendingPathComponent("\(databaseName)/collections").appendingPathComponent(collection)
-        var components = URLComponents(url: APIURL, resolvingAgainstBaseURL: true)!
-
-        var items = components.queryItems ?? []
-        items.append(URLQueryItem(name: "apiKey", value: APIKey))
-        components.queryItems = items
-
-        return components.url
-    }
-
-    func uploadTaskWithData(_ data: Data, inCollection collection: String) -> URLSessionTask? {
-        guard let URL = APIURLForCollection(collection) else {
-            return nil
-        }
-
-        var request = URLRequest(url: URL)
-        request.httpMethod = "POST"
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        return URLSession.shared.uploadTask(with: request, from: data)
-    }
-}
-
-
 extension KeychainManager {
     func setMLabDatabaseName(_ databaseName: String?, APIKey: String?) throws {
         let credentials: InternetCredentials?
diff --git a/Loop/Models/ServiceAuthentication/NightscoutService.swift b/Loop/Models/ServiceAuthentication/NightscoutService.swift
index 5b6e98186e..4607975038 100644
--- a/Loop/Models/ServiceAuthentication/NightscoutService.swift
+++ b/Loop/Models/ServiceAuthentication/NightscoutService.swift
@@ -40,9 +40,9 @@ class NightscoutService: ServiceAuthentication {
     // The uploader instance, if credentials are present
     private(set) var uploader: NightscoutUploader? {
         didSet {
-            let logger = DiagnosticLogger.shared?.forCategory("NightscoutService")
+            let logger = DiagnosticLogger.shared.forCategory("NightscoutService")
             uploader?.errorHandler = { (error: Error, context: String) -> Void in
-                logger?.error("Error \(error), while \(context)")
+                logger.error("Error \(error), while \(context)")
             }
         }
     }
diff --git a/Loop/Models/ShareGlucose+GlucoseKit.swift b/Loop/Models/ShareGlucose+GlucoseKit.swift
index 51e7508c2d..f898cbb0ce 100644
--- a/Loop/Models/ShareGlucose+GlucoseKit.swift
+++ b/Loop/Models/ShareGlucose+GlucoseKit.swift
@@ -9,7 +9,6 @@
 import Foundation
 import HealthKit
 import LoopKit
-import LoopUI
 import ShareClient
 
 
diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
index 1d74917dd8..793bf5b747 100644
--- a/Loop/View Controllers/BolusViewController.swift	
+++ b/Loop/View Controllers/BolusViewController.swift	
@@ -68,7 +68,7 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
     var bolusRecommendation: BolusRecommendation? = nil {
         didSet {
             let amount = bolusRecommendation?.amount ?? 0
-            recommendedBolusAmountLabel?.text = bolusUnitsFormatter.string(from: NSNumber(value: amount))
+            recommendedBolusAmountLabel?.text = bolusUnitsFormatter.string(from: amount)
             updateNotice()
             if let pendingInsulin = bolusRecommendation?.pendingInsulin {
                 self.pendingInsulin = pendingInsulin
diff --git a/Loop/View Controllers/CarbAbsorptionViewController.swift b/Loop/View Controllers/CarbAbsorptionViewController.swift
index d527d09c71..a58050c332 100644
--- a/Loop/View Controllers/CarbAbsorptionViewController.swift	
+++ b/Loop/View Controllers/CarbAbsorptionViewController.swift	
@@ -10,7 +10,6 @@ import HealthKit
 
 import LoopKit
 import LoopKitUI
-import LoopUI
 
 
 private extension RefreshContext {
diff --git a/Loop/View Controllers/CommandResponseViewController.swift b/Loop/View Controllers/CommandResponseViewController.swift
index 034d6f76a8..f6d9d3ac25 100644
--- a/Loop/View Controllers/CommandResponseViewController.swift	
+++ b/Loop/View Controllers/CommandResponseViewController.swift	
@@ -11,16 +11,18 @@ import LoopKitUI
 
 
 extension CommandResponseViewController {
-    static func generateDiagnosticReport(dataManager: DeviceDataManager) -> CommandResponseViewController {
+    typealias T = CommandResponseViewController
+
+    static func generateDiagnosticReport(deviceManager: DeviceDataManager) -> T {
         let date = Date()
-        let vc = CommandResponseViewController(command: { (completionHandler) in
-            dataManager.loopManager.generateDiagnosticReport { (report) in
+        let vc = T(command: { (completionHandler) in
+            deviceManager.loopManager.generateDiagnosticReport { (report) in
                 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),
+                        String(reflecting: deviceManager),
                         "",
                         report,
                         "",
diff --git a/Loop/View Controllers/PredictionTableViewController.swift b/Loop/View Controllers/PredictionTableViewController.swift
index 1dbaeaa846..b572b79f5c 100644
--- a/Loop/View Controllers/PredictionTableViewController.swift	
+++ b/Loop/View Controllers/PredictionTableViewController.swift	
@@ -9,7 +9,7 @@
 import UIKit
 import HealthKit
 import LoopKit
-import LoopUI
+import LoopKitUI
 
 
 private extension RefreshContext {
diff --git a/Loop/View Controllers/PumpIDTableViewController.swift b/Loop/View Controllers/PumpIDTableViewController.swift
deleted file mode 100644
index 908b5aecc3..0000000000
--- a/Loop/View Controllers/PumpIDTableViewController.swift	
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-//  PumpIDTableViewController.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 9/30/16.
-//  Copyright © 2016 LoopKit Authors. All rights reserved.
-//
-
-import UIKit
-import MinimedKit
-import LoopKitUI
-
-
-protocol PumpIDTableViewControllerDelegate: TextFieldTableViewControllerDelegate {
-    func pumpIDTableViewControllerDidChangePumpRegion(_ controller: PumpIDTableViewController)
-}
-
-
-extension PumpRegion {
-    static let count = 2
-}
-
-
-final class PumpIDTableViewController: TextFieldTableViewController {
-
-    /// The selected pump region
-    var region: PumpRegion? {
-        didSet {
-            if let oldValue = oldValue, oldValue != region {
-                tableView.cellForRow(at: IndexPath(row: oldValue.rawValue, section: Section.region.rawValue))?.accessoryType = .none
-            }
-
-            if let region = region, oldValue != region {
-                tableView.cellForRow(at: IndexPath(row: region.rawValue, section: Section.region.rawValue))?.accessoryType = .checkmark
-            }
-
-            if let delegate = delegate as? PumpIDTableViewControllerDelegate {
-                delegate.pumpIDTableViewControllerDidChangePumpRegion(self)
-            }
-        }
-    }
-
-    convenience init(pumpID: String?, region: PumpRegion?) {
-        self.init(style: .grouped)
-
-        self.region = region
-
-        placeholder = NSLocalizedString("Enter the 6-digit pump ID", comment: "The placeholder text instructing users how to enter a pump ID")
-        keyboardType = .numberPad
-        value = pumpID
-        contextHelp = NSLocalizedString("The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N).", comment: "Instructions on where to find the pump ID on a Minimed pump")
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        tableView.rowHeight = UITableViewAutomaticDimension
-    }
-
-    // MARK: - Table view data source
-
-    private enum Section: Int {
-        case id
-        case region
-
-        static let count = 2
-    }
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return Section.count
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        switch Section(rawValue: section)! {
-        case .id:
-            return super.tableView(tableView, numberOfRowsInSection: section)
-        case .region:
-            return PumpRegion.count
-        }
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        switch Section(rawValue: indexPath.section)! {
-        case .id:
-            return super.tableView(tableView, cellForRowAt: indexPath)
-        case .region:
-            let cell = tableView.dequeueReusableCell(withIdentifier: "Cell") ?? UITableViewCell(style: .default, reuseIdentifier: "Cell")
-
-            let region = PumpRegion(rawValue: indexPath.row)!
-
-            cell.textLabel?.text = String(describing: region)
-            cell.accessoryType = self.region == region ? .checkmark : .none
-            
-            return cell
-        }
-    }
-
-    override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
-        switch Section(rawValue: section)! {
-        case .id:
-            return super.tableView(tableView, titleForFooterInSection: section)
-        case .region:
-            return NSLocalizedString("The pump region can be found printed on the back as part of the model number (REF), for example: MMT-551NAB, or MMT-515LWWS. If the model number contains \"NA\" or \"CA\", then the region is North America. If if contains \"WW\", then the region is World-Wide.", comment: "Instructions on selecting the pump region")
-        }
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        switch Section(rawValue: indexPath.section)! {
-        case .id:
-            break
-        case .region:
-            region = PumpRegion(rawValue: indexPath.row)
-            tableView.deselectRow(at: indexPath, animated: true)
-        }
-    }
-}
diff --git a/Loop/View Controllers/RadioSelectionTableViewController.swift b/Loop/View Controllers/RadioSelectionTableViewController.swift
deleted file mode 100644
index 1b119e30cb..0000000000
--- a/Loop/View Controllers/RadioSelectionTableViewController.swift	
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//  RadioSelectionTableViewController.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 8/26/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import UIKit
-import MinimedKit
-
-protocol RadioSelectionTableViewControllerDelegate: class {
-    func radioSelectionTableViewControllerDidChangeSelectedIndex(_ controller: RadioSelectionTableViewController)
-}
-
-
-class RadioSelectionTableViewController: UITableViewController, IdentifiableClass {
-
-    var options = [String]()
-
-    var selectedIndex: Int? {
-        didSet {
-            if let oldValue = oldValue, oldValue != selectedIndex {
-                tableView.cellForRow(at: IndexPath(row: oldValue, section: 0))?.accessoryType = .none
-            }
-
-            if let selectedIndex = selectedIndex, oldValue != selectedIndex {
-                tableView.cellForRow(at: IndexPath(row: selectedIndex, section: 0))?.accessoryType = .checkmark
-
-                delegate?.radioSelectionTableViewControllerDidChangeSelectedIndex(self)
-            }
-        }
-    }
-
-    var contextHelp: String?
-
-    weak var delegate: RadioSelectionTableViewControllerDelegate?
-
-    convenience init() {
-        self.init(style: .grouped)
-    }
-
-    // MARK: - Table view data source
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return options.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: "Cell") ?? UITableViewCell(style: .default, reuseIdentifier: "Cell")
-
-        cell.textLabel?.text = options[indexPath.row]
-        cell.accessoryType = selectedIndex == indexPath.row ? .checkmark : .none
-
-        return cell
-    }
-
-    override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
-        return contextHelp
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        selectedIndex = indexPath.row
-
-        tableView.deselectRow(at: indexPath, animated: true)
-    }
-}
-
-
-extension RadioSelectionTableViewController {
-    typealias T = RadioSelectionTableViewController
-
-    static func insulinDataSource(_ value: InsulinDataSource) -> T {
-        let vc = T()
-
-        vc.selectedIndex = value.rawValue
-        vc.options = (0..<2).compactMap({ InsulinDataSource(rawValue: $0) }).map { String(describing: $0) }
-        vc.contextHelp = NSLocalizedString("Insulin delivery can be determined from the pump by either interpreting the event history or comparing the reservoir volume over time. Reading event history allows for a more accurate status graph and uploading up-to-date treatment data to Nightscout, at the cost of faster pump battery drain and the possibility of a higher radio error rate compared to reading only reservoir volume. If the selected source cannot be used for any reason, the system will attempt to fall back to the other option.", comment: "Instructions on selecting an insulin data source")
-
-        return vc
-    }
-
-    static func batteryChemistryType(_ value: BatteryChemistryType) -> T {
-        let vc = T()
-
-        vc.selectedIndex = value.rawValue
-        vc.options = (0..<2).compactMap({ BatteryChemistryType(rawValue: $0) }).map { String(describing: $0) }
-        vc.contextHelp = NSLocalizedString("Alkaline and Lithium batteries decay at differing rates. Alkaline tend to have a linear voltage drop over time whereas lithium cell batteries tend to maintain voltage until halfway through their lifespan. Under normal usage in a Non-MySentry compatible Minimed (x22/x15) insulin pump running Loop, Alkaline batteries last approximately 4 to 5 days. Lithium batteries last between 1-2 weeks. This selection will use different battery voltage decay rates for each of the battery chemistry types and alert the user when a battery is approximately 8 to 10 hours from failure.", comment: "Instructions on selecting battery chemistry type")
-
-        return vc
-    }
-
-}
diff --git a/Loop/View Controllers/SettingsTableViewController.swift b/Loop/View Controllers/SettingsTableViewController.swift
index 56fae98c30..7fa84e56fb 100644
--- a/Loop/View Controllers/SettingsTableViewController.swift	
+++ b/Loop/View Controllers/SettingsTableViewController.swift	
@@ -10,20 +10,11 @@ import UIKit
 import HealthKit
 import LoopKit
 import LoopKitUI
-import MinimedKit
-import RileyLinkBLEKit
-import RileyLinkKit
-import RileyLinkKitUI
 
-private let ConfigCellIdentifier = "ConfigTableViewCell"
 
-private let EnabledString = NSLocalizedString("Enabled", comment: "The detail text describing an enabled setting")
-private let TapToSetString = NSLocalizedString("Tap to set", comment: "The empty-state text for a configuration value")
+final class SettingsTableViewController: UITableViewController {
 
-
-final class SettingsTableViewController: UITableViewController, DailyValueScheduleTableViewControllerDelegate {
-
-    @IBOutlet var devicesSectionTitleView: UIView!
+    @IBOutlet var devicesSectionTitleView: UIView?
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -31,26 +22,23 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 44
 
-        tableView.register(RileyLinkDeviceTableViewCell.self, forCellReuseIdentifier: RileyLinkDeviceTableViewCell.className)
-
-        // Register for manager notifications
-        NotificationCenter.default.addObserver(self, selector: #selector(reloadDevices), name: .ManagerDevicesDidChange, object: dataManager.rileyLinkManager)
+        tableView.register(SettingsTableViewCell.self, forCellReuseIdentifier: SettingsTableViewCell.className)
+        tableView.register(SettingsImageTableViewCell.self, forCellReuseIdentifier: SettingsImageTableViewCell.className)
+        tableView.register(TextButtonTableViewCell.self, forCellReuseIdentifier: TextButtonTableViewCell.className)
+    }
 
-        // Register for device notifications
-        for name in [.DeviceConnectionStateDidChange, .DeviceRSSIDidChange, .DeviceNameDidChange] as [Notification.Name] {
-            NotificationCenter.default.addObserver(self, selector: #selector(deviceDidUpdate(_:)), name: name, object: nil)
+    override func viewWillAppear(_ animated: Bool) {
+        // Manually invoke the delegate for rows deselecting on appear
+        for indexPath in tableView.indexPathsForSelectedRows ?? [] {
+            _ = tableView(tableView, willDeselectRowAt: indexPath)
         }
 
-        reloadDevices()
+        super.viewWillAppear(animated)
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        dataManager.rileyLinkManager.setScanningEnabled(true)
-        rssiFetchTimer = Timer.scheduledTimer(timeInterval: 3, target: self, selector: #selector(updateRSSI), userInfo: nil, repeats: true)
-        updateRSSI()
-
         if case .some = dataManager.cgm, dataManager.loopManager.glucoseStore.authorizationRequired {
             dataManager.loopManager.glucoseStore.authorize { (result) -> Void in
                 // Do nothing for now
@@ -60,18 +48,10 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         AnalyticsManager.shared.didDisplaySettingsScreen()
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-
-        dataManager.rileyLinkManager.setScanningEnabled(false)
-        rssiFetchTimer = nil
-    }
-
     var dataManager: DeviceDataManager!
 
     fileprivate enum Section: Int, CaseCountable {
         case loop = 0
-        case devices
         case pump
         case cgm
         case configuration
@@ -80,13 +60,11 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
     fileprivate enum LoopRow: Int, CaseCountable {
         case dosing = 0
-        case preferredInsulinDataSource
         case diagnostic
     }
 
     fileprivate enum PumpRow: Int, CaseCountable {
-        case pumpID = 0
-        case batteryChemistry
+        case pumpSettings = 0
     }
 
     fileprivate enum CGMRow: Int, CaseCountable {
@@ -100,12 +78,11 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
     fileprivate enum ConfigurationRow: Int, CaseCountable {
         case glucoseTargetRange = 0
         case suspendThreshold
-        case insulinModel
         case basalRate
+        case deliveryLimits
+        case insulinModel
         case carbRatio
         case insulinSensitivity
-        case maxBasal
-        case maxBolus
     }
 
     fileprivate enum ServiceRow: Int, CaseCountable {
@@ -163,8 +140,6 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             }
         case .configuration:
             return ConfigurationRow.count
-        case .devices:
-            return devices.count
         case .services:
             return ServiceRow.count
         }
@@ -183,51 +158,52 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 switchCell.switch?.addTarget(self, action: #selector(dosingEnabledChanged(_:)), for: .valueChanged)
 
                 return switchCell
-            case .preferredInsulinDataSource:
-                let cell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
-
-                cell.textLabel?.text = NSLocalizedString("Preferred Data Source", comment: "The title text for the preferred insulin data source config")
-                cell.detailTextLabel?.text = String(describing: dataManager.preferredInsulinDataSource)
-
-                return cell
             case .diagnostic:
-                let cell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
+                let cell = tableView.dequeueReusableCell(withIdentifier: SettingsTableViewCell.className, for: indexPath)
 
                 cell.textLabel?.text = NSLocalizedString("Issue Report", comment: "The title text for the issue report cell")
                 cell.detailTextLabel?.text = nil
+                cell.accessoryType = .disclosureIndicator
 
                 return cell
             }
         case .pump:
-            let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
             switch PumpRow(rawValue: indexPath.row)! {
-            case .pumpID:
-                configCell.textLabel?.text = NSLocalizedString("Pump ID", comment: "The title text for the pump ID config value")
-                configCell.detailTextLabel?.text = dataManager.pumpSettings?.pumpID ?? TapToSetString
-            case .batteryChemistry:
-                configCell.textLabel?.text = NSLocalizedString("Pump Battery Type", comment: "The title text for the battery type value")
-                configCell.detailTextLabel?.text = String(describing: dataManager.batteryChemistry)
+            case .pumpSettings:
+                if let pumpManager = dataManager.pumpManager {
+                    let cell = tableView.dequeueReusableCell(withIdentifier: SettingsImageTableViewCell.className, for: indexPath)
+                    cell.imageView?.image = pumpManager.smallImage
+                    cell.textLabel?.text = pumpManager.localizedTitle
+                    cell.detailTextLabel?.text = nil
+                    cell.accessoryType = .disclosureIndicator
+                    return cell
+                } else {
+                    let cell = tableView.dequeueReusableCell(withIdentifier: TextButtonTableViewCell.className, for: indexPath)
+                    cell.textLabel?.text = NSLocalizedString("Add Pump", comment: "Title text for button to set up a new pump")
+                    return cell
+                }
             }
-            return configCell
         case .cgm:
             let row = CGMRow(rawValue: indexPath.row)!
             switch row {
             case .dexcomShare:
-                let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
+                let configCell = tableView.dequeueReusableCell(withIdentifier: SettingsTableViewCell.className, for: indexPath)
                 let shareService = dataManager.remoteDataManager.shareService
 
                 configCell.textLabel?.text = shareService.title
-                configCell.detailTextLabel?.text = shareService.username ?? TapToSetString
+                configCell.detailTextLabel?.text = shareService.username ?? SettingsTableViewCell.TapToSetString
+                configCell.accessoryType = .disclosureIndicator
 
                 return configCell
             case .g5TransmitterID:
-                let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
+                let configCell = tableView.dequeueReusableCell(withIdentifier: SettingsTableViewCell.className, for: indexPath)
 
                 configCell.textLabel?.text = NSLocalizedString("Transmitter ID", comment: "The title text for the Dexcom G5/G6 transmitter ID config value")
 
                 if case .g5(let transmitterID)? = dataManager.cgm {
-                    configCell.detailTextLabel?.text = transmitterID ?? TapToSetString
+                    configCell.detailTextLabel?.text = transmitterID ?? SettingsTableViewCell.TapToSetString
                 }
+                configCell.accessoryType = .disclosureIndicator
 
                 return configCell
             default:
@@ -235,7 +211,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
                 switch row {
                 case .enlite:
-                    switchCell.switch?.isOn = dataManager.cgm == .enlite
+                    switchCell.switch?.isOn = dataManager.cgm == .usePump
                     switchCell.textLabel?.text = NSLocalizedString("Sof-Sensor / Enlite", comment: "The title text for the Medtronic sensor switch cell")
                     switchCell.switch?.addTarget(self, action: #selector(enliteChanged(_:)), for: .valueChanged)
                 case .g4:
@@ -258,17 +234,9 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 return switchCell
             }
         case .configuration:
-            let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
+            let configCell = tableView.dequeueReusableCell(withIdentifier: SettingsTableViewCell.className, for: indexPath)
 
             switch ConfigurationRow(rawValue: indexPath.row)! {
-            case .basalRate:
-                configCell.textLabel?.text = NSLocalizedString("Basal Rates", comment: "The title text for the basal rate schedule")
-
-                if let basalRateSchedule = dataManager.loopManager.basalRateSchedule {
-                    configCell.detailTextLabel?.text = "\(basalRateSchedule.total()) U"
-                } else {
-                    configCell.detailTextLabel?.text = TapToSetString
-                }
             case .carbRatio:
                 configCell.textLabel?.text = NSLocalizedString("Carb Ratios", comment: "The title text for the carb ratio schedule")
 
@@ -278,7 +246,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
                     configCell.detailTextLabel?.text = String(format: NSLocalizedString("%1$@ %2$@/U", comment: "Format string for carb ratio average. (1: value)(2: carb unit)"), value, unit)
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
             case .insulinSensitivity:
                 configCell.textLabel?.text = NSLocalizedString("Insulin Sensitivities", comment: "The title text for the insulin sensitivity schedule")
@@ -290,7 +258,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                     configCell.detailTextLabel?.text = String(format: NSLocalizedString("%1$@ %2$@/U", comment: "Format string for insulin sensitivity average (1: value)(2: glucose unit)"), value, unit.localizedShortUnitString
                     )
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
             case .glucoseTargetRange:
                 configCell.textLabel?.text = NSLocalizedString("Correction Range", comment: "The title text for the glucose target range schedule")
@@ -303,16 +271,16 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
                     configCell.detailTextLabel?.text = String(format: NSLocalizedString("%1$@ – %2$@ %3$@", comment: "Format string for glucose target range. (1: Min target)(2: Max target)(3: glucose unit)"), minTarget, maxTarget, unit.localizedShortUnitString)
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
             case .suspendThreshold:
                 configCell.textLabel?.text = NSLocalizedString("Suspend Threshold", comment: "The title text in settings")
                 
                 if let suspendThreshold = dataManager.loopManager.settings.suspendThreshold {
-                    let value = valueNumberFormatter.string(from: suspendThreshold.value, unit: suspendThreshold.unit) ?? TapToSetString
+                    let value = valueNumberFormatter.string(from: suspendThreshold.value, unit: suspendThreshold.unit) ?? SettingsTableViewCell.TapToSetString
                     configCell.detailTextLabel?.text = value
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
             case .insulinModel:
                 configCell.textLabel?.text = NSLocalizedString("Insulin Model", comment: "The title text for the insulin model setting row")
@@ -320,60 +288,50 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 if let settings = dataManager.loopManager.insulinModelSettings {
                     configCell.detailTextLabel?.text = settings.title
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
-            case .maxBasal:
-                configCell.textLabel?.text = NSLocalizedString("Maximum Basal Rate", comment: "The title text for the maximum basal rate value")
+            case .deliveryLimits:
+                configCell.textLabel?.text = NSLocalizedString("Delivery Limits", comment: "Title text for delivery limits")
 
-                if let maxBasal = dataManager.loopManager.settings.maximumBasalRatePerHour {
-                    configCell.detailTextLabel?.text = "\(valueNumberFormatter.string(from: NSNumber(value: maxBasal))!) U/hour"
+                if dataManager.loopManager.settings.maximumBolus == nil || dataManager.loopManager.settings.maximumBasalRatePerHour == nil {
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.EnabledString
                 }
-            case .maxBolus:
-                configCell.textLabel?.text = NSLocalizedString("Maximum Bolus", comment: "The title text for the maximum bolus value")
+            case .basalRate:
+                configCell.textLabel?.text = NSLocalizedString("Basal Rates", comment: "The title text for the basal rate schedule")
 
-                if let maxBolus = dataManager.loopManager.settings.maximumBolus {
-                    configCell.detailTextLabel?.text = "\(valueNumberFormatter.string(from: NSNumber(value: maxBolus))!) U"
+                if let basalRateSchedule = dataManager.loopManager.basalRateSchedule {
+                    configCell.detailTextLabel?.text = valueNumberFormatter.string(from: basalRateSchedule.total(), unit: "U")
                 } else {
-                    configCell.detailTextLabel?.text = TapToSetString
+                    configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
             }
 
+            configCell.accessoryType = .disclosureIndicator
             return configCell
-        case .devices:
-            let deviceCell = tableView.dequeueReusableCell(withIdentifier: RileyLinkDeviceTableViewCell.className) as! RileyLinkDeviceTableViewCell
-            let device = devices[indexPath.row]
-
-            deviceCell.configureCellWithName(device.name,
-                signal: valueNumberFormatter.decibleString(from: deviceRSSI[device.peripheralIdentifier]),
-                peripheralState: device.peripheralState
-            )
-
-            deviceCell.connectSwitch?.addTarget(self, action: #selector(deviceConnectionChanged(_:)), for: .valueChanged)
-
-            return deviceCell
         case .services:
-            let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
+            let configCell = tableView.dequeueReusableCell(withIdentifier: SettingsTableViewCell.className, for: indexPath)
 
             switch ServiceRow(rawValue: indexPath.row)! {
             case .nightscout:
                 let nightscoutService = dataManager.remoteDataManager.nightscoutService
 
                 configCell.textLabel?.text = nightscoutService.title
-                configCell.detailTextLabel?.text = nightscoutService.siteURL?.absoluteString ?? TapToSetString
+                configCell.detailTextLabel?.text = nightscoutService.siteURL?.absoluteString ?? SettingsTableViewCell.TapToSetString
             case .loggly:
                 let logglyService = dataManager.logger.logglyService
 
                 configCell.textLabel?.text = logglyService.title
-                configCell.detailTextLabel?.text = logglyService.isAuthorized ? EnabledString : TapToSetString
+                configCell.detailTextLabel?.text = logglyService.isAuthorized ? SettingsTableViewCell.EnabledString : SettingsTableViewCell.TapToSetString
             case .amplitude:
                 let amplitudeService = AnalyticsManager.shared.amplitudeService
 
                 configCell.textLabel?.text = amplitudeService.title
-                configCell.detailTextLabel?.text = amplitudeService.isAuthorized ? EnabledString : TapToSetString
+                configCell.detailTextLabel?.text = amplitudeService.isAuthorized ? SettingsTableViewCell.EnabledString : SettingsTableViewCell.TapToSetString
             }
 
+            configCell.accessoryType = .disclosureIndicator
             return configCell
         }
     }
@@ -388,8 +346,6 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             return NSLocalizedString("Continuous Glucose Monitor", comment: "The title of the continuous glucose monitor section in settings")
         case .configuration:
             return NSLocalizedString("Configuration", comment: "The title of the configuration section in settings")
-        case .devices:
-            return nil
         case .services:
             return NSLocalizedString("Services", comment: "The title of the services section in settings")
         }
@@ -413,42 +369,37 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         return 0
     }
 
+    override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
+        return true
+    }
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let sender = tableView.cellForRow(at: indexPath)
 
         switch Section(rawValue: indexPath.section)! {
         case .pump:
-            let row = PumpRow(rawValue: indexPath.row)!
-            switch row {
-            case .pumpID:
-                let vc: LoopKitUI.TextFieldTableViewController
-                switch row {
-                case .pumpID:
-                    vc = PumpIDTableViewController(pumpID: dataManager.pumpSettings?.pumpID, region: dataManager.pumpSettings?.pumpRegion)
-                default:
-                    fatalError()
+            switch PumpRow(rawValue: indexPath.row)! {
+            case .pumpSettings:
+                if let settings = dataManager.pumpManager?.settingsViewController() {
+                    show(settings, sender: sender)
+                } else {
+                    // Add new pump
+                    if let pumpManagerType = allPumpManagers.first?.value as? PumpManagerUI.Type {
+                        var setupViewController = pumpManagerType.setupViewController()
+                        setupViewController.setupDelegate = self
+                        present(setupViewController, animated: true, completion: nil)
+                    }
                 }
-                vc.title = sender?.textLabel?.text
-                vc.indexPath = indexPath
-                vc.delegate = self
-
-                show(vc, sender: indexPath)
-            case .batteryChemistry:
-                let vc = RadioSelectionTableViewController.batteryChemistryType(dataManager.batteryChemistry)
-                vc.title = sender?.textLabel?.text
-                vc.delegate = self
-
-                show(vc, sender: sender)
             }
         case .cgm:
             switch CGMRow(rawValue: indexPath.row)! {
             case .dexcomShare:
                 let service = dataManager.remoteDataManager.shareService
                 let vc = AuthenticationViewController(authentication: service)
-                vc.authenticationObserver = { [unowned self] (service) in
-                    self.dataManager.remoteDataManager.shareService = service
+                vc.authenticationObserver = { [weak self] (service) in
+                    self?.dataManager.remoteDataManager.shareService = service
 
-                    self.tableView.reloadRows(at: [indexPath], with: .none)
+                    self?.tableView.reloadRows(at: [indexPath], with: .none)
                 }
 
                 show(vc, sender: sender)
@@ -472,34 +423,6 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         case .configuration:
             let row = ConfigurationRow(rawValue: indexPath.row)!
             switch row {
-            case .maxBasal, .maxBolus:
-                let vc: LoopKitUI.TextFieldTableViewController
-
-                switch row {
-                case .maxBasal:
-                    vc = .maxBasal(dataManager.loopManager.settings.maximumBasalRatePerHour)
-                case .maxBolus:
-                    vc = .maxBolus(dataManager.loopManager.settings.maximumBolus)
-                default:
-                    fatalError()
-                }
-
-                vc.title = sender?.textLabel?.text
-                vc.indexPath = indexPath
-                vc.delegate = self
-
-                show(vc, sender: indexPath)
-            case .basalRate:
-                let scheduleVC = SingleValueScheduleTableViewController()
-
-                if let profile = dataManager.loopManager.basalRateSchedule {
-                    scheduleVC.timeZone = profile.timeZone
-                    scheduleVC.scheduleItems = profile.items
-                }
-                scheduleVC.delegate = self
-                scheduleVC.title = NSLocalizedString("Basal Rates", comment: "The title of the basal rate profile screen")
-
-                show(scheduleVC, sender: sender)
             case .carbRatio:
                 let scheduleVC = DailyQuantityScheduleTableViewController()
 
@@ -511,7 +434,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                     scheduleVC.timeZone = schedule.timeZone
                     scheduleVC.scheduleItems = schedule.items
                     scheduleVC.unit = schedule.unit
-                } else if let timeZone = dataManager.pumpState?.timeZone {
+                } else if let timeZone = dataManager.pumpManager?.pumpTimeZone {
                     scheduleVC.timeZone = timeZone
                 }
 
@@ -529,7 +452,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
                     show(scheduleVC, sender: sender)
                 } else {
-                    if let timeZone = dataManager.pumpState?.timeZone {
+                    if let timeZone = dataManager.pumpManager?.pumpTimeZone {
                         scheduleVC.timeZone = timeZone
                     }
 
@@ -552,7 +475,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
                     show(scheduleVC, sender: sender)
                 } else {
-                    if let timeZone = dataManager.pumpState?.timeZone {
+                    if let timeZone = dataManager.pumpManager?.pumpTimeZone {
                         scheduleVC.timeZone = timeZone
                     }
 
@@ -577,33 +500,37 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                 }
             case .insulinModel:
                 performSegue(withIdentifier: InsulinModelSettingsViewController.className, sender: sender)
-            }
-        case .devices:
-            let device = devices[indexPath.row]
-
-            dataManager.getStateForDevice(device) { (deviceState, pumpState, pumpSettings, pumpOps) in
-                DispatchQueue.main.async {
-                    let vc = RileyLinkDeviceTableViewController(
-                        device: device,
-                        deviceState: deviceState,
-                        pumpSettings: pumpSettings,
-                        pumpState: pumpState,
-                        pumpOps: pumpOps
-                    )
+            case .deliveryLimits:
+                let vc = DeliveryLimitSettingsTableViewController(style: .grouped)
+
+                vc.maximumBasalRatePerHour = dataManager.loopManager.settings.maximumBasalRatePerHour
+                vc.maximumBolus = dataManager.loopManager.settings.maximumBolus
 
-                    self.show(vc, sender: sender)
-                }
-            }
-        case .loop:
-            switch LoopRow(rawValue: indexPath.row)! {
-            case .preferredInsulinDataSource:
-                let vc = RadioSelectionTableViewController.insulinDataSource(dataManager.preferredInsulinDataSource)
                 vc.title = sender?.textLabel?.text
                 vc.delegate = self
+                vc.syncSource = dataManager.pumpManager
+
+                show(vc, sender: sender)
+            case .basalRate:
+                let vc = SingleValueScheduleTableViewController(style: .grouped)
+
+                if let profile = dataManager.loopManager.basalRateSchedule {
+                    vc.scheduleItems = profile.items
+                    vc.timeZone = profile.timeZone
+                } else if let timeZone = dataManager.pumpManager?.pumpTimeZone {
+                    vc.timeZone = timeZone
+                }
+
+                vc.title = NSLocalizedString("Basal Rates", comment: "The title of the basal rate profile screen")
+                vc.delegate = self
+                vc.syncSource = dataManager.pumpManager
 
                 show(vc, sender: sender)
+            }
+        case .loop:
+            switch LoopRow(rawValue: indexPath.row)! {
             case .diagnostic:
-                let vc = CommandResponseViewController.generateDiagnosticReport(dataManager: dataManager)
+                let vc = CommandResponseViewController.generateDiagnosticReport(deviceManager: dataManager)
                 vc.title = sender?.textLabel?.text
 
                 show(vc, sender: sender)
@@ -615,10 +542,10 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .nightscout:
                 let service = dataManager.remoteDataManager.nightscoutService
                 let vc = AuthenticationViewController(authentication: service)
-                vc.authenticationObserver = { [unowned self] (service) in
-                    self.dataManager.remoteDataManager.nightscoutService = service
+                vc.authenticationObserver = { [weak self] (service) in
+                    self?.dataManager.remoteDataManager.nightscoutService = service
 
-                    self.tableView.reloadRows(at: [indexPath], with: .none)
+                    self?.tableView.reloadRows(at: [indexPath], with: .none)
                 }
 
                 show(vc, sender: sender)
@@ -646,94 +573,27 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         }
     }
 
-    override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        switch Section(rawValue: section)! {
-        case .devices:
-            return devicesSectionTitleView
-        case .loop, .pump, .cgm, .configuration, .services:
-            return nil
+    override func tableView(_ tableView: UITableView, willDeselectRowAt indexPath: IndexPath) -> IndexPath? {
+        switch Section(rawValue: indexPath.section)! {
+        case .loop:
+            break
+        case .pump:
+            tableView.reloadRows(at: [indexPath], with: .fade)
+        case .cgm:
+            break
+        case .configuration:
+            break
+        case .services:
+            break
         }
-    }
 
-    // MARK: - Device mangement
+        return indexPath
+    }
 
     @objc private func dosingEnabledChanged(_ sender: UISwitch) {
         dataManager.loopManager.settings.dosingEnabled = sender.isOn
     }
 
-    @objc private func reloadDevices() {
-        self.dataManager.rileyLinkManager.getDevices { (devices) in
-            DispatchQueue.main.async {
-                self.devices = devices
-            }
-        }
-    }
-
-    @objc private func deviceDidUpdate(_ note: Notification) {
-        DispatchQueue.main.async {
-            if let device = note.object as? RileyLinkDevice, let index = self.devices.index(where: { $0 === device }) {
-                if let rssi = note.userInfo?[RileyLinkDevice.notificationRSSIKey] as? Int {
-                    self.deviceRSSI[device.peripheralIdentifier] = rssi
-                }
-
-                if let cell = self.tableView.cellForRow(at: IndexPath(row: index, section: Section.devices.rawValue)) as? RileyLinkDeviceTableViewCell {
-                    cell.configureCellWithName(device.name,
-                        signal: self.valueNumberFormatter.decibleString(from: self.deviceRSSI[device.peripheralIdentifier]),
-                        peripheralState: device.peripheralState
-                    )
-                }
-            }
-        }
-    }
-
-    private var devices: [RileyLinkDevice] = [] {
-        didSet {
-            // Assume only appends are possible when count changes for algorithmic simplicity
-            guard oldValue.count < devices.count else {
-                tableView.reloadSections(IndexSet(integer: Section.devices.rawValue), with: .fade)
-                return
-            }
-
-            tableView.beginUpdates()
-
-            let insertedPaths = (oldValue.count..<devices.count).map { (index) -> IndexPath in
-                return IndexPath(row: index, section: Section.devices.rawValue)
-            }
-            tableView.insertRows(at: insertedPaths, with: .automatic)
-
-            tableView.endUpdates()
-        }
-    }
-
-    private var deviceRSSI: [UUID: Int] = [:]
-
-    var rssiFetchTimer: Timer? {
-        willSet {
-            rssiFetchTimer?.invalidate()
-        }
-    }
-
-    @objc func updateRSSI() {
-        for device in devices {
-            device.readRSSI()
-        }
-    }
-
-    @objc private func deviceConnectionChanged(_ connectSwitch: UISwitch) {
-        let switchOrigin = connectSwitch.convert(CGPoint.zero, to: tableView)
-
-        if let indexPath = tableView.indexPathForRow(at: switchOrigin), indexPath.section == Section.devices.rawValue
-        {
-            let device = devices[indexPath.row]
-
-            if connectSwitch.isOn {
-                dataManager.connectToRileyLink(device)
-            } else {
-                dataManager.disconnectFromRileyLink(device)
-            }
-        }
-    }
-
     // MARK: - CGM State
 
     // MARK: Model
@@ -749,9 +609,9 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             let shareRowExists = tableView.numberOfRows(inSection: Section.cgm.rawValue) > CGMRow.dexcomShare.rawValue
             dataManager.cgm = .g5(transmitterID: g5TransmitterID)
 
-            var indexPaths = [IndexPath(row: CGMRow.g5TransmitterID.rawValue, section:Section.cgm.rawValue)]
+            var indexPaths = [IndexPath(row: CGMRow.g5TransmitterID.rawValue, section: Section.cgm.rawValue)]
             if !shareRowExists {
-                indexPaths.insert(IndexPath(row: CGMRow.dexcomShare.rawValue, section:Section.cgm.rawValue), at: 0)
+                indexPaths.insert(IndexPath(row: CGMRow.dexcomShare.rawValue, section: Section.cgm.rawValue), at: 0)
             }
 
             tableView.insertRows(at: indexPaths, with: .top)
@@ -789,7 +649,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             setG4SwitchOff()
             removeDexcomShareRow()
             removeG5TransmitterIDRow()
-            dataManager.cgm = .enlite
+            dataManager.cgm = .usePump
         } else {
             dataManager.cgm = nil
         }
@@ -803,7 +663,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         case .g4?, .g5?:
             tableView.deleteRows(at: [IndexPath(row: CGMRow.dexcomShare.rawValue, section: Section.cgm.rawValue)], with: .top)
         default:
-            break;
+            break
         }
     }
 
@@ -828,43 +688,75 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         let switchCell = tableView.cellForRow(at: IndexPath(row: CGMRow.enlite.rawValue, section: Section.cgm.rawValue)) as! SwitchTableViewCell
         switchCell.switch?.setOn(false, animated: true)
     }
+}
+
 
-    // MARK: - DailyValueScheduleTableViewControllerDelegate
+extension SettingsTableViewController: PumpManagerSetupViewControllerDelegate {
+    func pumpManagerSetupViewController(_ pumpManagerSetupViewController: PumpManagerSetupViewController, didSetUpPumpManager pumpManager: PumpManagerUI) {
+        dataManager.pumpManager = pumpManager
+        tableView.selectRow(at: IndexPath(row: PumpRow.pumpSettings.rawValue, section: Section.pump.rawValue), animated: false, scrollPosition: .none)
 
+        if let basalRateSchedule = pumpManagerSetupViewController.basalSchedule {
+            dataManager.loopManager.basalRateSchedule = basalRateSchedule
+            tableView.reloadRows(at: [[Section.configuration.rawValue, ConfigurationRow.basalRate.rawValue]], with: .none)
+        }
+
+        if let maxBasalRateUnitsPerHour = pumpManagerSetupViewController.maxBasalRateUnitsPerHour {
+            dataManager.loopManager.settings.maximumBasalRatePerHour = maxBasalRateUnitsPerHour
+            tableView.reloadRows(at: [[Section.configuration.rawValue, ConfigurationRow.deliveryLimits.rawValue]], with: .none)
+        }
+
+        if let maxBolusUnits = pumpManagerSetupViewController.maxBolusUnits {
+            dataManager.loopManager.settings.maximumBolus = maxBolusUnits
+            tableView.reloadRows(at: [[Section.configuration.rawValue, ConfigurationRow.deliveryLimits.rawValue]], with: .none)
+        }
+
+        show(pumpManager.settingsViewController(), sender: nil)
+        dismiss(animated: true, completion: nil)
+    }
+
+    func pumpManagerSetupViewControllerDidCancel(_ pumpManagerSetupViewController: PumpManagerSetupViewController) {
+        dismiss(animated: true, completion: nil)
+    }
+}
+
+
+extension SettingsTableViewController: DailyValueScheduleTableViewControllerDelegate {
     func dailyValueScheduleTableViewControllerWillFinishUpdating(_ controller: DailyValueScheduleTableViewController) {
-        if let indexPath = tableView.indexPathForSelectedRow {
-            switch Section(rawValue: indexPath.section)! {
-            case .configuration:
-                switch ConfigurationRow(rawValue: indexPath.row)! {
-                case .basalRate:
-                    if let controller = controller as? SingleValueScheduleTableViewController {
-                        dataManager.loopManager.basalRateSchedule = BasalRateSchedule(dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
-                        AnalyticsManager.shared.didChangeBasalRateSchedule()
-                    }
-                case .glucoseTargetRange:
-                    if let controller = controller as? GlucoseRangeScheduleTableViewController {
-                        dataManager.loopManager.settings.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone, overrideRanges: controller.overrideRanges, override: dataManager.loopManager.settings.glucoseTargetRangeSchedule?.override)
-                    }
-                case let row:
-                    if let controller = controller as? DailyQuantityScheduleTableViewController {
-                        switch row {
-                        case .carbRatio:
-                            dataManager.loopManager.carbRatioSchedule = CarbRatioSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
-                            AnalyticsManager.shared.didChangeCarbRatioSchedule()
-                        case .insulinSensitivity:
-                            dataManager.loopManager.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
-                            AnalyticsManager.shared.didChangeInsulinSensitivitySchedule()
-                        default:
-                            break
-                        }
+        guard let indexPath = tableView.indexPathForSelectedRow else {
+            return
+        }
+
+        switch Section(rawValue: indexPath.section)! {
+        case .configuration:
+            switch ConfigurationRow(rawValue: indexPath.row)! {
+            case .glucoseTargetRange:
+                if let controller = controller as? GlucoseRangeScheduleTableViewController {
+                    dataManager.loopManager.settings.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone, overrideRanges: controller.overrideRanges, override: dataManager.loopManager.settings.glucoseTargetRangeSchedule?.override)
+                }
+            case .basalRate:
+                if let controller = controller as? SingleValueScheduleTableViewController {
+                    dataManager.loopManager.basalRateSchedule = BasalRateSchedule(dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                }
+            case let row:
+                if let controller = controller as? DailyQuantityScheduleTableViewController {
+                    switch row {
+                    case .carbRatio:
+                        dataManager.loopManager.carbRatioSchedule = CarbRatioSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                        AnalyticsManager.shared.didChangeCarbRatioSchedule()
+                    case .insulinSensitivity:
+                        dataManager.loopManager.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                        AnalyticsManager.shared.didChangeInsulinSensitivitySchedule()
+                    default:
+                        break
                     }
                 }
-
-                tableView.reloadRows(at: [indexPath], with: .none)
-            default:
-                break
             }
+        default:
+            break
         }
+
+        tableView.reloadRows(at: [indexPath], with: .none)
     }
 }
 
@@ -894,57 +786,10 @@ extension SettingsTableViewController: InsulinModelSettingsViewControllerDelegat
 }
 
 
-extension SettingsTableViewController: RadioSelectionTableViewControllerDelegate {
-    func radioSelectionTableViewControllerDidChangeSelectedIndex(_ controller: RadioSelectionTableViewController) {
-        if let indexPath = self.tableView.indexPathForSelectedRow {
-            switch Section(rawValue: indexPath.section)! {
-            case .loop:
-                switch LoopRow(rawValue: indexPath.row)! {
-                case .preferredInsulinDataSource:
-                    if let selectedIndex = controller.selectedIndex, let dataSource = InsulinDataSource(rawValue: selectedIndex) {
-                        dataManager.preferredInsulinDataSource = dataSource
-
-                        tableView.reloadRows(at: [IndexPath(row: LoopRow.preferredInsulinDataSource.rawValue, section: Section.loop.rawValue)], with: .none)
-                    }
-                default:
-                    assertionFailure()
-                }
-
-            case .pump:
-                switch PumpRow(rawValue: indexPath.row)! {
-                case .batteryChemistry:
-                    if let selectedIndex = controller.selectedIndex, let dataSource = BatteryChemistryType(rawValue: selectedIndex) {
-                        dataManager.batteryChemistry = dataSource
-
-                        tableView.reloadRows(at: [IndexPath(row: PumpRow.batteryChemistry.rawValue, section: Section.configuration.rawValue)], with: .none)
-                    }
-                default:
-                    assertionFailure()
-                }
-            default:
-                assertionFailure()
-            }
-        }
-    }
-}
-
 extension SettingsTableViewController: LoopKitUI.TextFieldTableViewControllerDelegate {
     func textFieldTableViewControllerDidEndEditing(_ controller: LoopKitUI.TextFieldTableViewController) {
         if let indexPath = controller.indexPath {
             switch Section(rawValue: indexPath.section)! {
-            case .pump:
-                switch PumpRow(rawValue: indexPath.row)! {
-                case .pumpID:
-                    dataManager.setPumpID(controller.value)
-
-                    if  let controller = controller as? PumpIDTableViewController,
-                        let region = controller.region
-                    {
-                        dataManager.setPumpRegion(region)
-                    }
-                default:
-                    assertionFailure()
-                }
             case .cgm:
                 switch CGMRow(rawValue: indexPath.row)! {
                 case .g5TransmitterID:
@@ -967,18 +812,6 @@ extension SettingsTableViewController: LoopKitUI.TextFieldTableViewControllerDel
                     } else {
                         dataManager.loopManager.settings.suspendThreshold = nil
                     }
-                case .maxBasal:
-                    if let value = controller.value, let rate = valueNumberFormatter.number(from: value)?.doubleValue {
-                        dataManager.loopManager.settings.maximumBasalRatePerHour = rate
-                    } else {
-                        dataManager.loopManager.settings.maximumBasalRatePerHour = nil
-                    }
-                case .maxBolus:
-                    if let value = controller.value, let units = valueNumberFormatter.number(from: value)?.doubleValue {
-                        dataManager.loopManager.settings.maximumBolus = units
-                    } else {
-                        dataManager.loopManager.settings.maximumBolus = nil
-                    }
                 default:
                     assertionFailure()
                 }
@@ -996,10 +829,16 @@ extension SettingsTableViewController: LoopKitUI.TextFieldTableViewControllerDel
 }
 
 
-extension SettingsTableViewController: PumpIDTableViewControllerDelegate {
-    func pumpIDTableViewControllerDidChangePumpRegion(_ controller: PumpIDTableViewController) {
-        if let region = controller.region {
-            dataManager.setPumpRegion(region)
-        }
+extension SettingsTableViewController: DeliveryLimitSettingsTableViewControllerDelegate {
+    func deliveryLimitSettingsTableViewControllerDidUpdateMaximumBasalRatePerHour(_ vc: DeliveryLimitSettingsTableViewController) {
+        dataManager.loopManager.settings.maximumBasalRatePerHour = vc.maximumBasalRatePerHour
+
+        tableView.reloadRows(at: [[Section.configuration.rawValue, ConfigurationRow.deliveryLimits.rawValue]], with: .none)
+    }
+
+    func deliveryLimitSettingsTableViewControllerDidUpdateMaximumBolus(_ vc: DeliveryLimitSettingsTableViewController) {
+        dataManager.loopManager.settings.maximumBolus = vc.maximumBolus
+
+        tableView.reloadRows(at: [[Section.configuration.rawValue, ConfigurationRow.deliveryLimits.rawValue]], with: .none)
     }
 }
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index ef8dc45990..c4a53d9a89 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -420,15 +420,15 @@ final class StatusTableViewController: ChartsTableViewController {
 
                 // Reservoir HUD
                 if let reservoir = lastReservoirValue {
-                    if let capacity = self.deviceManager.pumpState?.pumpModel?.reservoirCapacity {
-                        hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(capacity))))
+                    if let capacity = self.deviceManager.pumpManager?.pumpReservoirCapacity {
+                        hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, reservoir.unitVolume / capacity))
                     }
 
                     hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate)
                 }
 
                 // Battery HUD
-                hudView.batteryHUD.batteryLevel = self.deviceManager.pumpBatteryChargeRemaining
+                hudView.batteryHUD.batteryLevel = self.deviceManager.pumpManager?.pumpBatteryChargeRemaining ?? UserDefaults.appGroup.statusExtensionContext?.batteryPercentage
             }
 
             // Show/hide the table view rows
diff --git a/Loop/View Controllers/TextFieldTableViewController.swift b/Loop/View Controllers/TextFieldTableViewController.swift
index fe7b8378dc..28e2f3d796 100644
--- a/Loop/View Controllers/TextFieldTableViewController.swift	
+++ b/Loop/View Controllers/TextFieldTableViewController.swift	
@@ -24,53 +24,13 @@ extension TextFieldTableViewController {
         return formatter
     }()
 
-    static func pumpID(_ value: String?) -> T {
-        let vc = T()
-
-        vc.placeholder = NSLocalizedString("Enter the 6-digit pump ID", comment: "The placeholder text instructing users how to enter a pump ID")
-        vc.keyboardType = .numberPad
-        vc.value = value
-        vc.contextHelp = NSLocalizedString("The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N).", comment: "Instructions on where to find the pump ID on a Minimed pump")
-
-        return vc
-    }
-
     static func transmitterID(_ value: String?) -> T {
         let vc = T()
 
-        vc.placeholder = NSLocalizedString("Enter the 6-digit transmitter ID", comment: "The placeholder text instructing users how to enter a pump ID")
+        vc.placeholder = NSLocalizedString("Enter the 6-digit transmitter ID", comment: "The placeholder text instructing users how to enter a transmitter ID")
         vc.value = value
         vc.contextHelp = NSLocalizedString("The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app.", comment: "Instructions on where to find the transmitter ID")
 
         return vc
     }
-
-    static func maxBasal(_ value: Double?) -> T {
-        let vc = T()
-
-        vc.placeholder = NSLocalizedString("Enter a rate in units per hour", comment: "The placeholder text instructing users how to enter a maximum basal rate")
-        vc.keyboardType = .decimalPad
-        vc.unit = NSLocalizedString("U/hour", comment: "The unit string for units per hour")
-        vc.contextHelp = NSLocalizedString("Please check that the maximum basal rate entered here does not exceed the corresponding maximum basal rate setting in the pump.", comment: "Instructions to help get max basal rate setting correct.")
-
-        if let maxBasal = value {
-            vc.value = valueNumberFormatter.string(from: NSNumber(value: maxBasal))
-        }
-
-        return vc
-    }
-
-    static func maxBolus(_ value: Double?) -> T {
-        let vc = T()
-
-        vc.placeholder = NSLocalizedString("Enter a number of units", comment: "The placeholder text instructing users how to enter a maximum bolus")
-        vc.keyboardType = .decimalPad
-        vc.unit = NSLocalizedString("Units", comment: "The unit string for units")
-
-        if let maxBolus = value {
-            vc.value = valueNumberFormatter.string(from: NSNumber(value: maxBolus))
-        }
-
-        return vc
-    }    
 }
diff --git a/Loop/Views/SettingsImageTableViewCell.swift b/Loop/Views/SettingsImageTableViewCell.swift
new file mode 100644
index 0000000000..13e5965177
--- /dev/null
+++ b/Loop/Views/SettingsImageTableViewCell.swift
@@ -0,0 +1,53 @@
+//
+//  SettingsImageTableViewCell.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import UIKit
+
+
+class SettingsImageTableViewCell: UITableViewCell {
+    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+        super.init(style: .default, reuseIdentifier: reuseIdentifier)
+
+        setup()
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+
+        setup()
+    }
+
+    private func setup() {
+        guard let textLabel = textLabel, let imageView = imageView else {
+            return
+        }
+
+        textLabel.adjustsFontForContentSizeCategory = true
+        textLabel.font = UIFont.preferredFont(forTextStyle: .body)
+        textLabel.translatesAutoresizingMaskIntoConstraints = false
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+
+        let parent = contentView.layoutMarginsGuide
+        NSLayoutConstraint.activate([
+            imageView.leadingAnchor.constraint(equalTo: parent.leadingAnchor),
+            imageView.topAnchor.constraint(greaterThanOrEqualTo: parent.topAnchor),
+            parent.bottomAnchor.constraint(greaterThanOrEqualTo: imageView.bottomAnchor),
+            imageView.centerYAnchor.constraint(equalTo: parent.centerYAnchor),
+            textLabel.leadingAnchor.constraintEqualToSystemSpacingAfter(imageView.trailingAnchor, multiplier: 2),
+            textLabel.topAnchor.constraint(greaterThanOrEqualTo: parent.topAnchor),
+            parent.bottomAnchor.constraint(greaterThanOrEqualTo: textLabel.bottomAnchor),
+            parent.trailingAnchor.constraint(equalTo: textLabel.trailingAnchor),
+            textLabel.centerYAnchor.constraint(equalTo: parent.centerYAnchor)
+        ])
+    }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+
+        imageView?.image = nil
+    }
+}
diff --git a/Loop/Views/SwitchTableViewCell.swift b/Loop/Views/SwitchTableViewCell.swift
deleted file mode 100644
index 0cd4908a88..0000000000
--- a/Loop/Views/SwitchTableViewCell.swift
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  SwitchTableViewCell.swift
-//  Naterade
-//
-//  Created by Nathan Racklyeft on 3/13/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import UIKit
-
-
-final class SwitchTableViewCell: UITableViewCell {
-
-    @IBOutlet weak var titleLabel: UILabel?
-
-    @IBOutlet weak var subtitleLabel: UILabel?
-
-    var `switch`: UISwitch?
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        
-        `switch` = UISwitch(frame: .zero)
-        accessoryView = `switch`
-    }
-    
-    override func layoutSubviews() {
-        super.layoutSubviews()
-
-        contentView.layoutMargins.left = separatorInset.left
-        contentView.layoutMargins.right = separatorInset.left
-    }
-
-    override func prepareForReuse() {
-        super.prepareForReuse()
-
-        self.switch?.removeTarget(nil, action: nil, for: .valueChanged)
-    }
-
-}
diff --git a/Loop/Views/TextFieldTableViewCell.swift b/Loop/Views/TextFieldTableViewCell.swift
new file mode 100644
index 0000000000..4334e6f4ea
--- /dev/null
+++ b/Loop/Views/TextFieldTableViewCell.swift
@@ -0,0 +1,11 @@
+//
+//  TextFieldTableViewCell.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import LoopKitUI
+
+
+extension TextFieldTableViewCell: NibLoadable { }
diff --git a/Loop/es.lproj/Localizable.strings b/Loop/es.lproj/Localizable.strings
index 817888c970..7ac2f32ff5 100644
--- a/Loop/es.lproj/Localizable.strings
+++ b/Loop/es.lproj/Localizable.strings
@@ -159,9 +159,6 @@
 /* The placeholder text instructing users to enter a suspend treshold */
 "Enter suspend threshold" = "Ingrese nivel de suspensión";
 
-/* The placeholder text instructing users how to enter a pump ID */
-"Enter the 6-digit pump ID" = "Ingrese ID de 6 dígitios de la microinfusora";
-
 /* The placeholder text instructing users how to enter a pump ID */
 "Enter the 6-digit transmitter ID" = "Ingrese ID de 6 dígitios de transmisor";
 
@@ -382,12 +379,6 @@
 /* Body of the alert describing a maximum bolus validation error. (1: The localized max bolus value) */
 "The maximum bolus amount is %@ Units" = "Bolo máximo es %@ Unidades";
 
-/* Instructions on where to find the pump ID on a Minimed pump */
-"The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N)." = "El ID de microinfusora puede encontrarse en la parte trasera o cerca de la parte inferior de la pantalla STATUS/Esc. Es la parte estrictamente numérica del número de serie mostrado como SN o S/N";
-
-/* Instructions on selecting the pump region */
-"The pump region can be found printed on the back as part of the model number (REF), for example: MMT-551NAB, or MMT-515LWWS. If the model number contains \"NA\" or \"CA\", then the region is North America. If if contains \"WW\", then the region is World-Wide." = "La región de la microinfusora puede enconstrarse impresa en la parte trasera como parte del código de modelo ( REF ), por ejemplo MMT-551NAB o MMT-515LWWS. Si el código de modelo contiene \"NA\" o \"CA\", la región es Norte América. Si contiene \"WW\" la región es Mundial.";
-
 /* Instructions on where to find the transmitter ID */
 "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app." = "El ID de transmisor puede encontrarse impreso en la parte trasera del dispositivo, a un lado de la caja en la que estaba empacado y dentro del menú de ajustes del receptor y la app móvil";
 
diff --git a/Loop/it.lproj/Localizable.strings b/Loop/it.lproj/Localizable.strings
index c72c4a1cd8..6d1f6cea4b 100644
--- a/Loop/it.lproj/Localizable.strings
+++ b/Loop/it.lproj/Localizable.strings
@@ -147,9 +147,6 @@
 /* The placeholder text instructing users how to enter a maximum basal rate */
 "Enter a rate in units per hour" = "Inserire un tasso di unità per ora";
 
-/* The placeholder text instructing users how to enter a pump ID */
-"Enter the 6-digit pump ID" = "Inserire 6-numeri ID pompa";
-
 /* The placeholder text instructing users how to enter a pump ID */
 "Enter the 6-digit transmitter ID" = "Inserire 6-numeri ID trasmettitore";
 
@@ -324,9 +321,6 @@
 /* Body of the alert describing a maximum bolus validation error. (1: The localized max bolus value) */
 "The maximum bolus amount is %@ Units" = "La quantità massima di bolo è %@ Unità";
 
-/* Instructions on where to find the pump ID on a Minimed pump */
-"The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N)." = "L'ID della pompa si trova stampato sul retro, o vicino al fondo della schermata STATO/Esc. È la parte strettamente numerica del numero di serie (indicato come SN o S/N).";
-
 /* Instructions on where to find the transmitter ID */
 "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app." = "L'ID trasmettitore può essere trovato stampato sul retro del dispositivo, sul lato della scatola, e all'interno del menu impostazione del ricevitore all'interno dell'applicazione mobile.";
 
diff --git a/Loop/ru.lproj/Localizable.strings b/Loop/ru.lproj/Localizable.strings
index 69c52f9c02..89284a6633 100644
--- a/Loop/ru.lproj/Localizable.strings
+++ b/Loop/ru.lproj/Localizable.strings
@@ -172,9 +172,6 @@
 /* The placeholder text instructing users to enter a suspend treshold */
 "Enter suspend threshold" = "Введите рубеж приостановки";
 
-/* The placeholder text instructing users how to enter a pump ID */
-"Enter the 6-digit pump ID" = "Введите инд номер помпы (6 цифр)";
-
 /* The placeholder text instructing users how to enter a pump ID */
 "Enter the 6-digit transmitter ID" = "Введите инд. номер трансмиттера (6 цифр)";
 
@@ -395,9 +392,6 @@
 /* Body of the alert describing a maximum bolus validation error. (1: The localized max bolus value) */
 "The maximum bolus amount is %@ Units" = "максимальный болюс %@ ед";
 
-/* Instructions on where to find the pump ID on a Minimed pump */
-"The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N)." = "инд номер помпы находится на ее задней стенке или снизу экрана состояния STATUS/ESC. Это исключительно цифровая часть серийного номера (обозначаемого SN или S/N) ";
-
 /* Instructions on where to find the transmitter ID */
 "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app." = "Инд. номер трансмиттера находится на задней стенке устройства , сбоку упаковочной коробки, в настроечном меню ресивера и мобильного приложения";
 
diff --git a/LoopUI/Models/SensorDisplayable.swift b/LoopUI/Models/SensorDisplayable.swift
deleted file mode 100644
index 4173d04305..0000000000
--- a/LoopUI/Models/SensorDisplayable.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  SensorDisplayable.swift
-//  Loop
-//
-//  Created by Nate Racklyeft on 8/2/16.
-//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
-//
-
-import Foundation
-
-
-public protocol SensorDisplayable {
-    /// Returns whether the current state is valid
-    var isStateValid: Bool { get }
-
-    /// Describes the state of the sensor in the current localization
-    var stateDescription: String { get }
-
-    /// Enumerates the trend of the sensor values
-    var trendType: GlucoseTrend? { get }
-
-    /// Returns whether the data is from a locally-connected device
-    var isLocal: Bool { get }
-}
diff --git a/LoopUI/Views/GlucoseHUDView.swift b/LoopUI/Views/GlucoseHUDView.swift
index 6b287282cc..136c30f2ac 100644
--- a/LoopUI/Views/GlucoseHUDView.swift
+++ b/LoopUI/Views/GlucoseHUDView.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 import HealthKit
+import LoopKit
 
 
 public final class GlucoseHUDView: BaseHUDView {
diff --git a/WatchApp Extension/Extensions/CLKComplicationTemplate.swift b/WatchApp Extension/Extensions/CLKComplicationTemplate.swift
index 27bae13f01..7275837669 100644
--- a/WatchApp Extension/Extensions/CLKComplicationTemplate.swift	
+++ b/WatchApp Extension/Extensions/CLKComplicationTemplate.swift	
@@ -8,6 +8,7 @@
 
 import ClockKit
 import HealthKit
+import LoopKit
 import Foundation
 
 
diff --git a/WatchApp Extension/Extensions/WatchContext+WatchApp.swift b/WatchApp Extension/Extensions/WatchContext+WatchApp.swift
index aff2dc566e..9212c5068e 100644
--- a/WatchApp Extension/Extensions/WatchContext+WatchApp.swift	
+++ b/WatchApp Extension/Extensions/WatchContext+WatchApp.swift	
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import LoopKit
 
 extension WatchContext {
     var glucoseTrend: GlucoseTrend? {