diff --git a/Loop Status Extension/HKUnit.swift b/Common/Extensions/HKUnit.swift
similarity index 93%
rename from Loop Status Extension/HKUnit.swift
rename to Common/Extensions/HKUnit.swift
index ffa2e62951..a4b7df21f6 100644
--- a/Loop Status Extension/HKUnit.swift	
+++ b/Common/Extensions/HKUnit.swift
@@ -11,9 +11,9 @@ import HealthKit
 // Code in this extension is duplicated from:
 //   https://github.com/LoopKit/LoopKit/blob/master/LoopKit/HKUnit.swift
 // to avoid pulling in the LoopKit extension since it's not extension-API safe.
-public extension HKUnit {
+extension HKUnit {
     // A formatting helper for determining the preferred decimal style for a given unit
-    var preferredMinimumFractionDigits: Int {
+    var preferredFractionDigits: Int {
         if self.unitString == "mg/dL" {
             return 0
         } else {
diff --git a/Loop/Extensions/IdentifiableClass.swift b/Common/Extensions/IdentifiableClass.swift
similarity index 100%
rename from Loop/Extensions/IdentifiableClass.swift
rename to Common/Extensions/IdentifiableClass.swift
diff --git a/Loop/Extensions/NSBundle.swift b/Common/Extensions/NSBundle.swift
similarity index 69%
rename from Loop/Extensions/NSBundle.swift
rename to Common/Extensions/NSBundle.swift
index 3cb84759e2..e9202624d6 100644
--- a/Loop/Extensions/NSBundle.swift
+++ b/Common/Extensions/NSBundle.swift
@@ -22,7 +22,19 @@ extension Bundle {
         return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, shortVersionString)
     }
     
+    private var mainAppBundleIdentifier: String? {
+        return object(forInfoDictionaryKey: "MainAppBundleIdentifier") as? String
+    }
+
     var appGroupSuiteName: String {
         return object(forInfoDictionaryKey: "AppGroupIdentifier") as! String
     }
+
+    var mainAppUrl: URL? {
+        if let mainAppBundleIdentifier = mainAppBundleIdentifier {
+            return URL(string: "\(mainAppBundleIdentifier)://")
+        } else {
+            return nil
+        }
+    }
 }
diff --git a/Loop/Extensions/NSTimeInterval.swift b/Common/Extensions/NSTimeInterval.swift
similarity index 100%
rename from Loop/Extensions/NSTimeInterval.swift
rename to Common/Extensions/NSTimeInterval.swift
diff --git a/Loop/Extensions/NSUserDefaults+StatusExtension.swift b/Common/Extensions/NSUserDefaults+StatusExtension.swift
similarity index 86%
rename from Loop/Extensions/NSUserDefaults+StatusExtension.swift
rename to Common/Extensions/NSUserDefaults+StatusExtension.swift
index 76a01b454e..02c9a3b69d 100644
--- a/Loop/Extensions/NSUserDefaults+StatusExtension.swift
+++ b/Common/Extensions/NSUserDefaults+StatusExtension.swift
@@ -14,6 +14,10 @@ extension UserDefaults {
         case StatusExtensionContext = "com.loopkit.Loop.StatusExtensionContext"
     }
 
+    var statusExtensionContextObservableKey: String {
+        return Key.StatusExtensionContext.rawValue
+    }
+    
     var statusExtensionContext: StatusExtensionContext? {
         get {
             if let rawValue = dictionary(forKey: Key.StatusExtensionContext.rawValue) {
diff --git a/Loop/Extensions/NibLoadable.swift b/Common/Extensions/NibLoadable.swift
similarity index 100%
rename from Loop/Extensions/NibLoadable.swift
rename to Common/Extensions/NibLoadable.swift
diff --git a/WatchApp Extension/Models/BolusSuggestionUserInfo.swift b/Common/Models/BolusSuggestionUserInfo.swift
similarity index 100%
rename from WatchApp Extension/Models/BolusSuggestionUserInfo.swift
rename to Common/Models/BolusSuggestionUserInfo.swift
diff --git a/WatchApp Extension/Models/CarbEntryUserInfo.swift b/Common/Models/CarbEntryUserInfo.swift
similarity index 100%
rename from WatchApp Extension/Models/CarbEntryUserInfo.swift
rename to Common/Models/CarbEntryUserInfo.swift
diff --git a/Loop/Models/GlucoseTrend.swift b/Common/Models/GlucoseTrend.swift
similarity index 98%
rename from Loop/Models/GlucoseTrend.swift
rename to Common/Models/GlucoseTrend.swift
index a79e75afa7..99b2999708 100644
--- a/Loop/Models/GlucoseTrend.swift
+++ b/Common/Models/GlucoseTrend.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-enum GlucoseTrend: Int {
+public enum GlucoseTrend: Int {
     case upUpUp       = 1
     case upUp         = 2
     case up           = 3
diff --git a/WatchApp Extension/Models/SetBolusUserInfo.swift b/Common/Models/SetBolusUserInfo.swift
similarity index 100%
rename from WatchApp Extension/Models/SetBolusUserInfo.swift
rename to Common/Models/SetBolusUserInfo.swift
diff --git a/Loop Status Extension/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift
similarity index 99%
rename from Loop Status Extension/StatusExtensionContext.swift
rename to Common/Models/StatusExtensionContext.swift
index d733fae7f8..be37aa25d4 100644
--- a/Loop Status Extension/StatusExtensionContext.swift	
+++ b/Common/Models/StatusExtensionContext.swift
@@ -9,6 +9,7 @@
 
 import Foundation
 import HealthKit
+import LoopUI
 
 struct ReservoirContext {
     let startDate: Date
diff --git a/WatchApp Extension/Models/WatchContext.swift b/Common/Models/WatchContext.swift
similarity index 93%
rename from WatchApp Extension/Models/WatchContext.swift
rename to Common/Models/WatchContext.swift
index f5cbe7176e..e5e7af322f 100644
--- a/WatchApp Extension/Models/WatchContext.swift	
+++ b/Common/Models/WatchContext.swift
@@ -9,7 +9,6 @@
 import Foundation
 import HealthKit
 
-
 final class WatchContext: NSObject, RawRepresentable {
     typealias RawValue = [String: Any]
 
@@ -19,7 +18,7 @@ final class WatchContext: NSObject, RawRepresentable {
     var maxBolus: Double?
 
     var glucose: HKQuantity?
-    var glucoseTrend: GlucoseTrend?
+    var glucoseTrendRawValue: Int?
     var eventualGlucose: HKQuantity?
     var glucoseDate: Date?
 
@@ -64,9 +63,7 @@ final class WatchContext: NSObject, RawRepresentable {
             }
         }
 
-        if let rawTrend = rawValue["gt"] as? Int {
-            glucoseTrend = GlucoseTrend(rawValue: rawTrend)
-        }
+        glucoseTrendRawValue = rawValue["gt"] as? Int
         glucoseDate = rawValue["gd"] as? Date
 
         IOB = rawValue["iob"] as? Double
@@ -98,7 +95,7 @@ final class WatchContext: NSObject, RawRepresentable {
             raw["gv"] = glucose?.doubleValue(for: unit)
         }
 
-        raw["gt"] = glucoseTrend?.rawValue
+        raw["gt"] = glucoseTrendRawValue
         raw["gd"] = glucoseDate
         raw["iob"] = IOB
         raw["ld"] = loopLastRunDate
diff --git a/Loop Status Extension/Base.lproj/MainInterface.storyboard b/Loop Status Extension/Base.lproj/MainInterface.storyboard
index 71370e45c5..05b95fa8dd 100644
--- a/Loop Status Extension/Base.lproj/MainInterface.storyboard	
+++ b/Loop Status Extension/Base.lproj/MainInterface.storyboard	
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
-        <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"/>
     </dependencies>
@@ -23,267 +22,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="110"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="d8d-rW-z8J">
+                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="d8d-rW-z8J" customClass="HUDView" customModule="LoopUI">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
-                                <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TjP-cY-NvD" customClass="LoopCompletionHUDView" customModule="Loop_Status_Extension">
-                                        <rect key="frame" x="0.0" y="0.0" width="75" height="70"/>
-                                        <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 min ago" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3hj-xw-5hX">
-                                                <rect key="frame" x="0.0" y="56" width="75" height="14"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kd4-vy-VV0" customClass="LoopStateView" customModule="Loop_Status_Extension">
-                                                <rect key="frame" x="16" y="8" width="44" height="44"/>
-                                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="44" id="MtA-ut-vxb"/>
-                                                    <constraint firstAttribute="height" constant="44" id="PQt-mw-Q6d"/>
-                                                    <constraint firstAttribute="width" secondItem="Kd4-vy-VV0" secondAttribute="height" multiplier="1:1" id="cGp-Wd-7X3"/>
-                                                </constraints>
-                                                <variation key="default">
-                                                    <mask key="constraints">
-                                                        <exclude reference="cGp-Wd-7X3"/>
-                                                    </mask>
-                                                </variation>
-                                            </view>
-                                        </subviews>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <accessibility key="accessibilityConfiguration">
-                                            <accessibilityTraits key="traits" none="YES"/>
-                                            <bool key="isElement" value="YES"/>
-                                        </accessibility>
-                                        <constraints>
-                                            <constraint firstItem="3hj-xw-5hX" firstAttribute="leading" secondItem="TjP-cY-NvD" secondAttribute="leading" id="4m4-nT-6tT"/>
-                                            <constraint firstAttribute="bottom" secondItem="3hj-xw-5hX" secondAttribute="bottom" id="6aD-J8-Sbo"/>
-                                            <constraint firstItem="Kd4-vy-VV0" firstAttribute="centerX" secondItem="TjP-cY-NvD" secondAttribute="centerX" id="C4L-yY-AW6"/>
-                                            <constraint firstItem="3hj-xw-5hX" firstAttribute="top" secondItem="Kd4-vy-VV0" secondAttribute="bottom" constant="4" id="GVm-4z-gC4"/>
-                                            <constraint firstAttribute="trailing" secondItem="3hj-xw-5hX" secondAttribute="trailing" id="Wv1-0s-wgf"/>
-                                            <constraint firstItem="Kd4-vy-VV0" firstAttribute="top" secondItem="TjP-cY-NvD" secondAttribute="top" constant="8" id="vkx-Gc-9KX"/>
-                                        </constraints>
-                                        <connections>
-                                            <outlet property="caption" destination="3hj-xw-5hX" id="vSO-4R-Urg"/>
-                                            <outlet property="loopStateView" destination="Kd4-vy-VV0" id="WPq-iQ-fej"/>
-                                        </connections>
-                                    </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OBl-Fq-V35" customClass="GlucoseHUDView" customModule="Loop_Status_Extension">
-                                        <rect key="frame" x="75" y="0.0" width="75" height="70"/>
-                                        <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JPl-Fg-Pk3">
-                                                <rect key="frame" x="0.0" y="56.5" width="75" height="13.5"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                <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" text="mmol/L ↗︎" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FEb-Rh-yqa">
-                                                <rect key="frame" x="0.0" y="39.5" width="75" height="16"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                                                <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="252" text="399" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6xH-ga-6J9">
-                                                <rect key="frame" x="0.0" y="8" width="75" height="32.5"/>
-                                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="27"/>
-                                                <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="!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SIT-3D-HXh">
-                                                <rect key="frame" x="57" y="6" width="18" height="18"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="18" id="JeL-Yn-lCt"/>
-                                                    <constraint firstAttribute="height" constant="18" id="jkV-Vy-TkD"/>
-                                                </constraints>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                        </subviews>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <accessibility key="accessibilityConfiguration" label="Glucose">
-                                            <bool key="isElement" value="YES"/>
-                                        </accessibility>
-                                        <constraints>
-                                            <constraint firstItem="JPl-Fg-Pk3" firstAttribute="leading" secondItem="OBl-Fq-V35" secondAttribute="leading" id="0yR-Fm-a4S"/>
-                                            <constraint firstItem="SIT-3D-HXh" firstAttribute="top" secondItem="OBl-Fq-V35" secondAttribute="top" constant="6" id="1fc-qN-Tb0"/>
-                                            <constraint firstAttribute="trailing" secondItem="SIT-3D-HXh" secondAttribute="trailing" id="2hr-ob-QWc"/>
-                                            <constraint firstItem="6xH-ga-6J9" firstAttribute="top" secondItem="OBl-Fq-V35" secondAttribute="top" constant="8" id="57d-r0-TEB"/>
-                                            <constraint firstAttribute="trailing" secondItem="6xH-ga-6J9" secondAttribute="trailing" id="6CU-fX-WOe"/>
-                                            <constraint firstAttribute="trailing" secondItem="JPl-Fg-Pk3" secondAttribute="trailing" id="M0z-hw-6Kx"/>
-                                            <constraint firstItem="FEb-Rh-yqa" firstAttribute="leading" secondItem="OBl-Fq-V35" secondAttribute="leading" id="ThP-sz-Y2A"/>
-                                            <constraint firstItem="JPl-Fg-Pk3" firstAttribute="top" secondItem="FEb-Rh-yqa" secondAttribute="bottom" constant="1" id="W2d-ue-MhT"/>
-                                            <constraint firstAttribute="trailing" secondItem="FEb-Rh-yqa" secondAttribute="trailing" id="Wyw-Ah-f4u"/>
-                                            <constraint firstItem="FEb-Rh-yqa" firstAttribute="top" secondItem="6xH-ga-6J9" secondAttribute="bottom" constant="-1" id="ZUo-Jr-wFp"/>
-                                            <constraint firstAttribute="bottom" secondItem="JPl-Fg-Pk3" secondAttribute="bottom" id="eMa-AR-sSY"/>
-                                            <constraint firstItem="6xH-ga-6J9" firstAttribute="leading" secondItem="OBl-Fq-V35" secondAttribute="leading" id="gc7-O1-wsd"/>
-                                        </constraints>
-                                        <connections>
-                                            <outlet property="alertLabel" destination="SIT-3D-HXh" id="Ny0-Dl-7Mh"/>
-                                            <outlet property="caption" destination="JPl-Fg-Pk3" id="DSa-IS-k8e"/>
-                                            <outlet property="glucoseLabel" destination="6xH-ga-6J9" id="SGj-Kk-DZL"/>
-                                            <outlet property="unitLabel" destination="FEb-Rh-yqa" id="pG5-cY-ck1"/>
-                                        </connections>
-                                    </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rxv-4Y-WIp" customClass="BasalRateHUDView" customModule="Loop_Status_Extension">
-                                        <rect key="frame" x="150" y="0.0" width="75" height="70"/>
-                                        <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-0.85 U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="15E-EE-C2Y">
-                                                <rect key="frame" x="0.0" y="41" width="75" height="14.5"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                                                <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="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tNN-n0-2QL">
-                                                <rect key="frame" x="0.0" y="56.5" width="75" height="13.5"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dhF-pk-g7M" customClass="BasalStateView" customModule="Loop_Status_Extension">
-                                                <rect key="frame" x="16" y="8" width="44" height="30"/>
-                                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="44" id="wIs-0O-6ZS"/>
-                                                </constraints>
-                                            </view>
-                                        </subviews>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <accessibility key="accessibilityConfiguration" label="Net Basal Rate">
-                                            <bool key="isElement" value="YES"/>
-                                        </accessibility>
-                                        <constraints>
-                                            <constraint firstAttribute="trailing" secondItem="tNN-n0-2QL" secondAttribute="trailing" id="2rY-Ui-xD7"/>
-                                            <constraint firstItem="tNN-n0-2QL" firstAttribute="leading" secondItem="rxv-4Y-WIp" secondAttribute="leading" id="B3W-Le-syC"/>
-                                            <constraint firstItem="15E-EE-C2Y" firstAttribute="trailing" secondItem="rxv-4Y-WIp" secondAttribute="trailing" id="Cec-kP-gop"/>
-                                            <constraint firstItem="dhF-pk-g7M" firstAttribute="top" secondItem="rxv-4Y-WIp" secondAttribute="top" constant="8" id="TVD-RJ-I0t"/>
-                                            <constraint firstItem="15E-EE-C2Y" firstAttribute="top" secondItem="dhF-pk-g7M" secondAttribute="bottom" constant="3" id="jEt-Qx-VI8"/>
-                                            <constraint firstItem="dhF-pk-g7M" firstAttribute="centerX" secondItem="rxv-4Y-WIp" secondAttribute="centerX" id="nqw-7D-9gG"/>
-                                            <constraint firstItem="15E-EE-C2Y" firstAttribute="leading" secondItem="rxv-4Y-WIp" secondAttribute="leading" id="u2u-HY-25t"/>
-                                            <constraint firstAttribute="bottom" secondItem="tNN-n0-2QL" secondAttribute="bottom" id="vAc-KV-xuO"/>
-                                            <constraint firstItem="tNN-n0-2QL" firstAttribute="top" secondItem="15E-EE-C2Y" secondAttribute="bottom" constant="1" id="yLy-jz-nee"/>
-                                        </constraints>
-                                        <connections>
-                                            <outlet property="basalRateLabel" destination="15E-EE-C2Y" id="IJt-RR-Wsd"/>
-                                            <outlet property="basalStateView" destination="dhF-pk-g7M" id="nn0-eW-ZYc"/>
-                                            <outlet property="caption" destination="tNN-n0-2QL" id="Sd1-6u-FBZ"/>
-                                        </connections>
-                                    </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8f8-sc-GIm" customClass="ReservoirVolumeHUDView" customModule="Loop_Status_Extension">
-                                        <rect key="frame" x="225" y="0.0" width="75" height="70"/>
-                                        <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LGI-ua-HoN">
-                                                <rect key="frame" x="0.0" y="56" width="75" height="14"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NDd-5g-aSf">
-                                                <rect key="frame" x="16" y="9" width="44" height="44"/>
-                                                <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="reservoir" translatesAutoresizingMaskIntoConstraints="NO" id="NFF-qN-PTj">
-                                                        <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
-                                                    </imageView>
-                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FgS-py-wOE" customClass="LevelMaskView" customModule="Loop_Status_Extension">
-                                                        <rect key="frame" x="0.0" y="5" width="44" height="39"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="reservoir_mask"/>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </view>
-                                                </subviews>
-                                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="trailing" secondItem="NFF-qN-PTj" secondAttribute="trailing" id="DS5-9Q-CAk"/>
-                                                    <constraint firstItem="NFF-qN-PTj" firstAttribute="leading" secondItem="NDd-5g-aSf" secondAttribute="leading" id="Em6-5U-G5k"/>
-                                                    <constraint firstAttribute="bottom" secondItem="NFF-qN-PTj" secondAttribute="bottom" id="J46-Bd-uxW"/>
-                                                    <constraint firstAttribute="trailing" secondItem="FgS-py-wOE" secondAttribute="trailing" id="Pkf-1B-8BQ"/>
-                                                    <constraint firstItem="FgS-py-wOE" firstAttribute="leading" secondItem="NDd-5g-aSf" secondAttribute="leading" id="Qnp-1o-oRh"/>
-                                                    <constraint firstAttribute="bottom" secondItem="FgS-py-wOE" secondAttribute="bottom" id="Rek-aH-Pdf"/>
-                                                    <constraint firstAttribute="width" constant="44" id="Unf-la-7Ja"/>
-                                                    <constraint firstItem="NFF-qN-PTj" firstAttribute="top" secondItem="NDd-5g-aSf" secondAttribute="top" id="dxj-WI-KER"/>
-                                                    <constraint firstItem="FgS-py-wOE" firstAttribute="top" secondItem="NDd-5g-aSf" secondAttribute="top" constant="5" id="lCt-4N-95j"/>
-                                                    <constraint firstAttribute="height" constant="44" id="ovj-AK-Fzk"/>
-                                                </constraints>
-                                            </view>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="44U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="egB-jf-pOe">
-                                                <rect key="frame" x="26.5" y="28.5" width="23" height="13.5"/>
-                                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                        </subviews>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <accessibility key="accessibilityConfiguration" label="Reservoir Volume">
-                                            <bool key="isElement" value="YES"/>
-                                        </accessibility>
-                                        <constraints>
-                                            <constraint firstAttribute="trailing" secondItem="LGI-ua-HoN" secondAttribute="trailing" id="4rX-la-O1n"/>
-                                            <constraint firstItem="NDd-5g-aSf" firstAttribute="top" secondItem="8f8-sc-GIm" secondAttribute="top" constant="9" id="AeQ-iQ-Npw"/>
-                                            <constraint firstItem="NDd-5g-aSf" firstAttribute="centerX" secondItem="8f8-sc-GIm" secondAttribute="centerX" id="FmX-cZ-zJd"/>
-                                            <constraint firstItem="egB-jf-pOe" firstAttribute="centerY" secondItem="8f8-sc-GIm" secondAttribute="centerY" id="G6y-TM-GL1"/>
-                                            <constraint firstItem="egB-jf-pOe" firstAttribute="centerX" secondItem="8f8-sc-GIm" secondAttribute="centerX" id="IEk-yd-rCy"/>
-                                            <constraint firstItem="LGI-ua-HoN" firstAttribute="leading" secondItem="8f8-sc-GIm" secondAttribute="leading" id="Jcb-3w-71b"/>
-                                            <constraint firstAttribute="bottom" secondItem="LGI-ua-HoN" secondAttribute="bottom" id="Pzs-sy-GdL"/>
-                                            <constraint firstItem="LGI-ua-HoN" firstAttribute="top" secondItem="NDd-5g-aSf" secondAttribute="bottom" constant="3" id="o03-M9-QuX"/>
-                                        </constraints>
-                                        <connections>
-                                            <outlet property="caption" destination="LGI-ua-HoN" id="4NI-B2-gSU"/>
-                                            <outlet property="levelMaskView" destination="FgS-py-wOE" id="vGx-1I-UKo"/>
-                                            <outlet property="volumeLabel" destination="egB-jf-pOe" id="qKa-Qt-JJZ"/>
-                                        </connections>
-                                    </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6hm-aW-Inx" customClass="BatteryLevelHUDView" customModule="Loop_Status_Extension">
-                                        <rect key="frame" x="300" y="0.0" width="75" height="70"/>
-                                        <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cXW-I0-TPd">
-                                                <rect key="frame" x="0.0" y="56" width="75" height="14"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wJx-Nl-4PS">
-                                                <rect key="frame" x="16" y="9" width="44" height="44"/>
-                                                <subviews>
-                                                    <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="battery" translatesAutoresizingMaskIntoConstraints="NO" id="AXS-VK-mIB">
-                                                        <rect key="frame" x="9" y="0.0" width="26" height="44"/>
-                                                    </imageView>
-                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KEF-mY-dmf" customClass="LevelMaskView" customModule="Loop_Status_Extension">
-                                                        <rect key="frame" x="0.0" y="2" width="44" height="42"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="battery_mask"/>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </view>
-                                                </subviews>
-                                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="trailing" secondItem="KEF-mY-dmf" secondAttribute="trailing" id="0g8-GD-f8q"/>
-                                                    <constraint firstItem="KEF-mY-dmf" firstAttribute="leading" secondItem="wJx-Nl-4PS" secondAttribute="leading" id="Hrv-un-4NU"/>
-                                                    <constraint firstAttribute="bottom" secondItem="KEF-mY-dmf" secondAttribute="bottom" id="Jnl-am-ZTc"/>
-                                                    <constraint firstItem="KEF-mY-dmf" firstAttribute="top" secondItem="wJx-Nl-4PS" secondAttribute="top" constant="2" id="SI5-n4-yHx"/>
-                                                    <constraint firstAttribute="width" constant="44" id="TGN-N4-6wC"/>
-                                                    <constraint firstItem="AXS-VK-mIB" firstAttribute="centerY" secondItem="wJx-Nl-4PS" secondAttribute="centerY" id="loh-zH-B7R"/>
-                                                    <constraint firstAttribute="height" constant="44" id="ov2-Om-nim"/>
-                                                    <constraint firstItem="AXS-VK-mIB" firstAttribute="centerX" secondItem="wJx-Nl-4PS" secondAttribute="centerX" id="wQF-Ae-drU"/>
-                                                </constraints>
-                                            </view>
-                                        </subviews>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <accessibility key="accessibilityConfiguration" label="Battery Level">
-                                            <bool key="isElement" value="YES"/>
-                                        </accessibility>
-                                        <constraints>
-                                            <constraint firstAttribute="bottom" secondItem="cXW-I0-TPd" secondAttribute="bottom" id="C20-ml-z9o"/>
-                                            <constraint firstItem="cXW-I0-TPd" firstAttribute="leading" secondItem="6hm-aW-Inx" secondAttribute="leading" id="IRU-0u-1zQ"/>
-                                            <constraint firstItem="cXW-I0-TPd" firstAttribute="top" secondItem="wJx-Nl-4PS" secondAttribute="bottom" constant="3" id="JHS-Ja-5aR"/>
-                                            <constraint firstItem="wJx-Nl-4PS" firstAttribute="centerX" secondItem="6hm-aW-Inx" secondAttribute="centerX" id="NLs-UN-gKf"/>
-                                            <constraint firstItem="wJx-Nl-4PS" firstAttribute="top" secondItem="6hm-aW-Inx" secondAttribute="top" constant="9" id="vHc-y1-8kw"/>
-                                            <constraint firstAttribute="trailing" secondItem="cXW-I0-TPd" secondAttribute="trailing" id="wiS-YE-Yfj"/>
-                                        </constraints>
-                                        <connections>
-                                            <outlet property="caption" destination="cXW-I0-TPd" id="OMM-qi-Xmc"/>
-                                            <outlet property="levelMaskView" destination="KEF-mY-dmf" id="m5u-Ek-azz"/>
-                                        </connections>
-                                    </view>
-                                </subviews>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="70" id="Pes-zW-tY0"/>
                                 </constraints>
@@ -312,11 +52,7 @@
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="375" height="110"/>
                     <connections>
-                        <outlet property="basalRateHUD" destination="rxv-4Y-WIp" id="AfP-wt-GyH"/>
-                        <outlet property="batteryHUD" destination="6hm-aW-Inx" id="2Q7-Dj-rtj"/>
-                        <outlet property="glucoseHUD" destination="OBl-Fq-V35" id="qB5-T7-SJl"/>
-                        <outlet property="loopCompletionHUD" destination="TjP-cY-NvD" id="1fP-6s-pwL"/>
-                        <outlet property="reservoirVolumeHUD" destination="8f8-sc-GIm" id="lq2-Is-aL2"/>
+                        <outlet property="hudView" destination="d8d-rW-z8J" id="7Cp-BW-Kpc"/>
                         <outlet property="subtitleLabel" destination="9iF-xY-Bh4" id="PM8-hd-IB3"/>
                     </connections>
                 </viewController>
@@ -325,10 +61,4 @@
             <point key="canvasLocation" x="-226.40000000000001" y="274.36281859070465"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="battery" width="26" height="44"/>
-        <image name="battery_mask" width="16" height="42"/>
-        <image name="reservoir" width="28" height="44"/>
-        <image name="reservoir_mask" width="28" height="39"/>
-    </resources>
 </document>
diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist
index 66633dc7e3..9b2b100320 100644
--- a/Loop Status Extension/Info.plist	
+++ b/Loop Status Extension/Info.plist	
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>MainAppBundleIdentifier</key>
+	<string>$(MAIN_APP_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleDisplayName</key>
 	<string>Loop</string>
 	<key>CFBundleExecutable</key>
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
index 0de511aa87..f7123e6c15 100644
--- a/Loop Status Extension/StatusViewController.swift	
+++ b/Loop Status Extension/StatusViewController.swift	
@@ -6,38 +6,107 @@
 //  Copyright © 2016 LoopKit Authors. All rights reserved.
 //
 
-import UIKit
-import NotificationCenter
-import HealthKit
 import CoreData
+import HealthKit
+import LoopUI
+import NotificationCenter
+import UIKit
 
 class StatusViewController: UIViewController, NCWidgetProviding {
-    
-    @IBOutlet weak var loopCompletionHUD: LoopCompletionHUDView!
-    @IBOutlet weak var glucoseHUD: GlucoseHUDView!
-    @IBOutlet weak var basalRateHUD: BasalRateHUDView!
-    @IBOutlet weak var reservoirVolumeHUD: ReservoirVolumeHUDView!
-    @IBOutlet weak var batteryHUD: BatteryLevelHUDView!
+
+    @IBOutlet weak var hudView: HUDView!
     @IBOutlet weak var subtitleLabel: UILabel!
-    
+
+    var statusExtensionContext: StatusExtensionContext?
+    var defaults: UserDefaults?
+    final var observationContext = 1
+
+    var loopCompletionHUD: LoopCompletionHUDView! {
+        get {
+            return hudView.loopCompletionHUD
+        }
+    }
+
+    var glucoseHUD: GlucoseHUDView! {
+        get {
+            return hudView.glucoseHUD
+        }
+    }
+
+    var basalRateHUD: BasalRateHUDView! {
+        get {
+            return hudView.basalRateHUD
+        }
+    }
+
+    var reservoirVolumeHUD: ReservoirVolumeHUDView! {
+        get {
+            return hudView.reservoirVolumeHUD
+        }
+    }
+
+    var batteryHUD: BatteryLevelHUDView! {
+        get {
+            return hudView.batteryHUD
+        }
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
         subtitleLabel.alpha = 0
         subtitleLabel.textColor = UIColor.secondaryLabelColor
+
+        let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openLoopApp(_:)))
+        view.addGestureRecognizer(tapGestureRecognizer)
+
+        defaults = UserDefaults(suiteName: Bundle.main.appGroupSuiteName)
+        if let defaults = defaults {
+            defaults.addObserver(
+                self,
+                forKeyPath: defaults.statusExtensionContextObservableKey,
+                options: [],
+                context: &observationContext)
+        }
+    }
+    
+    deinit {
+        if let defaults = defaults {
+            defaults.removeObserver(self, forKeyPath: defaults.statusExtensionContextObservableKey, context: &observationContext)
+        }
+    }
+    
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        guard context == &observationContext else {
+            super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
+            return
+        }
+        
+        update()
     }
     
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
     }
-    
+
+    @objc private func openLoopApp(_: Any) {
+        if let url = Bundle.main.mainAppUrl {
+            self.extensionContext?.open(url)
+        }
+    }
+
     func widgetPerformUpdate(completionHandler: (@escaping (NCUpdateResult) -> Void)) {
+        let result = update()
+        completionHandler(result)
+    }
+    
+    @discardableResult
+    func update() -> NCUpdateResult {
         guard
-            let context = UserDefaults(suiteName: Bundle.main.appGroupSuiteName)?.statusExtensionContext
+            let context = defaults?.statusExtensionContext
         else {
-            completionHandler(NCUpdateResult.failed)
-            return
+            return NCUpdateResult.failed
         }
-
+        
         // We should never have the case where there's glucose values but no preferred
         // unit. However, if that case were to happen we might show quantities against
         // the wrong units and that could be very harmful. So unless there's a preferred
@@ -45,8 +114,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         guard
             let preferredUnitString = context.preferredUnitString
         else {
-            completionHandler(NCUpdateResult.failed)
-            return
+            return NCUpdateResult.failed
         }
         
         if let glucose = context.latestGlucose {
@@ -88,10 +156,9 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         } else {
             subtitleLabel.alpha = 0
         }
-
+        
         // Right now we always act as if there's new data.
         // TODO: keep track of data changes and return .noData if necessary
-        completionHandler(NCUpdateResult.newData)
+        return NCUpdateResult.newData
     }
-    
 }
diff --git a/Loop.xcconfig b/Loop.xcconfig
index d092e89a38..e505022849 100644
--- a/Loop.xcconfig
+++ b/Loop.xcconfig
@@ -8,4 +8,4 @@
 
 // Change this on first setup to your own unique organization identifier in
 // reverse-domain name syntax.
-MAIN_APP_BUNDLE_IDENTIFIER = com.loopkit
+MAIN_APP_BUNDLE_IDENTIFIER = com.jslev9
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index 71b1498b67..8dfcf16ffb 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -27,13 +27,11 @@
 		4328E02A1CFBE2C500E199AA /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0241CFBE2C500E199AA /* UIColor.swift */; };
 		4328E02B1CFBE2C500E199AA /* WKAlertAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0251CFBE2C500E199AA /* WKAlertAction.swift */; };
 		4328E02F1CFBF81800E199AA /* WKInterfaceImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E02E1CFBF81800E199AA /* WKInterfaceImage.swift */; };
-		4328E0301CFBFAEB00E199AA /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
 		4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */; };
 		4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0341CFC0AE100E199AA /* WatchDataManager.swift */; };
 		432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */; };
 		4331E0781C85302200FBE832 /* CGPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4331E0771C85302200FBE832 /* CGPoint.swift */; };
 		4331E07A1C85650D00FBE832 /* ChartAxisValueDoubleLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */; };
-		4337615F1D52F487004A3647 /* GlucoseHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */; };
 		433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */; };
 		433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */; };
 		4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */; };
@@ -53,10 +51,8 @@
 		435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */; };
 		435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */; };
 		435400351C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */; };
-		4354003A1C9FB81100D5819C /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92501C541832001FFDE1 /* UIColor.swift */; };
 		43649A631C7A347F00523D7F /* CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43649A621C7A347F00523D7F /* CollectionType.swift */; };
 		436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0DA41D236A2A00104B24 /* LoopError.swift */; };
-		436A0E7B1D7DE13400D6475D /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */; };
 		436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */; };
 		43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43776F8F1B8022E90074EA36 /* AppDelegate.swift */; };
 		43776F971B8022E90074EA36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F951B8022E90074EA36 /* Main.storyboard */; };
@@ -65,11 +61,6 @@
 		437CCADC1D284B830075D2C3 /* ButtonTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */; };
 		437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CCADD1D2858FD0075D2C3 /* AuthenticationViewController.swift */; };
 		437CCAE01D285C7B0075D2C3 /* ServiceAuthentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CCADF1D285C7B0075D2C3 /* ServiceAuthentication.swift */; };
-		437CEEBC1CD6DE6A003C8C80 /* HUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBB1CD6DE6A003C8C80 /* HUDView.swift */; };
-		437CEEBE1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */; };
-		437CEEC01CD6FCD8003C8C80 /* BasalRateHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */; };
-		437CEEC81CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */; };
-		437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */; };
 		437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */; };
 		437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */; };
 		43846AD51D8FA67800799272 /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 43846AD41D8FA67800799272 /* Base.lproj */; };
@@ -82,8 +73,6 @@
 		438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 438A95A71D8B9B24009D12E1 /* xDripG5.framework */; };
 		438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */; };
 		438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */; };
-		438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */; };
-		439897351CD2F7DE00223065 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
 		439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897361CD2F80600223065 /* AnalyticsManager.swift */; };
 		4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */; };
 		43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A567681C94880B00334FAC /* LoopDataManager.swift */; };
@@ -96,7 +85,6 @@
 		43A9438E1B926B7B0051FA24 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A9438D1B926B7B0051FA24 /* ComplicationController.swift */; };
 		43A943901B926B7B0051FA24 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 43A9438F1B926B7B0051FA24 /* Assets.xcassets */; };
 		43A943941B926B7B0051FA24 /* WatchApp.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 43A943721B926B7B0051FA24 /* WatchApp.app */; };
-		43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; };
 		43B371881CE597D10013C5A6 /* ShareClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43B371871CE597D10013C5A6 /* ShareClient.framework */; };
 		43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C094491CACCC73001F6403 /* NotificationManager.swift */; };
 		43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C246A71D89990F0031F8D1 /* Crypto.framework */; };
@@ -110,8 +98,6 @@
 		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 */; };
-		43DE925C1C547A20001FFDE1 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE925B1C547A20001FFDE1 /* WatchContext.swift */; };
-		43DE925D1C547A20001FFDE1 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE925B1C547A20001FFDE1 /* WatchContext.swift */; };
 		43DE92611C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.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 */; };
@@ -135,9 +121,6 @@
 		43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */; };
 		43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */; };
 		43E397A31D56B9E40028E321 /* Glucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E397A21D56B9E40028E321 /* Glucose.swift */; };
-		43EA285F1D50ED3D001BC233 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; };
-		43EA28601D50ED4D001BC233 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; };
-		43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; };
 		43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EB40851C82646A00472A8C /* StatusChartManager.swift */; };
 		43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */; };
 		43F41C351D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */; };
@@ -151,37 +134,52 @@
 		43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D481C914197002152D1 /* CarbKit.framework */; };
 		43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D491C914197002152D1 /* GlucoseKit.framework */; };
 		43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; };
-		43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; };
 		4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */; };
 		4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.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 */; };
+		4F2C15851E075B8700E160D4 /* LoopUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F75288D1DFE1DC600C322D6 /* LoopUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4F2C15931E09BF2C00E160D4 /* HUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2C15921E09BF2C00E160D4 /* HUDView.swift */; };
+		4F2C15951E09BF3C00E160D4 /* HUDView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F2C15941E09BF3C00E160D4 /* HUDView.xib */; };
+		4F2C15971E09E94E00E160D4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4F2C15961E09E94E00E160D4 /* Assets.xcassets */; };
+		4F2C159A1E0C9E5600E160D4 /* LoopUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		4F526D5F1DF2459000A04910 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
 		4F526D611DF8D9A900A04910 /* NetBasal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D601DF8D9A900A04910 /* NetBasal.swift */; };
 		4F526D621DF9D95200A04910 /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; };
 		4F70C1DE1DE8DCA7006380B7 /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F70C1DD1DE8DCA7006380B7 /* NotificationCenter.framework */; };
 		4F70C1E11DE8DCA7006380B7 /* StatusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C1E01DE8DCA7006380B7 /* StatusViewController.swift */; };
 		4F70C1E41DE8DCA7006380B7 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4F70C1E21DE8DCA7006380B7 /* MainInterface.storyboard */; };
 		4F70C1E81DE8DCA7006380B7 /* Loop Status Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4F70C1DC1DE8DCA7006380B7 /* Loop Status Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		4F70C1ED1DE8DEDA006380B7 /* GlucoseHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */; };
-		4F70C1EF1DE8DF15006380B7 /* HUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBB1CD6DE6A003C8C80 /* HUDView.swift */; };
-		4F70C1F01DE8DF22006380B7 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; };
-		4F70C1F21DE8DF3A006380B7 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92501C541832001FFDE1 /* UIColor.swift */; };
-		4F70C1F31DE8DF47006380B7 /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */; };
-		4F70C1F41DE8E3E1006380B7 /* BasalRateHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */; };
-		4F70C1F51DE8E3E9006380B7 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; };
-		4F70C1F61DE8E3F1006380B7 /* BatteryLevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */; };
-		4F70C1F71DE8E3FD006380B7 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; };
-		4F70C1F81DE8E403006380B7 /* LoopCompletionHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */; };
-		4F70C1F91DE8E409006380B7 /* LoopStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */; };
-		4F70C1FA1DE8E42D006380B7 /* ReservoirVolumeHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */; };
-		4F70C1FB1DE8E45E006380B7 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
 		4F70C1FC1DE8E5FB006380B7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 43776F981B8022E90074EA36 /* Assets.xcassets */; };
-		4F70C20B1DE8E9F4006380B7 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; };
 		4F70C2101DE8FAC5006380B7 /* StatusExtensionDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C20F1DE8FAC5006380B7 /* StatusExtensionDataManager.swift */; };
 		4F70C2121DE900EA006380B7 /* StatusExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */; };
 		4F70C2131DE90339006380B7 /* StatusExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */; };
+		4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; };
+		4F7528951DFE1E9B00C322D6 /* LoopUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; };
+		4F75289A1DFE1F6000C322D6 /* BasalRateHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */; };
+		4F75289B1DFE1F6000C322D6 /* BatteryLevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */; };
+		4F75289C1DFE1F6000C322D6 /* GlucoseHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */; };
+		4F75289D1DFE1F6000C322D6 /* BaseHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBB1CD6DE6A003C8C80 /* BaseHUDView.swift */; };
+		4F75289E1DFE1F6000C322D6 /* LoopCompletionHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */; };
+		4F75289F1DFE1F6000C322D6 /* ReservoirVolumeHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */; };
+		4F7528A01DFE1F9D00C322D6 /* LoopStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */; };
+		4F7528A11DFE200B00C322D6 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; };
+		4F7528A21DFE200B00C322D6 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; };
+		4F7528A41DFE204900C322D6 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92501C541832001FFDE1 /* UIColor.swift */; };
+		4F7528A51DFE208C00C322D6 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
+		4F7528A71DFE20CE00C322D6 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; };
+		4F7528A81DFE20CE00C322D6 /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */; };
+		4F7528A91DFE212600C322D6 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; };
+		4F7528AA1DFE215100C322D6 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
 		4FC8C8011DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */; };
 		4FC8C8021DEB943800A1452E /* NSUserDefaults+StatusExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */; };
+		4FF4D0F81E1725B000846527 /* NibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54561D287FDB002A9274 /* NibLoadable.swift */; };
+		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 */; };
 		C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
 		C12F21A71DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */; };
 		C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; };
@@ -221,6 +219,20 @@
 			remoteGlobalIDString = 4F70C1DB1DE8DCA7006380B7;
 			remoteInfo = "Loop Status Extension";
 		};
+		4F7528961DFE1ED400C322D6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 43776F841B8022E90074EA36 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4F75288A1DFE1DC600C322D6;
+			remoteInfo = LoopUI;
+		};
+		4F7528981DFE1ED800C322D6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 43776F841B8022E90074EA36 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4F75288A1DFE1DC600C322D6;
+			remoteInfo = LoopUI;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -252,6 +264,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				4F2C159A1E0C9E5600E160D4 /* LoopUI.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -294,8 +307,12 @@
 		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>"; };
+<<<<<<< HEAD
 		43076BF21DFDBC4B0012A723 /* it.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = it.lproj; sourceTree = "<group>"; };
 		430DA58D1D4AEC230097D1CA /* NSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSBundle.swift; sourceTree = "<group>"; };
+=======
+		430DA58D1D4AEC230097D1CA /* NSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NSBundle.swift; path = Common/Extensions/NSBundle.swift; sourceTree = "<group>"; };
+>>>>>>> LoopKit/dev
 		430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySentryPumpStatusMessageBody.swift; sourceTree = "<group>"; };
 		4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartContentView.swift; sourceTree = "<group>"; };
 		4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryEditTableViewController.swift; sourceTree = "<group>"; };
@@ -321,14 +338,14 @@
 		4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCharts.framework; path = Carthage/Build/iOS/SwiftCharts.framework; sourceTree = "<group>"; };
 		4346D1F51C78501000ABAFE3 /* ChartPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPoint.swift; sourceTree = "<group>"; };
 		434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RileyLinkBLEKit.framework; path = Carthage/Build/iOS/RileyLinkBLEKit.framework; sourceTree = "<group>"; };
-		434F54561D287FDB002A9274 /* NibLoadable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NibLoadable.swift; sourceTree = "<group>"; };
+		434F54561D287FDB002A9274 /* NibLoadable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NibLoadable.swift; path = Common/Extensions/NibLoadable.swift; sourceTree = "<group>"; };
 		434F54581D28805E002A9274 /* ButtonTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ButtonTableViewCell.xib; sourceTree = "<group>"; };
 		434F545A1D2880D4002A9274 /* AuthenticationTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AuthenticationTableViewCell.xib; sourceTree = "<group>"; };
 		434F545E1D288345002A9274 /* ShareService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareService.swift; sourceTree = "<group>"; };
 		434F54601D28859B002A9274 /* ServiceCredential.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCredential.swift; sourceTree = "<group>"; };
 		434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidatingIndicatorView.swift; sourceTree = "<group>"; };
 		434FB6451D68F1CD007B9C70 /* Amplitude.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Amplitude.framework; path = Carthage/Build/iOS/Amplitude.framework; sourceTree = "<group>"; };
-		434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = "<group>"; };
+		434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IdentifiableClass.swift; path = Common/Extensions/IdentifiableClass.swift; sourceTree = "<group>"; };
 		434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewCell.swift; sourceTree = "<group>"; };
 		43523EDA1CC35083001850F1 /* RileyLinkKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RileyLinkKit.framework; path = Carthage/Build/iOS/RileyLinkKit.framework; sourceTree = "<group>"; };
 		435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BolusSuggestionUserInfo.swift; sourceTree = "<group>"; };
@@ -346,7 +363,7 @@
 		437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonTableViewCell.swift; sourceTree = "<group>"; };
 		437CCADD1D2858FD0075D2C3 /* AuthenticationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationViewController.swift; sourceTree = "<group>"; };
 		437CCADF1D285C7B0075D2C3 /* ServiceAuthentication.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceAuthentication.swift; sourceTree = "<group>"; };
-		437CEEBB1CD6DE6A003C8C80 /* HUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HUDView.swift; sourceTree = "<group>"; };
+		437CEEBB1CD6DE6A003C8C80 /* BaseHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseHUDView.swift; sourceTree = "<group>"; };
 		437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopCompletionHUDView.swift; sourceTree = "<group>"; };
 		437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasalRateHUDView.swift; sourceTree = "<group>"; };
 		437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReservoirVolumeHUDView.swift; sourceTree = "<group>"; };
@@ -365,7 +382,7 @@
 		438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionInputEffect.swift; sourceTree = "<group>"; };
 		438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionInputEffectTableViewCell.swift; sourceTree = "<group>"; };
 		438DADC71CDE8F8B007697A5 /* LoopStateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopStateView.swift; sourceTree = "<group>"; };
-		439897341CD2F7DE00223065 /* NSTimeInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSTimeInterval.swift; sourceTree = "<group>"; };
+		439897341CD2F7DE00223065 /* NSTimeInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NSTimeInterval.swift; path = Common/Extensions/NSTimeInterval.swift; sourceTree = "<group>"; };
 		439897361CD2F80600223065 /* AnalyticsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AnalyticsManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		4398973A1CD2FC2000223065 /* NSDateFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDateFormatter.swift; sourceTree = "<group>"; };
 		43A567681C94880B00334FAC /* LoopDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = LoopDataManager.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -395,7 +412,6 @@
 		43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryTableViewController.swift; sourceTree = "<group>"; };
 		43DE92501C541832001FFDE1 /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = "<group>"; };
 		43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryUserInfo.swift; sourceTree = "<group>"; };
-		43DE925B1C547A20001FFDE1 /* WatchContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchContext.swift; sourceTree = "<group>"; };
 		43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AbsorptionTimeType+CarbKit.swift"; sourceTree = "<group>"; };
 		43E2D8C51D204678004DA55F /* KeychainManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainManager.swift; sourceTree = "<group>"; };
 		43E2D8C71D208D5B004DA55F /* KeychainManager+Loop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "KeychainManager+Loop.swift"; sourceTree = "<group>"; };
@@ -440,7 +456,11 @@
 		43FBEDD71D73843700B21F22 /* LevelMaskView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LevelMaskView.swift; sourceTree = "<group>"; };
 		4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = G4ShareSpy.framework; path = Carthage/Build/iOS/G4ShareSpy.framework; sourceTree = "<group>"; };
 		4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GlucoseG4.swift; path = Loop/Models/GlucoseG4.swift; sourceTree = SOURCE_ROOT; };
-		4F526D5E1DF2459000A04910 /* HKUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HKUnit.swift; sourceTree = "<group>"; };
+		4F2C15801E0495B200E160D4 /* WatchContext+WatchApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WatchContext+WatchApp.swift"; sourceTree = "<group>"; };
+		4F2C15921E09BF2C00E160D4 /* HUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HUDView.swift; sourceTree = "<group>"; };
+		4F2C15941E09BF3C00E160D4 /* HUDView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HUDView.xib; sourceTree = "<group>"; };
+		4F2C15961E09E94E00E160D4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		4F526D5E1DF2459000A04910 /* HKUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HKUnit.swift; path = Common/Extensions/HKUnit.swift; sourceTree = "<group>"; };
 		4F526D601DF8D9A900A04910 /* NetBasal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetBasal.swift; sourceTree = "<group>"; };
 		4F70C1DC1DE8DCA7006380B7 /* Loop Status Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Loop Status Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4F70C1DD1DE8DCA7006380B7 /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
@@ -450,7 +470,11 @@
 		4F70C1FD1DE8E662006380B7 /* Loop Status Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Loop Status Extension.entitlements"; sourceTree = "<group>"; };
 		4F70C20F1DE8FAC5006380B7 /* StatusExtensionDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusExtensionDataManager.swift; sourceTree = "<group>"; };
 		4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusExtensionContext.swift; sourceTree = "<group>"; };
-		4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSUserDefaults+StatusExtension.swift"; sourceTree = "<group>"; };
+		4F75288B1DFE1DC600C322D6 /* LoopUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LoopUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4F75288D1DFE1DC600C322D6 /* LoopUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoopUI.h; sourceTree = "<group>"; };
+		4F75288E1DFE1DC600C322D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSUserDefaults+StatusExtension.swift"; path = "Common/Extensions/NSUserDefaults+StatusExtension.swift"; sourceTree = "<group>"; };
+		4FF4D0FF1E18374700846527 /* WatchContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchContext.swift; sourceTree = "<group>"; };
 		C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = "<group>"; };
 		C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_tamp_basal_very_low_end_in_range.json; sourceTree = "<group>"; };
 		C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MealBolusNightscoutTreatment.swift; sourceTree = "<group>"; };
@@ -473,6 +497,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */,
 				43C6407C1DA051850093E25D /* InsulinKit.framework in Frameworks */,
 				438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */,
 				43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */,
@@ -516,10 +541,18 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4F7528951DFE1E9B00C322D6 /* LoopUI.framework in Frameworks */,
 				4F70C1DE1DE8DCA7006380B7 /* NotificationCenter.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4F7528871DFE1DC600C322D6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -542,6 +575,7 @@
 				4328E0201CFBE2C500E199AA /* IdentifiableClass.swift */,
 				4328E0231CFBE2C500E199AA /* NSUserDefaults.swift */,
 				4328E0241CFBE2C500E199AA /* UIColor.swift */,
+				4F2C15801E0495B200E160D4 /* WatchContext+WatchApp.swift */,
 				43CB2B2A1D924D450079823D /* WCSession.swift */,
 				4328E0251CFBE2C500E199AA /* WKAlertAction.swift */,
 				4328E02E1CFBF81800E199AA /* WKInterfaceImage.swift */,
@@ -558,13 +592,11 @@
 				43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */,
 				43E397A21D56B9E40028E321 /* Glucose.swift */,
 				4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */,
-				43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */,
 				436FACED1D0BA636004E2427 /* InsulinDataSource.swift */,
 				436A0DA41D236A2A00104B24 /* LoopError.swift */,
 				430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */,
 				4F526D601DF8D9A900A04910 /* NetBasal.swift */,
 				438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */,
-				43EA28611D517E42001BC233 /* SensorDisplayable.swift */,
 				43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */,
 				4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
 			);
@@ -574,12 +606,14 @@
 		43776F831B8022E90074EA36 = {
 			isa = PBXGroup;
 			children = (
+				4FF4D0FA1E1834BD00846527 /* Common */,
 				43776F8E1B8022E90074EA36 /* Loop */,
 				4F70C1DF1DE8DCA7006380B7 /* Loop Status Extension */,
 				43A943731B926B7B0051FA24 /* WatchApp */,
 				43A943821B926B7B0051FA24 /* WatchApp Extension */,
 				43F78D2C1C8FC58F002152D1 /* LoopTests */,
 				43E2D8D21D20BF42004DA55F /* DoseMathTests */,
+				4F75288C1DFE1DC600C322D6 /* LoopUI */,
 				968DCD53F724DE56FFE51920 /* Frameworks */,
 				43776F8D1B8022E90074EA36 /* Products */,
 				437D9BA11D7B5203007245E8 /* Loop.xcconfig */,
@@ -595,6 +629,7 @@
 				43E2D8D11D20BF42004DA55F /* DoseMathTests.xctest */,
 				43E2D90B1D20C581004DA55F /* LoopTests.xctest */,
 				4F70C1DC1DE8DCA7006380B7 /* Loop Status Extension.appex */,
+				4F75288B1DFE1DC600C322D6 /* LoopUI.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -656,7 +691,6 @@
 				43A9438F1B926B7B0051FA24 /* Assets.xcassets */,
 				4328E0121CFBE1B700E199AA /* Controllers */,
 				4328E01F1CFBE2B100E199AA /* Extensions */,
-				43DE92571C5479C3001FFDE1 /* Models */,
 				43A943831B926B7B0051FA24 /* Supporting Files */,
 			);
 			path = "WatchApp Extension";
@@ -670,17 +704,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		43DE92571C5479C3001FFDE1 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */,
-				43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */,
-				435400331C9F878D00D5819C /* SetBolusUserInfo.swift */,
-				43DE925B1C547A20001FFDE1 /* WatchContext.swift */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
 		43E2D8D21D20BF42004DA55F /* DoseMathTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -719,17 +742,10 @@
 				4346D1F51C78501000ABAFE3 /* ChartPoint.swift */,
 				43649A621C7A347F00523D7F /* CollectionType.swift */,
 				4302F4E41D4EA75100F0FCAF /* DoseStore.swift */,
-				434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */,
-				434F54561D287FDB002A9274 /* NibLoadable.swift */,
-				430DA58D1D4AEC230097D1CA /* NSBundle.swift */,
 				43CE7CDD1CA8B63E003CC1B0 /* Data.swift */,
 				4398973A1CD2FC2000223065 /* NSDateFormatter.swift */,
-				436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */,
-				439897341CD2F7DE00223065 /* NSTimeInterval.swift */,
 				43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */,
-				4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */,
 				43F41C361D3BF32400C11ED6 /* UIAlertController.swift */,
-				43DE92501C541832001FFDE1 /* UIColor.swift */,
 				437CEEE31CDE5C0A003C8C80 /* UIImage.swift */,
 				434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */,
 			);
@@ -760,22 +776,13 @@
 			children = (
 				437CCAD91D284ADF0075D2C3 /* AuthenticationTableViewCell.swift */,
 				434F545A1D2880D4002A9274 /* AuthenticationTableViewCell.xib */,
-				437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */,
-				43B371851CE583890013C5A6 /* BasalStateView.swift */,
-				437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */,
 				437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */,
 				434F54581D28805E002A9274 /* ButtonTableViewCell.xib */,
 				4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */,
 				43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */,
 				43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */,
 				4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */,
-				4337615E1D52F487004A3647 /* GlucoseHUDView.swift */,
-				437CEEBB1CD6DE6A003C8C80 /* HUDView.swift */,
-				43FBEDD71D73843700B21F22 /* LevelMaskView.swift */,
-				437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */,
-				438DADC71CDE8F8B007697A5 /* LoopStateView.swift */,
 				438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */,
-				437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */,
 				43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */,
 				43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
 				434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */,
@@ -820,12 +827,94 @@
 				4F70C1E01DE8DCA7006380B7 /* StatusViewController.swift */,
 				4F70C1E21DE8DCA7006380B7 /* MainInterface.storyboard */,
 				4F70C1E51DE8DCA7006380B7 /* Info.plist */,
-				4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */,
-				4F526D5E1DF2459000A04910 /* HKUnit.swift */,
 			);
 			path = "Loop Status Extension";
 			sourceTree = SOURCE_ROOT;
 		};
+		4F75288C1DFE1DC600C322D6 /* LoopUI */ = {
+			isa = PBXGroup;
+			children = (
+				4F7528A61DFE20AE00C322D6 /* Models */,
+				4F7528A31DFE202B00C322D6 /* Extensions */,
+				4F7528931DFE1E1600C322D6 /* Views */,
+				4F75288D1DFE1DC600C322D6 /* LoopUI.h */,
+				4F75288E1DFE1DC600C322D6 /* Info.plist */,
+				4F2C15941E09BF3C00E160D4 /* HUDView.xib */,
+				4F2C15961E09E94E00E160D4 /* Assets.xcassets */,
+			);
+			path = LoopUI;
+			sourceTree = "<group>";
+		};
+		4F7528931DFE1E1600C322D6 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */,
+				43B371851CE583890013C5A6 /* BasalStateView.swift */,
+				437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */,
+				4337615E1D52F487004A3647 /* GlucoseHUDView.swift */,
+				437CEEBB1CD6DE6A003C8C80 /* BaseHUDView.swift */,
+				43FBEDD71D73843700B21F22 /* LevelMaskView.swift */,
+				437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */,
+				438DADC71CDE8F8B007697A5 /* LoopStateView.swift */,
+				437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */,
+				4F2C15921E09BF2C00E160D4 /* HUDView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		4F7528A31DFE202B00C322D6 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				43DE92501C541832001FFDE1 /* UIColor.swift */,
+				436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
+		4F7528A61DFE20AE00C322D6 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				43EA28611D517E42001BC233 /* SensorDisplayable.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		4FF4D0FA1E1834BD00846527 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				4FF4D0FC1E1834CC00846527 /* Extensions */,
+				4FF4D0FB1E1834C400846527 /* Models */,
+			);
+			name = Common;
+			sourceTree = "<group>";
+		};
+		4FF4D0FB1E1834C400846527 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */,
+				43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */,
+				43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */,
+				435400331C9F878D00D5819C /* SetBolusUserInfo.swift */,
+				4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */,
+				4FF4D0FF1E18374700846527 /* WatchContext.swift */,
+			);
+			name = Models;
+			path = Common/Models;
+			sourceTree = "<group>";
+		};
+		4FF4D0FC1E1834CC00846527 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				4F526D5E1DF2459000A04910 /* HKUnit.swift */,
+				434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */,
+				434F54561D287FDB002A9274 /* NibLoadable.swift */,
+				430DA58D1D4AEC230097D1CA /* NSBundle.swift */,
+				439897341CD2F7DE00223065 /* NSTimeInterval.swift */,
+				4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */,
+			);
+			name = Extensions;
+			sourceTree = "<group>";
+		};
 		968DCD53F724DE56FFE51920 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -851,6 +940,17 @@
 		};
 /* End PBXGroup section */
 
+/* Begin PBXHeadersBuildPhase section */
+		4F7528881DFE1DC600C322D6 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4F2C15851E075B8700E160D4 /* LoopUI.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
 /* Begin PBXNativeTarget section */
 		43776F8B1B8022E90074EA36 /* Loop */ = {
 			isa = PBXNativeTarget;
@@ -867,6 +967,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				4F7528971DFE1ED400C322D6 /* PBXTargetDependency */,
 				43A943931B926B7B0051FA24 /* PBXTargetDependency */,
 				4F70C1E71DE8DCA7006380B7 /* PBXTargetDependency */,
 			);
@@ -958,12 +1059,31 @@
 			buildRules = (
 			);
 			dependencies = (
+				4F7528991DFE1ED800C322D6 /* PBXTargetDependency */,
 			);
 			name = "Loop Status Extension";
 			productName = "Loop Status Extension";
 			productReference = 4F70C1DC1DE8DCA7006380B7 /* Loop Status Extension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
+		4F75288A1DFE1DC600C322D6 /* LoopUI */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4F7528921DFE1DC600C322D6 /* Build configuration list for PBXNativeTarget "LoopUI" */;
+			buildPhases = (
+				4F7528861DFE1DC600C322D6 /* Sources */,
+				4F7528871DFE1DC600C322D6 /* Frameworks */,
+				4F7528881DFE1DC600C322D6 /* Headers */,
+				4F7528891DFE1DC600C322D6 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = LoopUI;
+			productName = LoopUI;
+			productReference = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -1037,6 +1157,10 @@
 							};
 						};
 					};
+					4F75288A1DFE1DC600C322D6 = {
+						CreatedOnToolsVersion = 8.1;
+						ProvisioningStyle = Automatic;
+					};
 				};
 			};
 			buildConfigurationList = 43776F871B8022E90074EA36 /* Build configuration list for PBXProject "Loop" */;
@@ -1056,6 +1180,7 @@
 				4F70C1DB1DE8DCA7006380B7 /* Loop Status Extension */,
 				43A943711B926B7B0051FA24 /* WatchApp */,
 				43A9437D1B926B7B0051FA24 /* WatchApp Extension */,
+				4F75288A1DFE1DC600C322D6 /* LoopUI */,
 				43E2D8D01D20BF42004DA55F /* DoseMathTests */,
 				43E2D90A1D20C581004DA55F /* LoopTests */,
 			);
@@ -1132,6 +1257,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4F7528891DFE1DC600C322D6 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4F2C15971E09E94E00E160D4 /* Assets.xcassets in Resources */,
+				4F2C15951E09BF3C00E160D4 /* HUDView.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -1171,8 +1305,10 @@
 			files = (
 				4F70C2131DE90339006380B7 /* StatusExtensionContext.swift in Sources */,
 				434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */,
+				4FF4D1001E18374700846527 /* WatchContext.swift in Sources */,
 				4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */,
 				43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */,
+				4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */,
 				430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */,
 				43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */,
 				437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */,
@@ -1180,7 +1316,6 @@
 				43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */,
 				43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */,
 				4313EDE01D8A6BF90060FA79 /* ChartContentView.swift in Sources */,
-				43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */,
 				434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */,
 				437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */,
 				43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */,
@@ -1189,10 +1324,8 @@
 				4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */,
 				43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */,
 				43649A631C7A347F00523D7F /* CollectionType.swift in Sources */,
-				437CEEBE1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift in Sources */,
 				43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */,
 				C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */,
-				43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */,
 				435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */,
 				43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */,
 				43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */,
@@ -1200,11 +1333,9 @@
 				4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */,
 				437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */,
 				43DBF0591C93F73800B3C386 /* CarbEntryTableViewController.swift in Sources */,
-				43DE925C1C547A20001FFDE1 /* WatchContext.swift in Sources */,
 				43F41C351D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */,
 				43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */,
 				C17884631D51A7A400405663 /* BatteryIndicator.swift in Sources */,
-				437CEEC81CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift in Sources */,
 				43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */,
 				434FF1EE1CF27EEF000DB779 /* UITableViewCell.swift in Sources */,
 				C18C8C511D5A351900E043FB /* NightscoutDataManager.swift in Sources */,
@@ -1225,19 +1356,13 @@
 				435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */,
 				437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */,
 				43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */,
-				437CEEBC1CD6DE6A003C8C80 /* HUDView.swift in Sources */,
 				433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */,
-				436A0E7B1D7DE13400D6475D /* NSNumberFormatter.swift in Sources */,
 				434F545F1D288345002A9274 /* ShareService.swift in Sources */,
-				43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */,
-				4354003A1C9FB81100D5819C /* UIColor.swift in Sources */,
 				4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */,
 				4F526D611DF8D9A900A04910 /* NetBasal.swift in Sources */,
 				4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */,
 				436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */,
-				437CEEC01CD6FCD8003C8C80 /* BasalRateHUDView.swift in Sources */,
 				43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */,
-				437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */,
 				433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */,
 				43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */,
 				438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */,
@@ -1247,17 +1372,13 @@
 				436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */,
 				439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */,
 				4346D1F61C78501000ABAFE3 /* ChartPoint.swift in Sources */,
-				43EA28601D50ED4D001BC233 /* GlucoseTrend.swift in Sources */,
-				4337615F1D52F487004A3647 /* GlucoseHUDView.swift in Sources */,
 				438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */,
 				438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */,
 				43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */,
 				43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */,
 				432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */,
-				438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */,
 				43DE92591C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */,
 				434F54631D28DD80002A9274 /* ValidatingIndicatorView.swift in Sources */,
-				439897351CD2F7DE00223065 /* NSTimeInterval.swift in Sources */,
 				43DE92611C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1266,27 +1387,28 @@
 			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 */,
 				43A9438A1B926B7B0051FA24 /* NotificationController.swift in Sources */,
 				43A943881B926B7B0051FA24 /* ExtensionDelegate.swift in Sources */,
 				4328E0291CFBE2C500E199AA /* NSUserDefaults.swift in Sources */,
 				4328E02F1CFBF81800E199AA /* WKInterfaceImage.swift in Sources */,
+				4F2C15811E0495B200E160D4 /* WatchContext+WatchApp.swift in Sources */,
 				4328E02A1CFBE2C500E199AA /* UIColor.swift in Sources */,
 				4328E01B1CFBE1DA00E199AA /* BolusInterfaceController.swift in Sources */,
 				4328E02B1CFBE2C500E199AA /* WKAlertAction.swift in Sources */,
 				4328E0281CFBE2C500E199AA /* CLKComplicationTemplate.swift in Sources */,
 				4328E01E1CFBE25F00E199AA /* AddCarbsInterfaceController.swift in Sources */,
 				43846ADB1D91057000799272 /* ContextUpdatable.swift in Sources */,
-				43EA285F1D50ED3D001BC233 /* GlucoseTrend.swift in Sources */,
 				4328E0261CFBE2C500E199AA /* IdentifiableClass.swift in Sources */,
 				43027F0E1DFE0EC200C51989 /* NSNumberFormatter.swift in Sources */,
 				43027F0F1DFE0EC900C51989 /* HKUnit.swift in Sources */,
 				43CB2B2B1D924D450079823D /* WCSession.swift in Sources */,
 				43DE925A1C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */,
-				4328E0301CFBFAEB00E199AA /* NSTimeInterval.swift in Sources */,
 				43A9438E1B926B7B0051FA24 /* ComplicationController.swift in Sources */,
 				4328E01A1CFBE1DA00E199AA /* StatusInterfaceController.swift in Sources */,
-				43DE925D1C547A20001FFDE1 /* WatchContext.swift in Sources */,
 				435400351C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1313,28 +1435,39 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4F2C15831E0757E600E160D4 /* HKUnit.swift in Sources */,
 				4F526D621DF9D95200A04910 /* NSBundle.swift in Sources */,
 				4FC8C8021DEB943800A1452E /* NSUserDefaults+StatusExtension.swift in Sources */,
-				4F70C20B1DE8E9F4006380B7 /* GlucoseTrend.swift in Sources */,
-				4F526D5F1DF2459000A04910 /* HKUnit.swift in Sources */,
-				4F70C1FB1DE8E45E006380B7 /* NSTimeInterval.swift in Sources */,
-				4F70C1FA1DE8E42D006380B7 /* ReservoirVolumeHUDView.swift in Sources */,
-				4F70C1F91DE8E409006380B7 /* LoopStateView.swift in Sources */,
-				4F70C1F81DE8E403006380B7 /* LoopCompletionHUDView.swift in Sources */,
-				4F70C1F71DE8E3FD006380B7 /* LevelMaskView.swift in Sources */,
-				4F70C1F61DE8E3F1006380B7 /* BatteryLevelHUDView.swift in Sources */,
-				4F70C1F51DE8E3E9006380B7 /* BasalStateView.swift in Sources */,
-				4F70C1F41DE8E3E1006380B7 /* BasalRateHUDView.swift in Sources */,
 				4F70C2121DE900EA006380B7 /* StatusExtensionContext.swift in Sources */,
-				4F70C1F31DE8DF47006380B7 /* NSNumberFormatter.swift in Sources */,
-				4F70C1F21DE8DF3A006380B7 /* UIColor.swift in Sources */,
-				4F70C1F01DE8DF22006380B7 /* SensorDisplayable.swift in Sources */,
-				4F70C1EF1DE8DF15006380B7 /* HUDView.swift in Sources */,
-				4F70C1ED1DE8DEDA006380B7 /* GlucoseHUDView.swift in Sources */,
 				4F70C1E11DE8DCA7006380B7 /* StatusViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4F7528861DFE1DC600C322D6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4FF4D0F91E17268800846527 /* IdentifiableClass.swift in Sources */,
+				4FF4D0F81E1725B000846527 /* NibLoadable.swift in Sources */,
+				4F7528AA1DFE215100C322D6 /* HKUnit.swift in Sources */,
+				4F7528A91DFE212600C322D6 /* GlucoseTrend.swift in Sources */,
+				4F7528A71DFE20CE00C322D6 /* SensorDisplayable.swift in Sources */,
+				4F7528A81DFE20CE00C322D6 /* NSNumberFormatter.swift in Sources */,
+				4F2C15931E09BF2C00E160D4 /* HUDView.swift in Sources */,
+				4F7528A51DFE208C00C322D6 /* NSTimeInterval.swift in Sources */,
+				4F7528A41DFE204900C322D6 /* UIColor.swift in Sources */,
+				4F7528A11DFE200B00C322D6 /* BasalStateView.swift in Sources */,
+				4F7528A21DFE200B00C322D6 /* LevelMaskView.swift in Sources */,
+				4F7528A01DFE1F9D00C322D6 /* LoopStateView.swift in Sources */,
+				4F75289A1DFE1F6000C322D6 /* BasalRateHUDView.swift in Sources */,
+				4F75289B1DFE1F6000C322D6 /* BatteryLevelHUDView.swift in Sources */,
+				4F75289C1DFE1F6000C322D6 /* GlucoseHUDView.swift in Sources */,
+				4F75289D1DFE1F6000C322D6 /* BaseHUDView.swift in Sources */,
+				4F75289E1DFE1F6000C322D6 /* LoopCompletionHUDView.swift in Sources */,
+				4F75289F1DFE1F6000C322D6 /* ReservoirVolumeHUDView.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -1358,6 +1491,16 @@
 			target = 4F70C1DB1DE8DCA7006380B7 /* Loop Status Extension */;
 			targetProxy = 4F70C1E61DE8DCA7006380B7 /* PBXContainerItemProxy */;
 		};
+		4F7528971DFE1ED400C322D6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4F75288A1DFE1DC600C322D6 /* LoopUI */;
+			targetProxy = 4F7528961DFE1ED400C322D6 /* PBXContainerItemProxy */;
+		};
+		4F7528991DFE1ED800C322D6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4F75288A1DFE1DC600C322D6 /* LoopUI */;
+			targetProxy = 4F7528981DFE1ED800C322D6 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -1529,7 +1672,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 9BBUN8YXGG;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
@@ -1550,7 +1693,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 9BBUN8YXGG;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
@@ -1748,6 +1891,59 @@
 			};
 			name = Release;
 		};
+		4F7528901DFE1DC600C322D6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = LoopUI/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.Loop.LoopUI;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 3.0;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		4F7528911DFE1DC600C322D6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = LoopUI/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.Loop.LoopUI;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -1814,6 +2010,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		4F7528921DFE1DC600C322D6 /* Build configuration list for PBXNativeTarget "LoopUI" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4F7528901DFE1DC600C322D6 /* Debug */,
+				4F7528911DFE1DC600C322D6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 43776F841B8022E90074EA36 /* Project object */;
diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index 7389695acf..09ca7666af 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" 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="11542" systemVersion="16B2657" 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="11161"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,23 +15,26 @@
             <objects>
                 <tableViewController id="4cb-Yq-02o" customClass="SettingsTableViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="MhB-bL-wBN">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <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" id="vah-ss-3Ud" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="120" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="56" 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">
-                                    <frame key="frameInset" width="320" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moR-fS-DWR">
+                                            <rect key="frame" x="8" y="8" width="302" height="27.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>
-                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="guo-4Z-RoO"/>
+                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="guo-4Z-RoO">
+                                            <rect key="frame" x="318" y="6.5" width="51" height="31"/>
+                                        </switch>
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="moR-fS-DWR" firstAttribute="leading" secondItem="D0A-EB-kmz" secondAttribute="leadingMargin" id="3Zc-7R-Uft"/>
@@ -46,21 +51,21 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ConfigTableViewCell" textLabel="5TX-kX-nBo" detailTextLabel="m9c-SQ-djE" style="IBUITableViewCellStyleValue1" id="0EG-OG-YuT">
-                                <rect key="frame" x="0.0" y="164" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="100" 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">
-                                    <frame key="frameInset" width="287" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Pump ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5TX-kX-nBo">
-                                            <frame key="frameInset" minX="15" minY="11" width="65" height="21"/>
+                                            <rect key="frame" x="15" y="11" width="65" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <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" multipleTouchEnabled="YES" contentMode="left" text="Tap to set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="m9c-SQ-djE">
-                                            <frame key="frameInset" minX="209" minY="11" width="76" height="21"/>
+                                            <rect key="frame" x="264" y="11" width="76" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -94,11 +99,14 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DEVICES" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DyC-Sv-qP8">
+                            <rect key="frame" x="15" y="20" width="55" height="16"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" red="0.43137254901960786" green="0.43137254901960786" blue="0.45098039215686275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="onC-e2-eI7"/>
+                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="onC-e2-eI7">
+                            <rect key="frame" x="572" y="18" width="20" height="20"/>
+                        </activityIndicatorView>
                     </subviews>
                     <constraints>
                         <constraint firstItem="DyC-Sv-qP8" firstAttribute="leading" secondItem="ywS-mm-GoX" secondAttribute="leadingMargin" constant="7" id="Lrm-2T-snm"/>
@@ -115,29 +123,32 @@
             <objects>
                 <tableViewController title="Predicted Glucose" hidesBottomBarWhenPushed="YES" id="PA3-sP-cWY" customClass="PredictionTableViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="Hji-tK-Uch">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChartTableViewCell" rowHeight="270" id="mQk-9D-0ub" customClass="ChartTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="92" width="320" height="270"/>
+                                <rect key="frame" x="0.0" y="28" width="375" height="270"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mQk-9D-0ub" id="B1i-Pw-wSw">
-                                    <frame key="frameInset" width="320" height="269"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="269"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FBL-RL-faM" customClass="ChartContentView" customModule="Loop" customModuleProvider="target">
+                                            <rect key="frame" x="0.0" y="26" 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.5"/>
                                             <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"/>
                                             <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.5" y="8" width="149.5" height="18"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -162,18 +173,20 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PredictionInputEffectTableViewCell" rowHeight="64" id="Xc2-a9-ojZ" customClass="PredictionInputEffectTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="362" width="320" height="64"/>
+                                <rect key="frame" x="0.0" y="298" width="375" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xc2-a9-ojZ" id="a4h-tq-Rnl">
-                                    <frame key="frameInset" width="320" height="63"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
                                     <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="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="d6m-qV-wWi">
+                                            <rect key="frame" x="8" y="30.5" width="359" height="25"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -194,19 +207,23 @@
                                 </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">
-                                <rect key="frame" x="0.0" y="426" width="320" height="64"/>
+                                <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">
-                                    <frame key="frameInset" width="320" height="63"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
                                     <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="295" 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>
-                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hkb-xr-vtN"/>
+                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hkb-xr-vtN">
+                                            <rect key="frame" x="311" y="16.5" width="51" height="31"/>
+                                        </switch>
                                         <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="30.5" width="295" height="25"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -265,248 +282,15 @@
             <objects>
                 <tableViewController id="1zR-tC-i50" customClass="StatusTableViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="Rg0-f1-ZWM">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <view key="tableHeaderView" contentMode="scaleToFill" id="rhv-td-a2w">
-                            <rect key="frame" x="0.0" y="64" width="320" height="70"/>
+                            <rect key="frame" x="0.0" y="64" width="375" height="70"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="bJ9-Vd-YnA">
-                                    <subviews>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H3C-gh-Vum" customClass="LoopCompletionHUDView" customModule="Loop" customModuleProvider="target">
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 min ago" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="krM-Ky-OTb">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="agu-6n-4Lf" customClass="LoopStateView" customModule="Loop" customModuleProvider="target">
-                                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="44" id="47S-dl-aQ5"/>
-                                                        <constraint firstAttribute="width" secondItem="agu-6n-4Lf" secondAttribute="height" multiplier="1:1" id="8BL-j6-GYN"/>
-                                                        <constraint firstAttribute="height" constant="44" id="l7p-V3-mbB"/>
-                                                    </constraints>
-                                                    <variation key="default">
-                                                        <mask key="constraints">
-                                                            <exclude reference="8BL-j6-GYN"/>
-                                                        </mask>
-                                                    </variation>
-                                                </view>
-                                            </subviews>
-                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration">
-                                                <accessibilityTraits key="traits" none="YES"/>
-                                                <bool key="isElement" value="YES"/>
-                                            </accessibility>
-                                            <constraints>
-                                                <constraint firstItem="agu-6n-4Lf" firstAttribute="centerX" secondItem="H3C-gh-Vum" secondAttribute="centerX" id="8cU-Gb-Zpf"/>
-                                                <constraint firstAttribute="bottom" secondItem="krM-Ky-OTb" secondAttribute="bottom" id="JM7-AC-KBR"/>
-                                                <constraint firstAttribute="trailing" secondItem="krM-Ky-OTb" secondAttribute="trailing" id="NDV-Re-Y3b"/>
-                                                <constraint firstItem="agu-6n-4Lf" firstAttribute="top" secondItem="H3C-gh-Vum" secondAttribute="top" constant="8" id="efB-rc-gbh"/>
-                                                <constraint firstItem="krM-Ky-OTb" firstAttribute="leading" secondItem="H3C-gh-Vum" secondAttribute="leading" id="j3q-rb-fQ6"/>
-                                                <constraint firstItem="krM-Ky-OTb" firstAttribute="top" secondItem="agu-6n-4Lf" secondAttribute="bottom" constant="4" id="xQP-Oc-aqh"/>
-                                            </constraints>
-                                            <connections>
-                                                <outlet property="caption" destination="krM-Ky-OTb" id="iQg-DA-wMW"/>
-                                                <outlet property="loopStateView" destination="agu-6n-4Lf" id="rzj-uy-95k"/>
-                                            </connections>
-                                        </view>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hJo-df-An0" customClass="GlucoseHUDView" customModule="Loop" customModuleProvider="target">
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKc-Kc-dgR">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                    <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" text="mmol/L ↗︎" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kbE-jN-1cR">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                                                    <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="252" text="399" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="01f-Du-MVi">
-                                                    <fontDescription key="fontDescription" type="system" weight="light" pointSize="27"/>
-                                                    <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="!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nps-jD-4lb">
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="18" id="FG3-dI-VYg"/>
-                                                        <constraint firstAttribute="width" constant="18" id="emP-bu-bja"/>
-                                                    </constraints>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration" label="Glucose">
-                                                <bool key="isElement" value="YES"/>
-                                            </accessibility>
-                                            <constraints>
-                                                <constraint firstAttribute="trailing" secondItem="Nps-jD-4lb" secondAttribute="trailing" id="5OT-1d-znT"/>
-                                                <constraint firstItem="DKc-Kc-dgR" firstAttribute="top" secondItem="kbE-jN-1cR" secondAttribute="bottom" constant="1" id="9cW-4R-GGV"/>
-                                                <constraint firstAttribute="trailing" secondItem="01f-Du-MVi" secondAttribute="trailing" id="EbP-QZ-v2O"/>
-                                                <constraint firstItem="DKc-Kc-dgR" firstAttribute="leading" secondItem="hJo-df-An0" secondAttribute="leading" id="LaF-v9-myA"/>
-                                                <constraint firstItem="01f-Du-MVi" firstAttribute="leading" secondItem="hJo-df-An0" secondAttribute="leading" id="U9a-jl-mu7"/>
-                                                <constraint firstItem="Nps-jD-4lb" firstAttribute="top" secondItem="hJo-df-An0" secondAttribute="top" constant="6" id="Wbe-rN-XLL"/>
-                                                <constraint firstItem="01f-Du-MVi" firstAttribute="top" secondItem="hJo-df-An0" secondAttribute="top" constant="8" id="axM-gE-UZC"/>
-                                                <constraint firstAttribute="trailing" secondItem="kbE-jN-1cR" secondAttribute="trailing" id="mtr-Xt-FOr"/>
-                                                <constraint firstItem="kbE-jN-1cR" firstAttribute="leading" secondItem="hJo-df-An0" secondAttribute="leading" id="nOa-rB-64f"/>
-                                                <constraint firstAttribute="trailing" secondItem="DKc-Kc-dgR" secondAttribute="trailing" id="quK-zK-YMg"/>
-                                                <constraint firstItem="kbE-jN-1cR" firstAttribute="top" secondItem="01f-Du-MVi" secondAttribute="bottom" constant="-1" id="x4b-cC-yX5"/>
-                                                <constraint firstAttribute="bottom" secondItem="DKc-Kc-dgR" secondAttribute="bottom" id="ygo-QQ-xlW"/>
-                                            </constraints>
-                                            <connections>
-                                                <outlet property="alertLabel" destination="Nps-jD-4lb" id="UQv-FW-Ut3"/>
-                                                <outlet property="caption" destination="DKc-Kc-dgR" id="8HE-Yf-fpz"/>
-                                                <outlet property="glucoseLabel" destination="01f-Du-MVi" id="XKI-xs-Avm"/>
-                                                <outlet property="unitLabel" destination="kbE-jN-1cR" id="xgn-g1-Ovf"/>
-                                            </connections>
-                                        </view>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BEG-xe-e6y" customClass="BasalRateHUDView" customModule="Loop" customModuleProvider="target">
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-0.85 U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xq9-7P-H39">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                                                    <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="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wkb-m1-PVZ">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AbR-sM-aVG" customClass="BasalStateView" customModule="Loop" customModuleProvider="target">
-                                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="44" id="ReE-Co-PMQ"/>
-                                                    </constraints>
-                                                </view>
-                                            </subviews>
-                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration" label="Net Basal Rate">
-                                                <bool key="isElement" value="YES"/>
-                                            </accessibility>
-                                            <constraints>
-                                                <constraint firstAttribute="trailing" secondItem="Wkb-m1-PVZ" secondAttribute="trailing" id="20s-OF-j7K"/>
-                                                <constraint firstItem="AbR-sM-aVG" firstAttribute="top" secondItem="BEG-xe-e6y" secondAttribute="top" constant="8" id="5Un-T7-Hcy"/>
-                                                <constraint firstItem="Wkb-m1-PVZ" firstAttribute="top" secondItem="Xq9-7P-H39" secondAttribute="bottom" constant="1" id="5rR-ne-019"/>
-                                                <constraint firstItem="Xq9-7P-H39" firstAttribute="top" secondItem="AbR-sM-aVG" secondAttribute="bottom" constant="3" id="HHd-OV-lqu"/>
-                                                <constraint firstItem="Xq9-7P-H39" firstAttribute="leading" secondItem="BEG-xe-e6y" secondAttribute="leading" id="Hff-S0-y4l"/>
-                                                <constraint firstItem="Xq9-7P-H39" firstAttribute="trailing" secondItem="BEG-xe-e6y" secondAttribute="trailing" id="NeL-I4-N2U"/>
-                                                <constraint firstAttribute="bottom" secondItem="Wkb-m1-PVZ" secondAttribute="bottom" id="YV3-BA-seT"/>
-                                                <constraint firstItem="Wkb-m1-PVZ" firstAttribute="leading" secondItem="BEG-xe-e6y" secondAttribute="leading" id="rjW-ea-E2r"/>
-                                                <constraint firstItem="AbR-sM-aVG" firstAttribute="centerX" secondItem="BEG-xe-e6y" secondAttribute="centerX" id="x2I-Nj-Lqi"/>
-                                            </constraints>
-                                            <connections>
-                                                <outlet property="basalRateLabel" destination="Xq9-7P-H39" id="bex-Au-bts"/>
-                                                <outlet property="basalStateView" destination="AbR-sM-aVG" id="boQ-h8-sFZ"/>
-                                                <outlet property="caption" destination="Wkb-m1-PVZ" id="fks-Sj-emN"/>
-                                            </connections>
-                                        </view>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uVa-hu-HBZ" customClass="ReservoirVolumeHUDView" customModule="Loop" customModuleProvider="target">
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TfZ-En-Kls">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GZe-78-E6L">
-                                                    <subviews>
-                                                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="reservoir" translatesAutoresizingMaskIntoConstraints="NO" id="VyJ-Td-YSU"/>
-                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mj6-Le-QLM" customClass="LevelMaskView" customModule="Loop" customModuleProvider="target">
-                                                            <userDefinedRuntimeAttributes>
-                                                                <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="reservoir_mask"/>
-                                                            </userDefinedRuntimeAttributes>
-                                                        </view>
-                                                    </subviews>
-                                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <constraints>
-                                                        <constraint firstItem="VyJ-Td-YSU" firstAttribute="leading" secondItem="GZe-78-E6L" secondAttribute="leading" id="6xU-89-LM0"/>
-                                                        <constraint firstAttribute="width" constant="44" id="CkT-Ov-JPo"/>
-                                                        <constraint firstAttribute="trailing" secondItem="Mj6-Le-QLM" secondAttribute="trailing" id="ERh-S3-GyG"/>
-                                                        <constraint firstAttribute="bottom" secondItem="Mj6-Le-QLM" secondAttribute="bottom" id="HyU-xh-Qf5"/>
-                                                        <constraint firstItem="Mj6-Le-QLM" firstAttribute="leading" secondItem="GZe-78-E6L" secondAttribute="leading" id="Rel-8J-aqt"/>
-                                                        <constraint firstItem="VyJ-Td-YSU" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="top" id="dSI-Jr-N1o"/>
-                                                        <constraint firstAttribute="trailing" secondItem="VyJ-Td-YSU" secondAttribute="trailing" id="iQb-tc-SYd"/>
-                                                        <constraint firstItem="Mj6-Le-QLM" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="top" constant="5" id="iQl-1V-Rh0"/>
-                                                        <constraint firstAttribute="height" constant="44" id="rkL-YZ-2qd"/>
-                                                        <constraint firstAttribute="bottom" secondItem="VyJ-Td-YSU" secondAttribute="bottom" id="xAR-JK-8XL"/>
-                                                    </constraints>
-                                                </view>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="44U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I7M-3l-Pf0">
-                                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration" label="Reservoir Volume">
-                                                <bool key="isElement" value="YES"/>
-                                            </accessibility>
-                                            <constraints>
-                                                <constraint firstItem="TfZ-En-Kls" firstAttribute="leading" secondItem="uVa-hu-HBZ" secondAttribute="leading" id="95H-Dr-Ehg"/>
-                                                <constraint firstItem="I7M-3l-Pf0" firstAttribute="centerY" secondItem="uVa-hu-HBZ" secondAttribute="centerY" id="OdE-yS-JL2"/>
-                                                <constraint firstAttribute="trailing" secondItem="TfZ-En-Kls" secondAttribute="trailing" id="fAL-fC-zik"/>
-                                                <constraint firstItem="GZe-78-E6L" firstAttribute="centerX" secondItem="uVa-hu-HBZ" secondAttribute="centerX" id="qSH-zd-WBL"/>
-                                                <constraint firstItem="TfZ-En-Kls" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="bottom" constant="3" id="ruz-pB-ZfP"/>
-                                                <constraint firstItem="GZe-78-E6L" firstAttribute="top" secondItem="uVa-hu-HBZ" secondAttribute="top" constant="9" id="t3Y-xH-FUO"/>
-                                                <constraint firstAttribute="bottom" secondItem="TfZ-En-Kls" secondAttribute="bottom" id="w81-hl-byv"/>
-                                                <constraint firstItem="I7M-3l-Pf0" firstAttribute="centerX" secondItem="uVa-hu-HBZ" secondAttribute="centerX" id="wVv-fP-p0K"/>
-                                            </constraints>
-                                            <connections>
-                                                <outlet property="caption" destination="TfZ-En-Kls" id="PiD-oF-kkF"/>
-                                                <outlet property="levelMaskView" destination="Mj6-Le-QLM" id="6F7-1I-zao"/>
-                                                <outlet property="volumeLabel" destination="I7M-3l-Pf0" id="lXd-qd-m3B"/>
-                                            </connections>
-                                        </view>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ecE-wE-iZx" customClass="BatteryLevelHUDView" customModule="Loop" customModuleProvider="target">
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaA-uX-OgX">
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jjc-jK-Vci">
-                                                    <subviews>
-                                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="battery" translatesAutoresizingMaskIntoConstraints="NO" id="b1s-XV-TWG"/>
-                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lzt-pC-IWF" customClass="LevelMaskView" customModule="Loop" customModuleProvider="target">
-                                                            <userDefinedRuntimeAttributes>
-                                                                <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="battery_mask"/>
-                                                            </userDefinedRuntimeAttributes>
-                                                        </view>
-                                                    </subviews>
-                                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="bottom" secondItem="lzt-pC-IWF" secondAttribute="bottom" id="0ws-od-exO"/>
-                                                        <constraint firstAttribute="width" constant="44" id="Aa9-jZ-kHQ"/>
-                                                        <constraint firstItem="lzt-pC-IWF" firstAttribute="leading" secondItem="Jjc-jK-Vci" secondAttribute="leading" id="Nzy-J6-c1N"/>
-                                                        <constraint firstItem="b1s-XV-TWG" firstAttribute="centerX" secondItem="Jjc-jK-Vci" secondAttribute="centerX" id="bja-Pv-F38"/>
-                                                        <constraint firstItem="b1s-XV-TWG" firstAttribute="centerY" secondItem="Jjc-jK-Vci" secondAttribute="centerY" id="fQm-zs-dL6"/>
-                                                        <constraint firstAttribute="height" constant="44" id="g6p-uA-6qO"/>
-                                                        <constraint firstAttribute="trailing" secondItem="lzt-pC-IWF" secondAttribute="trailing" id="rkE-mI-2cE"/>
-                                                        <constraint firstItem="lzt-pC-IWF" firstAttribute="top" secondItem="Jjc-jK-Vci" secondAttribute="top" constant="2" id="yY9-um-40k"/>
-                                                    </constraints>
-                                                </view>
-                                            </subviews>
-                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration" label="Battery Level">
-                                                <bool key="isElement" value="YES"/>
-                                            </accessibility>
-                                            <constraints>
-                                                <constraint firstItem="LaA-uX-OgX" firstAttribute="top" secondItem="Jjc-jK-Vci" secondAttribute="bottom" constant="3" id="9Nu-VX-htt"/>
-                                                <constraint firstAttribute="bottom" secondItem="LaA-uX-OgX" secondAttribute="bottom" id="C7U-r6-wZ8"/>
-                                                <constraint firstAttribute="trailing" secondItem="LaA-uX-OgX" secondAttribute="trailing" id="I8w-uy-w4L"/>
-                                                <constraint firstItem="Jjc-jK-Vci" firstAttribute="centerX" secondItem="ecE-wE-iZx" secondAttribute="centerX" id="L1q-wp-a8Q"/>
-                                                <constraint firstItem="LaA-uX-OgX" firstAttribute="leading" secondItem="ecE-wE-iZx" secondAttribute="leading" id="Onq-kn-0ej"/>
-                                                <constraint firstItem="Jjc-jK-Vci" firstAttribute="top" secondItem="ecE-wE-iZx" secondAttribute="top" constant="9" id="q5y-ys-POX"/>
-                                            </constraints>
-                                            <connections>
-                                                <outlet property="caption" destination="LaA-uX-OgX" id="eRw-RI-35H"/>
-                                                <outlet property="levelMaskView" destination="lzt-pC-IWF" id="XdP-pj-Dbo"/>
-                                            </connections>
-                                        </view>
-                                    </subviews>
+                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="bJ9-Vd-YnA" customClass="HUDView" customModule="LoopUI">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
                                 </stackView>
                             </subviews>
                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -519,21 +303,24 @@
                         </view>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TitleSubtitleTableViewCell" id="zTq-QB-XNu" customClass="TitleSubtitleTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="162" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="98" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zTq-QB-XNu" id="vD6-31-qVz">
-                                    <frame key="frameInset" width="320" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vSf-ph-T9I">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <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"/>
                                             <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"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -562,23 +349,26 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ChartTableViewCell" rowHeight="200" id="FEV-fX-i48" customClass="ChartTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="206" width="320" height="200"/>
+                                <rect key="frame" x="0.0" y="142" width="375" height="200"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FEV-fX-i48" id="lS6-Qa-Lw7">
-                                    <frame key="frameInset" width="320" height="200"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
                                     <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="59.5" 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.5" y="8" width="149.5" 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="ChartContentView" customModule="Loop" customModuleProvider="target">
+                                            <rect key="frame" x="0.0" y="26" width="375" height="174"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </view>
                                     </subviews>
@@ -633,11 +423,7 @@
                     <navigationItem key="navigationItem" title="Status" id="3kU-n2-fha"/>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
-                        <outlet property="basalRateHUD" destination="BEG-xe-e6y" id="VLC-vR-18C"/>
-                        <outlet property="batteryLevelHUD" destination="ecE-wE-iZx" id="fCk-ia-gB2"/>
-                        <outlet property="glucoseHUD" destination="hJo-df-An0" id="NHa-2o-8xb"/>
-                        <outlet property="loopCompletionHUD" destination="H3C-gh-Vum" id="wJq-DI-Yo2"/>
-                        <outlet property="reservoirVolumeHUD" destination="uVa-hu-HBZ" id="ZN7-sc-NjA"/>
+                        <outlet property="hudView" destination="bJ9-Vd-YnA" id="sXq-JU-4Uv"/>
                         <segue destination="Ykd-EQ-C1J" kind="show" identifier="CarbEntryTableViewController" id="cwl-Xe-ims"/>
                         <segue destination="a8v-ef-RZZ" kind="show" identifier="InsulinDeliveryTableViewController" id="TZE-My-lqn"/>
                         <segue destination="PA3-sP-cWY" kind="show" identifier="PredictionTableViewController" id="1XC-sI-PK0"/>
@@ -652,31 +438,34 @@
             <objects>
                 <tableViewController id="WhH-Np-jCn" customClass="BolusViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="s63-Nc-tNg">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <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"/>
                         <sections>
                             <tableViewSection id="7eu-Ys-7GW">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="DoN-m5-O7j">
-                                        <rect key="frame" x="0.0" y="99" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="35" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DoN-m5-O7j" id="3OB-7U-Jvb">
-                                            <frame key="frameInset" width="320" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <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="20.5" width="196.5" 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="U" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVz-dr-xLU">
+                                                    <rect key="frame" x="347.5" y="20.5" width="12.5" height="20.5"/>
                                                     <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.5" y="43.5" width="120" height="0.0"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="120" id="1mG-Iv-efE"/>
                                                     </constraints>
@@ -701,18 +490,20 @@
                                         </accessibility>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="us0-UE-Wqz">
-                                        <rect key="frame" x="0.0" y="143" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="79" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="us0-UE-Wqz" id="2fI-OE-GLU">
-                                            <frame key="frameInset" width="320" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <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="20.5" width="196.5" 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>
                                                 <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.5" y="9.5" width="120" height="34"/>
                                                     <accessibility key="accessibilityConfiguration" label="Bolus Amount"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="120" id="hZ2-Aq-FHT"/>
@@ -724,6 +515,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.5" y="20.5" width="12.5" height="20.5"/>
                                                     <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"/>
@@ -742,13 +534,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="efV-tT-gC9">
-                                        <rect key="frame" x="0.0" y="187" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="123" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="efV-tT-gC9" id="nq8-dv-ceA">
-                                            <frame key="frameInset" width="320" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <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="27.5"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
                                                     <state key="normal" title="Deliver"/>
                                                     <connections>
@@ -801,7 +594,7 @@
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="tBa-QS-CwE">
-                        <rect key="frame" x="0.0" y="524" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="623" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </toolbar>
                     <connections>
@@ -878,12 +671,8 @@
         </scene>
     </scenes>
     <resources>
-        <image name="battery" width="26" height="44"/>
-        <image name="battery_mask" width="16" height="42"/>
         <image name="bolus" width="22" height="24"/>
         <image name="carbs" width="22" height="23"/>
-        <image name="reservoir" width="28" height="44"/>
-        <image name="reservoir_mask" width="28" height="39"/>
         <image name="settings" width="25" height="40"/>
         <image name="workout" width="30" height="29"/>
     </resources>
diff --git a/Loop/Info.plist b/Loop/Info.plist
index 9b04e6c5c6..9709838138 100644
--- a/Loop/Info.plist
+++ b/Loop/Info.plist
@@ -2,6 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(MAIN_APP_BUNDLE_IDENTIFIER)</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index 495ef0333e..4dad875a39 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -14,6 +14,7 @@ import GlucoseKit
 import HealthKit
 import InsulinKit
 import LoopKit
+import LoopUI
 import MinimedKit
 import NightscoutUploadKit
 import RileyLinkKit
diff --git a/Loop/Managers/DoseMath.swift b/Loop/Managers/DoseMath.swift
index a7eec3743e..77a85684f0 100644
--- a/Loop/Managers/DoseMath.swift
+++ b/Loop/Managers/DoseMath.swift
@@ -162,7 +162,7 @@ struct DoseMath {
         // Use between to opt-out of the override.
         let minGlucoseTargets = glucoseTargetRange.between(start: minGlucose.startDate, end: minGlucose.startDate).first!.value
 
-        guard minGlucose.quantity.doubleValue(for: glucoseTargetRange.unit) >= minGlucoseTargets.minValue else {
+        guard minGlucose.quantity.doubleValue(for: glucoseTargetRange.unit) >= 80 else {
             return 0
         }
 
diff --git a/Loop/Managers/StatusChartManager.swift b/Loop/Managers/StatusChartManager.swift
index ed942f7bed..f708e75f1f 100644
--- a/Loop/Managers/StatusChartManager.swift
+++ b/Loop/Managers/StatusChartManager.swift
@@ -89,11 +89,11 @@ final class StatusChartsManager {
     var glucoseValues: [GlucoseValue] = [] {
         didSet {
             let unitString = glucoseUnit.glucoseUnitDisplayString
-
+            let glucoseFormatter = NumberFormatter.glucoseFormatter(for: glucoseUnit)
             glucosePoints = glucoseValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString)
+                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: glucoseFormatter)
                 )
             }
         }
@@ -115,11 +115,12 @@ final class StatusChartsManager {
     var predictedGlucoseValues: [GlucoseValue] = [] {
         didSet {
             let unitString = glucoseUnit.glucoseUnitDisplayString
+            let glucoseFormatter = NumberFormatter.glucoseFormatter(for: glucoseUnit)
 
             predictedGlucosePoints = predictedGlucoseValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: integerFormatter)
+                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: glucoseFormatter)
                 )
             }
         }
@@ -128,11 +129,12 @@ final class StatusChartsManager {
     var alternatePredictedGlucoseValues: [GlucoseValue] = [] {
         didSet {
             let unitString = glucoseUnit.glucoseUnitDisplayString
+            let glucoseFormatter = NumberFormatter.glucoseFormatter(for: glucoseUnit)
 
             alternatePredictedGlucosePoints = alternatePredictedGlucoseValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: integerFormatter)
+                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: glucoseFormatter)
                 )
             }
         }
diff --git a/Loop/Managers/StatusExtensionDataManager.swift b/Loop/Managers/StatusExtensionDataManager.swift
index 6eebba7976..daa72eede0 100644
--- a/Loop/Managers/StatusExtensionDataManager.swift
+++ b/Loop/Managers/StatusExtensionDataManager.swift
@@ -61,7 +61,7 @@ final class StatusExtensionDataManager {
                 context.batteryPercentage = 0.25
                 context.reservoir = ReservoirContext(startDate: Date(), unitVolume: 42.5, capacity: 200)
                 context.netBasal = NetBasalContext(rate: 2.1, percentage: 0.6, startDate: Date() - TimeInterval(250))
-                context.eventualGlucose = HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 119.123)
+                context.eventualGlucose = HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 89.123)
                     .doubleValue(for: preferredUnit)
             #endif
 
@@ -91,8 +91,8 @@ final class StatusExtensionDataManager {
                     capacity: capacity)
             }
             
-            if let batteryPercentage = dataManager.latestPumpStatusFromMySentry?.batteryRemainingPercent {
-                context.batteryPercentage = Double(batteryPercentage) / 100.0
+            if let batteryPercentage = dataManager.pumpBatteryChargeRemaining {
+                context.batteryPercentage = batteryPercentage
             }
         
             if let lastPoint = predictedGlucose?.last {
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
index 37c98a3ead..b00c038fb0 100644
--- a/Loop/Managers/WatchDataManager.swift
+++ b/Loop/Managers/WatchDataManager.swift
@@ -118,7 +118,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
                     context.maxBolus = maxBolus
 
                     if let trend = self.deviceDataManager.sensorInfo?.trendType {
-                        context.glucoseTrend = trend
+                        context.glucoseTrendRawValue = trend.rawValue
                     }
 
                     completionHandler(context)
diff --git a/Loop/Models/Glucose.swift b/Loop/Models/Glucose.swift
index 0ae2ca0cb1..ddc1c6848a 100644
--- a/Loop/Models/Glucose.swift
+++ b/Loop/Models/Glucose.swift
@@ -7,15 +7,16 @@
 //
 
 import Foundation
+import LoopUI
 import xDripG5
 
 
 extension Glucose: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         return state == .ok && status == .ok
     }
 
-    var stateDescription: String {
+    public var stateDescription: String {
         let status: String
         switch self.status {
         case .ok:
@@ -29,7 +30,7 @@ extension Glucose: SensorDisplayable {
         return String(format: "%1$@ %2$@", String(describing: state), status)
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: GlucoseTrend? {
         guard trend < Int(Int8.max) else {
             return nil
         }
@@ -52,7 +53,7 @@ extension Glucose: SensorDisplayable {
         }
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return true
     }
 }
diff --git a/Loop/Models/GlucoseG4.swift b/Loop/Models/GlucoseG4.swift
index 30df44498d..de8b64f0ac 100644
--- a/Loop/Models/GlucoseG4.swift
+++ b/Loop/Models/GlucoseG4.swift
@@ -10,6 +10,7 @@ import Foundation
 import G4ShareSpy
 import HealthKit
 import LoopKit
+import LoopUI
 
 
 extension GlucoseG4: GlucoseValue {
@@ -24,11 +25,11 @@ extension GlucoseG4: GlucoseValue {
 
 
 extension GlucoseG4: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         return glucose >= 20
     }
 
-    var stateDescription: String {
+    public var stateDescription: String {
         if isStateValid {
             return NSLocalizedString("OK", comment: "Sensor state description for the valid state")
         } else {
@@ -36,11 +37,11 @@ extension GlucoseG4: SensorDisplayable {
         }
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: GlucoseTrend? {
         return GlucoseTrend(rawValue: Int(trend))
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return true
     }
 }
diff --git a/Loop/Models/MySentryPumpStatusMessageBody.swift b/Loop/Models/MySentryPumpStatusMessageBody.swift
index 4ce3524ccd..f1f14dd392 100644
--- a/Loop/Models/MySentryPumpStatusMessageBody.swift
+++ b/Loop/Models/MySentryPumpStatusMessageBody.swift
@@ -7,11 +7,12 @@
 //
 
 import LoopKit
+import LoopUI
 import MinimedKit
 
 
 extension MySentryPumpStatusMessageBody: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         switch glucose {
         case .active, .off:
             return true
@@ -20,7 +21,7 @@ extension MySentryPumpStatusMessageBody: SensorDisplayable {
         }
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: LoopUI.GlucoseTrend? {
         guard case .active = glucose else {
             return nil
         }
@@ -39,7 +40,7 @@ extension MySentryPumpStatusMessageBody: SensorDisplayable {
         }
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return true
     }
 
diff --git a/Loop/Models/ShareGlucose+GlucoseKit.swift b/Loop/Models/ShareGlucose+GlucoseKit.swift
index 7aad5740e9..b40b2349fa 100644
--- a/Loop/Models/ShareGlucose+GlucoseKit.swift
+++ b/Loop/Models/ShareGlucose+GlucoseKit.swift
@@ -9,6 +9,7 @@
 import Foundation
 import HealthKit
 import LoopKit
+import LoopUI
 import ShareClient
 
 
@@ -24,15 +25,25 @@ extension ShareGlucose: GlucoseValue {
 
 
 extension ShareGlucose: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         return glucose >= 20
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: GlucoseTrend? {
         return GlucoseTrend(rawValue: Int(trend))
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return false
     }
 }
+
+extension SensorDisplayable {
+    public var stateDescription: String {
+        if isStateValid {
+            return NSLocalizedString("OK", comment: "Sensor state description for the valid state")
+        } else {
+            return NSLocalizedString("Needs Attention", comment: "Sensor state description for the non-valid state")
+        }
+    }
+}
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index ec995ffb83..94c3cb4ff8 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -12,6 +12,7 @@ import GlucoseKit
 import HealthKit
 import InsulinKit
 import LoopKit
+import LoopUI
 import SwiftCharts
 
 
@@ -759,18 +760,28 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     // MARK: - HUDs
 
-    @IBOutlet weak var loopCompletionHUD: LoopCompletionHUDView!
-
-    @IBOutlet weak var glucoseHUD: GlucoseHUDView! {
+    @IBOutlet weak var hudView: HUDView! {
         didSet {
             let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openCGMApp(_:)))
             glucoseHUD.addGestureRecognizer(tapGestureRecognizer)
-
+            
             if cgmAppURL != nil {
                 glucoseHUD.accessibilityHint = NSLocalizedString("Launches CGM app", comment: "Glucose HUD accessibility hint")
             }
         }
     }
+    
+    var loopCompletionHUD: LoopCompletionHUDView! {
+        get {
+            return hudView.loopCompletionHUD
+        }
+    }
+    
+    var glucoseHUD: GlucoseHUDView! {
+        get {
+            return hudView.glucoseHUD
+        }
+    }
 
     private var cgmAppURL: URL? {
         if let url = URL(string: "dexcomcgm://"), UIApplication.shared.canOpenURL(url) {
@@ -788,9 +799,21 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    @IBOutlet weak var basalRateHUD: BasalRateHUDView!
-
-    @IBOutlet weak var reservoirVolumeHUD: ReservoirVolumeHUDView!
-
-    @IBOutlet weak var batteryLevelHUD: BatteryLevelHUDView!
+    var basalRateHUD: BasalRateHUDView! {
+        get {
+            return hudView.basalRateHUD
+        }
+    }
+    
+    var reservoirVolumeHUD: ReservoirVolumeHUDView! {
+        get {
+            return hudView.reservoirVolumeHUD
+        }
+    }
+    
+    var batteryLevelHUD: BatteryLevelHUDView! {
+        get {
+            return hudView.batteryHUD
+        }
+    }
 }
diff --git a/Loop/Views/ButtonTableViewCell.xib b/Loop/Views/ButtonTableViewCell.xib
index 20b8f91ea5..1ea37bb871 100644
--- a/Loop/Views/ButtonTableViewCell.xib
+++ b/Loop/Views/ButtonTableViewCell.xib
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,11 +16,11 @@
             <rect key="frame" x="0.0" y="0.0" width="427" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QMd-B1-jne" id="T9r-tL-wAO">
-                <rect key="frame" x="0.0" y="0.0" width="427" height="43.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="427" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oI5-48-SHZ">
-                        <rect key="frame" x="181.5" y="8" width="64" height="27"/>
+                        <rect key="frame" x="182" y="8" width="64" height="27"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="64" id="hrG-HQ-FHS"/>
                         </constraints>
diff --git a/Loop/Assets.xcassets/battery/Contents.json b/LoopUI/Assets.xcassets/Contents.json
similarity index 100%
rename from Loop/Assets.xcassets/battery/Contents.json
rename to LoopUI/Assets.xcassets/Contents.json
diff --git a/Loop/Assets.xcassets/reservoir/Contents.json b/LoopUI/Assets.xcassets/battery/Contents.json
similarity index 100%
rename from Loop/Assets.xcassets/reservoir/Contents.json
rename to LoopUI/Assets.xcassets/battery/Contents.json
diff --git a/Loop/Assets.xcassets/battery/battery.imageset/Contents.json b/LoopUI/Assets.xcassets/battery/battery.imageset/Contents.json
similarity index 100%
rename from Loop/Assets.xcassets/battery/battery.imageset/Contents.json
rename to LoopUI/Assets.xcassets/battery/battery.imageset/Contents.json
diff --git a/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf b/LoopUI/Assets.xcassets/battery/battery.imageset/battery.pdf
similarity index 100%
rename from Loop/Assets.xcassets/battery/battery.imageset/battery.pdf
rename to LoopUI/Assets.xcassets/battery/battery.imageset/battery.pdf
diff --git a/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json b/LoopUI/Assets.xcassets/battery/battery_mask.imageset/Contents.json
similarity index 100%
rename from Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json
rename to LoopUI/Assets.xcassets/battery/battery_mask.imageset/Contents.json
diff --git a/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf b/LoopUI/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf
similarity index 100%
rename from Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf
rename to LoopUI/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf
diff --git a/LoopUI/Assets.xcassets/reservoir/Contents.json b/LoopUI/Assets.xcassets/reservoir/Contents.json
new file mode 100644
index 0000000000..da4a164c91
--- /dev/null
+++ b/LoopUI/Assets.xcassets/reservoir/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json b/LoopUI/Assets.xcassets/reservoir/reservoir.imageset/Contents.json
similarity index 100%
rename from Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json
rename to LoopUI/Assets.xcassets/reservoir/reservoir.imageset/Contents.json
diff --git a/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf b/LoopUI/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf
similarity index 100%
rename from Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf
rename to LoopUI/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json b/LoopUI/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json
similarity index 100%
rename from Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json
rename to LoopUI/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf b/LoopUI/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf
similarity index 100%
rename from Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf
rename to LoopUI/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf
diff --git a/Loop/Extensions/NSNumberFormatter.swift b/LoopUI/Extensions/NSNumberFormatter.swift
similarity index 56%
rename from Loop/Extensions/NSNumberFormatter.swift
rename to LoopUI/Extensions/NSNumberFormatter.swift
index c6092d8e3e..155738f3da 100644
--- a/Loop/Extensions/NSNumberFormatter.swift
+++ b/LoopUI/Extensions/NSNumberFormatter.swift
@@ -11,13 +11,11 @@ import HealthKit
 
 
 extension NumberFormatter {
-    static func glucoseFormatter(for unit: HKUnit) -> NumberFormatter {
+    public static func glucoseFormatter(for unit: HKUnit) -> NumberFormatter {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .decimal
-        numberFormatter.minimumFractionDigits = unit.preferredMinimumFractionDigits
-        numberFormatter.maximumSignificantDigits = 3
-        numberFormatter.usesSignificantDigits = true
-
+        numberFormatter.minimumFractionDigits = unit.preferredFractionDigits
+        numberFormatter.maximumFractionDigits = unit.preferredFractionDigits
         return numberFormatter
     }
 }
diff --git a/Loop/Extensions/UIColor.swift b/LoopUI/Extensions/UIColor.swift
similarity index 59%
rename from Loop/Extensions/UIColor.swift
rename to LoopUI/Extensions/UIColor.swift
index c3637671d8..414ffa7361 100644
--- a/Loop/Extensions/UIColor.swift
+++ b/LoopUI/Extensions/UIColor.swift
@@ -10,31 +10,31 @@ import UIKit
 
 
 extension UIColor {
-    @nonobjc static var tintColor: UIColor? = nil
+    @nonobjc public static var tintColor: UIColor? = nil
 
-    @nonobjc static let secondaryLabelColor = UIColor.HIGGrayColor()
+    @nonobjc public static let secondaryLabelColor = UIColor.HIGGrayColor()
 
-    @nonobjc static let cellBackgroundColor = UIColor(white: 239 / 255, alpha: 1)
+    @nonobjc public static let cellBackgroundColor = UIColor(white: 239 / 255, alpha: 1)
 
-    @nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1)
+    @nonobjc public static let gridColor = UIColor(white: 193 / 255, alpha: 1)
 
-    @nonobjc static let glucoseTintColor = UIColor(red: 0 / 255, green: 176 / 255, blue: 255 / 255, alpha: 1)
+    @nonobjc public static let glucoseTintColor = UIColor(red: 0 / 255, green: 176 / 255, blue: 255 / 255, alpha: 1)
 
-    @nonobjc static let IOBTintColor = UIColor.HIGOrangeColor()
+    @nonobjc public static let IOBTintColor = UIColor.HIGOrangeColor()
 
-    @nonobjc static let COBTintColor = UIColor(red: 99 / 255, green: 218 / 255, blue: 56 / 255, alpha: 1)
+    @nonobjc public static let COBTintColor = UIColor(red: 99 / 255, green: 218 / 255, blue: 56 / 255, alpha: 1)
 
-    @nonobjc static let doseTintColor = UIColor.HIGOrangeColor()
+    @nonobjc public static let doseTintColor = UIColor.HIGOrangeColor()
 
-    @nonobjc static let freshColor = UIColor.HIGGreenColor()
+    @nonobjc public static let freshColor = UIColor.HIGGreenColor()
 
-    @nonobjc static let agingColor = UIColor.HIGYellowColor()
+    @nonobjc public static let agingColor = UIColor.HIGYellowColor()
 
-    @nonobjc static let staleColor = UIColor.HIGRedColor()
+    @nonobjc public static let staleColor = UIColor.HIGRedColor()
 
-    @nonobjc static let unknownColor = UIColor(red: 198 / 255, green: 199 / 255, blue: 201 / 255, alpha: 1)
+    @nonobjc public static let unknownColor = UIColor(red: 198 / 255, green: 199 / 255, blue: 201 / 255, alpha: 1)
 
-    @nonobjc static let deleteColor = UIColor.HIGRedColor()
+    @nonobjc public static let deleteColor = UIColor.HIGRedColor()
 
     // MARK: - HIG colors
     // See: https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/
diff --git a/LoopUI/HUDView.xib b/LoopUI/HUDView.xib
new file mode 100644
index 0000000000..22535f225a
--- /dev/null
+++ b/LoopUI/HUDView.xib
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HUDView" customModule="LoopUI" customModuleProvider="target">
+            <connections>
+                <outlet property="basalRateHUD" destination="ER8-rD-rQQ" id="1Hu-Ee-jFf"/>
+                <outlet property="batteryHUD" destination="D8z-Jh-qbK" id="PEn-gQ-UM2"/>
+                <outlet property="glucoseHUD" destination="tdB-z2-3GU" id="h8y-lN-aoT"/>
+                <outlet property="loopCompletionHUD" destination="qKB-4b-keM" id="NDg-oZ-yys"/>
+                <outlet property="reservoirVolumeHUD" destination="4u2-jI-OVB" id="p9y-eS-wOE"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="3nj-AG-YgU">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qKB-4b-keM" customClass="LoopCompletionHUDView" customModule="LoopUI">
+                    <rect key="frame" x="0.0" y="0.0" width="75" height="70"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 min ago" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ohe-Du-2g4">
+                            <rect key="frame" x="0.0" y="56" width="75" height="14"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hzT-nz-NMJ" customClass="LoopStateView" customModule="LoopUI">
+                            <rect key="frame" x="16" y="8" width="44" height="44"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="44" id="JHr-vn-Fkf"/>
+                                <constraint firstAttribute="width" constant="44" id="OaG-Pa-1wh"/>
+                                <constraint firstAttribute="width" secondItem="hzT-nz-NMJ" secondAttribute="height" multiplier="1:1" id="PEc-Fn-xuC"/>
+                            </constraints>
+                            <variation key="default">
+                                <mask key="constraints">
+                                    <exclude reference="PEc-Fn-xuC"/>
+                                </mask>
+                            </variation>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" none="YES"/>
+                        <bool key="isElement" value="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="ohe-Du-2g4" secondAttribute="trailing" id="8Ot-uu-WzA"/>
+                        <constraint firstItem="hzT-nz-NMJ" firstAttribute="top" secondItem="qKB-4b-keM" secondAttribute="top" constant="8" id="9fr-Tv-3g5"/>
+                        <constraint firstItem="hzT-nz-NMJ" firstAttribute="centerX" secondItem="qKB-4b-keM" secondAttribute="centerX" id="9mu-5M-qzn"/>
+                        <constraint firstItem="ohe-Du-2g4" firstAttribute="leading" secondItem="qKB-4b-keM" secondAttribute="leading" id="X2C-P8-ghr"/>
+                        <constraint firstItem="ohe-Du-2g4" firstAttribute="top" secondItem="hzT-nz-NMJ" secondAttribute="bottom" constant="4" id="c9J-hs-2Mk"/>
+                        <constraint firstAttribute="bottom" secondItem="ohe-Du-2g4" secondAttribute="bottom" id="wqH-hA-wJ4"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="caption" destination="ohe-Du-2g4" id="FOQ-3m-d3n"/>
+                        <outlet property="loopStateView" destination="hzT-nz-NMJ" id="zBv-Mp-3vH"/>
+                    </connections>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tdB-z2-3GU" customClass="GlucoseHUDView" customModule="LoopUI">
+                    <rect key="frame" x="75" y="0.0" width="75" height="70"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r17-9s-fXB">
+                            <rect key="frame" x="0.0" y="56.5" width="75" height="13.5"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                            <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" text="mmol/L ↗︎" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vO0-XQ-bCc">
+                            <rect key="frame" x="0.0" y="39.5" width="75" height="16"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                            <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="252" text="399" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rxd-AO-0IC">
+                            <rect key="frame" x="0.0" y="8" width="75" height="32.5"/>
+                            <fontDescription key="fontDescription" type="system" weight="light" pointSize="27"/>
+                            <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="!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FMf-lo-K1y">
+                            <rect key="frame" x="57" y="6" width="18" height="18"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="18" id="J63-9h-1rd"/>
+                                <constraint firstAttribute="width" constant="18" id="JIz-iW-N39"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration" label="Glucose">
+                        <bool key="isElement" value="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="FMf-lo-K1y" secondAttribute="trailing" id="1hP-yq-f5b"/>
+                        <constraint firstItem="r17-9s-fXB" firstAttribute="leading" secondItem="tdB-z2-3GU" secondAttribute="leading" id="6oW-ou-sJg"/>
+                        <constraint firstItem="Rxd-AO-0IC" firstAttribute="top" secondItem="tdB-z2-3GU" secondAttribute="top" constant="8" id="BE6-wd-34a"/>
+                        <constraint firstAttribute="trailing" secondItem="vO0-XQ-bCc" secondAttribute="trailing" id="IGa-cv-1Sl"/>
+                        <constraint firstItem="vO0-XQ-bCc" firstAttribute="leading" secondItem="tdB-z2-3GU" secondAttribute="leading" id="Onj-lT-idp"/>
+                        <constraint firstAttribute="trailing" secondItem="r17-9s-fXB" secondAttribute="trailing" id="aFa-fI-oEv"/>
+                        <constraint firstItem="r17-9s-fXB" firstAttribute="top" secondItem="vO0-XQ-bCc" secondAttribute="bottom" constant="1" id="geS-pi-Re5"/>
+                        <constraint firstAttribute="bottom" secondItem="r17-9s-fXB" secondAttribute="bottom" id="i9w-O7-kjS"/>
+                        <constraint firstAttribute="trailing" secondItem="Rxd-AO-0IC" secondAttribute="trailing" id="nG7-BB-VlQ"/>
+                        <constraint firstItem="vO0-XQ-bCc" firstAttribute="top" secondItem="Rxd-AO-0IC" secondAttribute="bottom" constant="-1" id="sez-JI-AQs"/>
+                        <constraint firstItem="Rxd-AO-0IC" firstAttribute="leading" secondItem="tdB-z2-3GU" secondAttribute="leading" id="zSZ-59-q4x"/>
+                        <constraint firstItem="FMf-lo-K1y" firstAttribute="top" secondItem="tdB-z2-3GU" secondAttribute="top" constant="6" id="zWK-53-7bq"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="alertLabel" destination="FMf-lo-K1y" id="EXF-ed-8i7"/>
+                        <outlet property="caption" destination="r17-9s-fXB" id="8YE-2k-tq7"/>
+                        <outlet property="glucoseLabel" destination="Rxd-AO-0IC" id="u87-5F-e7J"/>
+                        <outlet property="unitLabel" destination="vO0-XQ-bCc" id="5Vp-9p-OlU"/>
+                    </connections>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ER8-rD-rQQ" customClass="BasalRateHUDView" customModule="LoopUI">
+                    <rect key="frame" x="150" y="0.0" width="75" height="70"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-0.85 U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JPB-Bd-oTz">
+                            <rect key="frame" x="0.0" y="41" width="75" height="14.5"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                            <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="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cCh-Ax-in5">
+                            <rect key="frame" x="0.0" y="56.5" width="75" height="13.5"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YLg-lj-Wuc" customClass="BasalStateView" customModule="LoopUI">
+                            <rect key="frame" x="16" y="8" width="44" height="30"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="44" id="Efd-Aa-N4k"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration" label="Net Basal Rate">
+                        <bool key="isElement" value="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="cCh-Ax-in5" secondAttribute="trailing" id="2Dk-hz-ziP"/>
+                        <constraint firstItem="JPB-Bd-oTz" firstAttribute="leading" secondItem="ER8-rD-rQQ" secondAttribute="leading" id="O1X-we-QUc"/>
+                        <constraint firstItem="JPB-Bd-oTz" firstAttribute="top" secondItem="YLg-lj-Wuc" secondAttribute="bottom" constant="3" id="Rf0-fP-95z"/>
+                        <constraint firstItem="cCh-Ax-in5" firstAttribute="top" secondItem="JPB-Bd-oTz" secondAttribute="bottom" constant="1" id="aeR-NZ-x09"/>
+                        <constraint firstAttribute="bottom" secondItem="cCh-Ax-in5" secondAttribute="bottom" id="b5V-bM-xFp"/>
+                        <constraint firstItem="JPB-Bd-oTz" firstAttribute="trailing" secondItem="ER8-rD-rQQ" secondAttribute="trailing" id="hTt-kA-r49"/>
+                        <constraint firstItem="YLg-lj-Wuc" firstAttribute="top" secondItem="ER8-rD-rQQ" secondAttribute="top" constant="8" id="iQX-0S-FyA"/>
+                        <constraint firstItem="cCh-Ax-in5" firstAttribute="leading" secondItem="ER8-rD-rQQ" secondAttribute="leading" id="pVd-ih-z7q"/>
+                        <constraint firstItem="YLg-lj-Wuc" firstAttribute="centerX" secondItem="ER8-rD-rQQ" secondAttribute="centerX" id="wC8-9u-ACz"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="basalRateLabel" destination="JPB-Bd-oTz" id="A1V-iu-cWh"/>
+                        <outlet property="basalStateView" destination="YLg-lj-Wuc" id="9zD-0O-LkB"/>
+                        <outlet property="caption" destination="cCh-Ax-in5" id="nVb-Dw-DsX"/>
+                    </connections>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4u2-jI-OVB" customClass="ReservoirVolumeHUDView" customModule="LoopUI">
+                    <rect key="frame" x="225" y="0.0" width="75" height="70"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gbz-Hi-J1V">
+                            <rect key="frame" x="0.0" y="56" width="75" height="14"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zel-C3-DXB">
+                            <rect key="frame" x="16" y="9" width="44" height="44"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="reservoir" translatesAutoresizingMaskIntoConstraints="NO" id="pIG-92-8Ul">
+                                    <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
+                                </imageView>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yoq-iO-9jA" customClass="LevelMaskView" customModule="LoopUI">
+                                    <rect key="frame" x="0.0" y="5" width="44" height="39"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="reservoir_mask"/>
+                                    </userDefinedRuntimeAttributes>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstItem="pIG-92-8Ul" firstAttribute="leading" secondItem="Zel-C3-DXB" secondAttribute="leading" id="5jS-nZ-GzJ"/>
+                                <constraint firstItem="pIG-92-8Ul" firstAttribute="top" secondItem="Zel-C3-DXB" secondAttribute="top" id="7di-nd-IEz"/>
+                                <constraint firstAttribute="width" constant="44" id="CuC-hz-Nsj"/>
+                                <constraint firstAttribute="trailing" secondItem="pIG-92-8Ul" secondAttribute="trailing" id="Nw8-ex-Tb6"/>
+                                <constraint firstAttribute="bottom" secondItem="Yoq-iO-9jA" secondAttribute="bottom" id="PBd-Cl-VzC"/>
+                                <constraint firstItem="Yoq-iO-9jA" firstAttribute="top" secondItem="Zel-C3-DXB" secondAttribute="top" constant="5" id="Uy7-Jz-vkH"/>
+                                <constraint firstAttribute="bottom" secondItem="pIG-92-8Ul" secondAttribute="bottom" id="eF2-0K-qvg"/>
+                                <constraint firstAttribute="height" constant="44" id="n49-It-BU0"/>
+                                <constraint firstItem="Yoq-iO-9jA" firstAttribute="leading" secondItem="Zel-C3-DXB" secondAttribute="leading" id="oG6-QX-cHc"/>
+                                <constraint firstAttribute="trailing" secondItem="Yoq-iO-9jA" secondAttribute="trailing" id="qo2-dI-fNp"/>
+                            </constraints>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="44U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lSD-a3-ggU">
+                            <rect key="frame" x="26.5" y="28.5" width="23" height="13.5"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration" label="Reservoir Volume">
+                        <bool key="isElement" value="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstItem="gbz-Hi-J1V" firstAttribute="leading" secondItem="4u2-jI-OVB" secondAttribute="leading" id="3m8-Uk-nTG"/>
+                        <constraint firstItem="lSD-a3-ggU" firstAttribute="centerX" secondItem="4u2-jI-OVB" secondAttribute="centerX" id="8mO-fn-goO"/>
+                        <constraint firstItem="Zel-C3-DXB" firstAttribute="top" secondItem="4u2-jI-OVB" secondAttribute="top" constant="9" id="Can-tz-B4M"/>
+                        <constraint firstItem="gbz-Hi-J1V" firstAttribute="top" secondItem="Zel-C3-DXB" secondAttribute="bottom" constant="3" id="HMw-QD-HIw"/>
+                        <constraint firstItem="lSD-a3-ggU" firstAttribute="centerY" secondItem="4u2-jI-OVB" secondAttribute="centerY" id="NuA-31-Ax3"/>
+                        <constraint firstAttribute="bottom" secondItem="gbz-Hi-J1V" secondAttribute="bottom" id="Wzf-6U-zOG"/>
+                        <constraint firstAttribute="trailing" secondItem="gbz-Hi-J1V" secondAttribute="trailing" id="rKo-wv-nHb"/>
+                        <constraint firstItem="Zel-C3-DXB" firstAttribute="centerX" secondItem="4u2-jI-OVB" secondAttribute="centerX" id="y2T-WX-elC"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="caption" destination="gbz-Hi-J1V" id="WRM-gN-PqR"/>
+                        <outlet property="levelMaskView" destination="Yoq-iO-9jA" id="909-9O-JxY"/>
+                        <outlet property="volumeLabel" destination="lSD-a3-ggU" id="4ZC-Cm-SX5"/>
+                    </connections>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D8z-Jh-qbK" customClass="BatteryLevelHUDView" customModule="LoopUI">
+                    <rect key="frame" x="300" y="0.0" width="75" height="70"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WWA-iK-B3Q">
+                            <rect key="frame" x="0.0" y="56" width="75" height="14"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="59n-Xc-HCv">
+                            <rect key="frame" x="16" y="9" width="44" height="44"/>
+                            <subviews>
+                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="battery" translatesAutoresizingMaskIntoConstraints="NO" id="iYH-ie-6lu">
+                                    <rect key="frame" x="9" y="0.0" width="26" height="44"/>
+                                </imageView>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sdZ-5W-ddR" customClass="LevelMaskView" customModule="LoopUI">
+                                    <rect key="frame" x="0.0" y="2" width="44" height="42"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="battery_mask"/>
+                                    </userDefinedRuntimeAttributes>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstItem="iYH-ie-6lu" firstAttribute="centerY" secondItem="59n-Xc-HCv" secondAttribute="centerY" id="1wI-BX-xLG"/>
+                                <constraint firstItem="sdZ-5W-ddR" firstAttribute="top" secondItem="59n-Xc-HCv" secondAttribute="top" constant="2" id="6Ur-Tq-K2o"/>
+                                <constraint firstItem="sdZ-5W-ddR" firstAttribute="leading" secondItem="59n-Xc-HCv" secondAttribute="leading" id="MDn-Ir-ybQ"/>
+                                <constraint firstAttribute="trailing" secondItem="sdZ-5W-ddR" secondAttribute="trailing" id="Tr5-jE-CVH"/>
+                                <constraint firstAttribute="height" constant="44" id="k78-Lt-fb5"/>
+                                <constraint firstAttribute="bottom" secondItem="sdZ-5W-ddR" secondAttribute="bottom" id="qbA-w7-WKw"/>
+                                <constraint firstAttribute="width" constant="44" id="thX-2D-M0s"/>
+                                <constraint firstItem="iYH-ie-6lu" firstAttribute="centerX" secondItem="59n-Xc-HCv" secondAttribute="centerX" id="yg9-u9-2WR"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration" label="Battery Level">
+                        <bool key="isElement" value="YES"/>
+                    </accessibility>
+                    <constraints>
+                        <constraint firstItem="WWA-iK-B3Q" firstAttribute="leading" secondItem="D8z-Jh-qbK" secondAttribute="leading" id="Pgg-vy-2c8"/>
+                        <constraint firstItem="59n-Xc-HCv" firstAttribute="centerX" secondItem="D8z-Jh-qbK" secondAttribute="centerX" id="iOn-UJ-Hpw"/>
+                        <constraint firstAttribute="trailing" secondItem="WWA-iK-B3Q" secondAttribute="trailing" id="j8j-Ei-lYf"/>
+                        <constraint firstItem="WWA-iK-B3Q" firstAttribute="top" secondItem="59n-Xc-HCv" secondAttribute="bottom" constant="3" id="u9T-op-W2O"/>
+                        <constraint firstAttribute="bottom" secondItem="WWA-iK-B3Q" secondAttribute="bottom" id="wgl-W6-Dut"/>
+                        <constraint firstItem="59n-Xc-HCv" firstAttribute="top" secondItem="D8z-Jh-qbK" secondAttribute="top" constant="9" id="xgD-OW-sWB"/>
+                    </constraints>
+                    <connections>
+                        <outlet property="caption" destination="WWA-iK-B3Q" id="OIN-Tk-wFt"/>
+                        <outlet property="levelMaskView" destination="sdZ-5W-ddR" id="fDI-eF-bV4"/>
+                    </connections>
+                </view>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="height" constant="70" id="lqa-Tm-OL5"/>
+            </constraints>
+        </stackView>
+    </objects>
+    <resources>
+        <image name="battery" width="26" height="44"/>
+        <image name="battery_mask" width="16" height="42"/>
+        <image name="reservoir" width="28" height="44"/>
+        <image name="reservoir_mask" width="28" height="39"/>
+    </resources>
+</document>
diff --git a/LoopUI/Info.plist b/LoopUI/Info.plist
new file mode 100644
index 0000000000..095f91358f
--- /dev/null
+++ b/LoopUI/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>LoopUI</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.2.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/LoopUI/LoopUI.h b/LoopUI/LoopUI.h
new file mode 100644
index 0000000000..fd22d90ece
--- /dev/null
+++ b/LoopUI/LoopUI.h
@@ -0,0 +1,19 @@
+//
+//  LoopUI.h
+//  LoopUI
+//
+//  Created by Bharat Mediratta on 12/11/16.
+//  Copyright © 2016 LoopKit Authors. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for LoopUI.
+FOUNDATION_EXPORT double LoopUIVersionNumber;
+
+//! Project version string for LoopUI.
+FOUNDATION_EXPORT const unsigned char LoopUIVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <LoopUI/PublicHeader.h>
+
+
diff --git a/Loop/Models/SensorDisplayable.swift b/LoopUI/Models/SensorDisplayable.swift
similarity index 59%
rename from Loop/Models/SensorDisplayable.swift
rename to LoopUI/Models/SensorDisplayable.swift
index f71838e3dd..a6a18d6bfc 100644
--- a/Loop/Models/SensorDisplayable.swift
+++ b/LoopUI/Models/SensorDisplayable.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-protocol SensorDisplayable {
+public protocol SensorDisplayable {
     /// Returns whether the current state is valid
     var isStateValid: Bool { get }
 
@@ -22,14 +22,3 @@ protocol SensorDisplayable {
     /// Returns wheter the data is from a locally-connected device
     var isLocal: Bool { get }
 }
-
-
-extension SensorDisplayable {
-    var stateDescription: String {
-        if isStateValid {
-            return NSLocalizedString("OK", comment: "Sensor state description for the valid state")
-        } else {
-            return NSLocalizedString("Needs Attention", comment: "Sensor state description for the non-valid state")
-        }
-    }
-}
diff --git a/Loop/Views/BasalRateHUDView.swift b/LoopUI/Views/BasalRateHUDView.swift
similarity index 93%
rename from Loop/Views/BasalRateHUDView.swift
rename to LoopUI/Views/BasalRateHUDView.swift
index b11945e34c..cd253c3ab6 100644
--- a/Loop/Views/BasalRateHUDView.swift
+++ b/LoopUI/Views/BasalRateHUDView.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 
-final class BasalRateHUDView: HUDView {
+public final class BasalRateHUDView: BaseHUDView {
 
     @IBOutlet private weak var basalStateView: BasalStateView!
 
@@ -24,7 +24,7 @@ final class BasalRateHUDView: HUDView {
 
     private lazy var basalRateFormatString = NSLocalizedString("%@ U", comment: "The format string describing the basal rate.")
 
-    func setNetBasalRate(_ rate: Double, percent: Double, at date: Date) {
+    public func setNetBasalRate(_ rate: Double, percent: Double, at date: Date) {
         let time = timeFormatter.string(from: date)
         caption?.text = time
 
diff --git a/Loop/Views/BasalStateView.swift b/LoopUI/Views/BasalStateView.swift
similarity index 74%
rename from Loop/Views/BasalStateView.swift
rename to LoopUI/Views/BasalStateView.swift
index d4deffcb1a..59332eb91a 100644
--- a/Loop/Views/BasalStateView.swift
+++ b/LoopUI/Views/BasalStateView.swift
@@ -9,14 +9,15 @@
 import UIKit
 
 
-final class BasalStateView: UIView {
+public final class BasalStateView: UIView {
+
     var netBasalPercent: Double = 0 {
         didSet {
             animateToPath(drawPath())
         }
     }
 
-    override class var layerClass : AnyClass {
+    override public class var layerClass : AnyClass {
         return CAShapeLayer.self
     }
 
@@ -30,24 +31,18 @@ final class BasalStateView: UIView {
         shapeLayer.lineWidth = 2
         shapeLayer.fillColor = UIColor.doseTintColor.withAlphaComponent(0.5).cgColor
         shapeLayer.strokeColor = UIColor.doseTintColor.cgColor
-
-        shapeLayer.path = drawPath()
     }
 
-    required init?(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
 
         shapeLayer.lineWidth = 2
         shapeLayer.fillColor = UIColor.doseTintColor.withAlphaComponent(0.5).cgColor
         shapeLayer.strokeColor = UIColor.doseTintColor.cgColor
-
-        shapeLayer.path = drawPath()
     }
 
-    override func layoutSubviews() {
+    override public func layoutSubviews() {
         super.layoutSubviews()
-
-        shapeLayer.path = drawPath()
     }
 
     private func drawPath() -> CGPath {
@@ -75,14 +70,16 @@ final class BasalStateView: UIView {
     private static let AnimationKey = "com.loudnate.Naterade.shapePathAnimation"
 
     private func animateToPath(_ path: CGPath) {
-        let animation = CABasicAnimation(keyPath: "path")
-        animation.fromValue = shapeLayer.path ?? drawPath()
-        animation.toValue = path
-        animation.duration = 1
-        animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-
-        shapeLayer.add(animation, forKey: type(of: self).AnimationKey)
-        
+        if shapeLayer.path != nil {
+            let animation = CABasicAnimation(keyPath: "path")
+            animation.fromValue = shapeLayer.path ?? drawPath()
+            animation.toValue = path
+            animation.duration = 1
+            animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+
+            shapeLayer.add(animation, forKey: type(of: self).AnimationKey)
+        }
+
         shapeLayer.path = path
     }
 }
diff --git a/Loop/Views/HUDView.swift b/LoopUI/Views/BaseHUDView.swift
similarity index 88%
rename from Loop/Views/HUDView.swift
rename to LoopUI/Views/BaseHUDView.swift
index 1c741cf980..a0d2ad853e 100644
--- a/Loop/Views/HUDView.swift
+++ b/LoopUI/Views/BaseHUDView.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class HUDView: UIView {
+public class BaseHUDView: UIView {
 
     @IBOutlet weak var caption: UILabel! {
         didSet {
diff --git a/Loop/Views/BatteryLevelHUDView.swift b/LoopUI/Views/BatteryLevelHUDView.swift
similarity index 90%
rename from Loop/Views/BatteryLevelHUDView.swift
rename to LoopUI/Views/BatteryLevelHUDView.swift
index a4f1fbee6b..8fcd1688d3 100644
--- a/Loop/Views/BatteryLevelHUDView.swift
+++ b/LoopUI/Views/BatteryLevelHUDView.swift
@@ -9,11 +9,11 @@
 import UIKit
 
 
-final class BatteryLevelHUDView: HUDView {
+public final class BatteryLevelHUDView: BaseHUDView {
 
     @IBOutlet private weak var levelMaskView: LevelMaskView!
 
-    override func awakeFromNib() {
+    override public func awakeFromNib() {
         super.awakeFromNib()
 
         tintColor = .unknownColor
@@ -29,7 +29,7 @@ final class BatteryLevelHUDView: HUDView {
     }()
 
 
-    var batteryLevel: Double? {
+    public var batteryLevel: Double? {
         didSet {
             if let value = batteryLevel, let level = numberFormatter.string(from: NSNumber(value: value)) {
                 caption.text = level
diff --git a/Loop/Views/GlucoseHUDView.swift b/LoopUI/Views/GlucoseHUDView.swift
similarity index 94%
rename from Loop/Views/GlucoseHUDView.swift
rename to LoopUI/Views/GlucoseHUDView.swift
index 43910dbe60..fe6cf7d830 100644
--- a/Loop/Views/GlucoseHUDView.swift
+++ b/LoopUI/Views/GlucoseHUDView.swift
@@ -10,7 +10,7 @@ import UIKit
 import HealthKit
 
 
-final class GlucoseHUDView: HUDView {
+public final class GlucoseHUDView: BaseHUDView {
 
     @IBOutlet private weak var unitLabel: UILabel! {
         didSet {
@@ -64,7 +64,7 @@ final class GlucoseHUDView: HUDView {
         }
     }
 
-    func set(glucoseQuantity: Double, at glucoseStartDate: Date, unitString: String, from sensor: SensorDisplayable?) {
+    public func set(glucoseQuantity: Double, at glucoseStartDate: Date, unitString: String, from sensor: SensorDisplayable?) {
         var accessibilityStrings = [String]()
 
         let time = timeFormatter.string(from: glucoseStartDate)
diff --git a/LoopUI/Views/HUDView.swift b/LoopUI/Views/HUDView.swift
new file mode 100644
index 0000000000..7e92062c76
--- /dev/null
+++ b/LoopUI/Views/HUDView.swift
@@ -0,0 +1,39 @@
+//
+//  HUDView.swift
+//  Loop
+//
+//  Created by Bharat Mediratta on 12/20/16.
+//  Copyright © 2016 LoopKit Authors. All rights reserved.
+//
+
+import UIKit
+
+public class HUDView: UIStackView, NibLoadable {
+    @IBOutlet public weak var loopCompletionHUD: LoopCompletionHUDView!
+    @IBOutlet public weak var glucoseHUD: GlucoseHUDView!
+    @IBOutlet public weak var basalRateHUD: BasalRateHUDView!
+    @IBOutlet public weak var reservoirVolumeHUD: ReservoirVolumeHUDView!
+    @IBOutlet public weak var batteryHUD: BatteryLevelHUDView!
+
+    func setup() {
+        let stackView = HUDView.nib().instantiate(withOwner: self, options: nil)[0] as! UIStackView
+        self.addSubview(stackView)
+
+        // Use AutoLayout to have the stack view fill its entire container.
+        let horizontalConstraint = NSLayoutConstraint(item: stackView, attribute: .centerX, relatedBy: .equal, toItem: self, attribute: .centerX, multiplier: 1, constant: 0)
+        let verticalConstraint = NSLayoutConstraint(item: stackView, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .centerY, multiplier: 1, constant: 0)
+        let widthConstraint = NSLayoutConstraint(item: stackView, attribute: .width, relatedBy: .equal, toItem: self, attribute: .width, multiplier: 1, constant: 0)
+        let heightConstraint = NSLayoutConstraint(item: stackView, attribute: .height, relatedBy: .equal, toItem: self, attribute: .height, multiplier: 1, constant: 0)
+        self.addConstraints([horizontalConstraint, verticalConstraint, widthConstraint, heightConstraint])
+    }
+
+    public override init(frame: CGRect) {
+        super.init(frame: frame)
+        setup()
+    }
+
+    public required init(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        setup()
+    }
+}
diff --git a/Loop/Views/LevelMaskView.swift b/LoopUI/Views/LevelMaskView.swift
similarity index 82%
rename from Loop/Views/LevelMaskView.swift
rename to LoopUI/Views/LevelMaskView.swift
index 5850db54b3..ec7840fd71 100644
--- a/Loop/Views/LevelMaskView.swift
+++ b/LoopUI/Views/LevelMaskView.swift
@@ -11,11 +11,13 @@ import UIKit
 // Displays a variable-height level indicator, masked by an image.
 // Inspired by https://github.com/carekit-apple/CareKit/blob/master/CareKit/CareCard/OCKHeartView.h
 
-class LevelMaskView: UIView {
+public class LevelMaskView: UIView {
+    var firstDataUpdate = true
 
     var value: Double = 1.0 {
         didSet {
-            animateFill()
+            animateFill(duration: firstDataUpdate ? 0 : 1.25)
+            firstDataUpdate = false
         }
     }
 
@@ -44,7 +46,7 @@ class LevelMaskView: UIView {
 
     private var maskImageView: UIView?
 
-    override func layoutSubviews() {
+    override public func layoutSubviews() {
         super.layoutSubviews()
 
         guard let maskImage = maskImage else { return }
@@ -60,14 +62,14 @@ class LevelMaskView: UIView {
         }
     }
 
-    override func tintColorDidChange() {
+    override public func tintColorDidChange() {
         super.tintColorDidChange()
 
         fillView?.backgroundColor = tintColor
     }
 
-    private func animateFill() {
-        UIView.animate(withDuration: 1.25, delay: 0, options: .beginFromCurrentState, animations: {
+    private func animateFill(duration: TimeInterval) {
+        UIView.animate(withDuration: duration, delay: 0, options: .beginFromCurrentState, animations: {
             self.updateFillViewFrame()
         }, completion: nil)
     }
diff --git a/Loop/Views/LoopCompletionHUDView.swift b/LoopUI/Views/LoopCompletionHUDView.swift
similarity index 91%
rename from Loop/Views/LoopCompletionHUDView.swift
rename to LoopUI/Views/LoopCompletionHUDView.swift
index 1fc73dd6d6..1d3da43a1a 100644
--- a/Loop/Views/LoopCompletionHUDView.swift
+++ b/LoopUI/Views/LoopCompletionHUDView.swift
@@ -8,23 +8,23 @@
 
 import UIKit
 
-final class LoopCompletionHUDView: HUDView {
+public final class LoopCompletionHUDView: BaseHUDView {
 
     @IBOutlet private weak var loopStateView: LoopStateView!
 
-    override func awakeFromNib() {
+    override public func awakeFromNib() {
         super.awakeFromNib()
 
         updateDisplay(nil)
     }
 
-    var dosingEnabled = false {
+    public var dosingEnabled = false {
         didSet {
             loopStateView.open = !dosingEnabled
         }
     }
 
-    var lastLoopCompleted: Date? {
+    public var lastLoopCompleted: Date? {
         didSet {
             updateTimer = nil
             loopInProgress = false
@@ -32,13 +32,13 @@ final class LoopCompletionHUDView: HUDView {
         }
     }
 
-    var loopInProgress = false {
+    public var loopInProgress = false {
         didSet {
             loopStateView.animated = loopInProgress
         }
     }
 
-    func assertTimer(_ active: Bool = true) {
+    public func assertTimer(_ active: Bool = true) {
         if active && window != nil, let date = lastLoopCompleted {
             initTimer(date)
         } else {
@@ -112,7 +112,7 @@ final class LoopCompletionHUDView: HUDView {
         }
     }
 
-    override func didMoveToWindow() {
+    override public func didMoveToWindow() {
         super.didMoveToWindow()
 
         assertTimer()
diff --git a/Loop/Views/LoopStateView.swift b/LoopUI/Views/LoopStateView.swift
similarity index 88%
rename from Loop/Views/LoopStateView.swift
rename to LoopUI/Views/LoopStateView.swift
index 454c319efc..96c1ffbd35 100644
--- a/Loop/Views/LoopStateView.swift
+++ b/LoopUI/Views/LoopStateView.swift
@@ -8,7 +8,9 @@
 
 import UIKit
 
-final class LoopStateView: UIView {
+public final class LoopStateView: UIView {
+    var firstDataUpdate = true
+    
     enum Freshness {
         case fresh
         case aging
@@ -43,7 +45,7 @@ final class LoopStateView: UIView {
         }
     }
 
-    override class var layerClass : AnyClass {
+    override public class var layerClass : AnyClass {
         return CAShapeLayer.self
     }
 
@@ -55,23 +57,23 @@ final class LoopStateView: UIView {
         super.init(frame: frame)
 
         shapeLayer.lineWidth = 8
-        shapeLayer.fillColor = nil
+        shapeLayer.fillColor = UIColor.clear.cgColor
         shapeLayer.strokeColor = freshness.color.cgColor
 
         shapeLayer.path = drawPath()
     }
 
-    required init?(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
 
         shapeLayer.lineWidth = 8
-        shapeLayer.fillColor = nil
+        shapeLayer.fillColor = UIColor.clear.cgColor
         shapeLayer.strokeColor = freshness.color.cgColor
 
         shapeLayer.path = drawPath()
     }
 
-    override func layoutSubviews() {
+    override public func layoutSubviews() {
         super.layoutSubviews()
 
         shapeLayer.path = drawPath()
@@ -112,7 +114,7 @@ final class LoopStateView: UIView {
 
                     let group = CAAnimationGroup()
                     group.animations = [path, width]
-                    group.duration = 1
+                    group.duration = firstDataUpdate ? 0 : 1
                     group.repeatCount = HUGE
                     group.autoreverses = true
                     group.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
@@ -122,6 +124,7 @@ final class LoopStateView: UIView {
                     shapeLayer.removeAnimation(forKey: type(of: self).AnimationKey)
                 }
             }
+            firstDataUpdate = false
         }
     }
 }
diff --git a/Loop/Views/ReservoirVolumeHUDView.swift b/LoopUI/Views/ReservoirVolumeHUDView.swift
similarity index 91%
rename from Loop/Views/ReservoirVolumeHUDView.swift
rename to LoopUI/Views/ReservoirVolumeHUDView.swift
index d825af2507..e3eb5df7fb 100644
--- a/Loop/Views/ReservoirVolumeHUDView.swift
+++ b/LoopUI/Views/ReservoirVolumeHUDView.swift
@@ -8,13 +8,13 @@
 
 import UIKit
 
-final class ReservoirVolumeHUDView: HUDView {
+public final class ReservoirVolumeHUDView: BaseHUDView {
 
     @IBOutlet private weak var levelMaskView: LevelMaskView!
 
     @IBOutlet private weak var volumeLabel: UILabel!
 
-    override func awakeFromNib() {
+    override public func awakeFromNib() {
         super.awakeFromNib()
 
         tintColor = .unknownColor
@@ -23,7 +23,7 @@ final class ReservoirVolumeHUDView: HUDView {
         accessibilityValue = NSLocalizedString("Unknown", comment: "Accessibility value for an unknown value")
     }
 
-    var reservoirLevel: Double? {
+    public var reservoirLevel: Double? {
         didSet {
             levelMaskView.value = reservoirLevel ?? 1.0
 
@@ -62,7 +62,7 @@ final class ReservoirVolumeHUDView: HUDView {
         return formatter
     }()
 
-    func setReservoirVolume(volume: Double, at date: Date) {
+    public func setReservoirVolume(volume: Double, at date: Date) {
         if let units = numberFormatter.string(from: NSNumber(value: volume)) {
             volumeLabel.text = String(format: NSLocalizedString("%@U", comment: "Format string for reservoir volume. (1: The localized volume)"), units)
             let time = timeFormatter.string(from: date)
diff --git a/WatchApp Extension/Extensions/WatchContext+WatchApp.swift b/WatchApp Extension/Extensions/WatchContext+WatchApp.swift
new file mode 100644
index 0000000000..aff2dc566e
--- /dev/null
+++ b/WatchApp Extension/Extensions/WatchContext+WatchApp.swift	
@@ -0,0 +1,21 @@
+//
+//  WatchContext.swift
+//  Loop
+//
+//  Created by Bharat Mediratta on 12/16/16.
+//  Copyright © 2016 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+extension WatchContext {
+    var glucoseTrend: GlucoseTrend? {
+        get {
+            if let glucoseTrendRawValue = glucoseTrendRawValue {
+                return GlucoseTrend(rawValue: glucoseTrendRawValue)
+            } else {
+                return nil
+            }
+        }
+    }
+}