diff --git a/Cartfile b/Cartfile
index 8551d3a..7f7fc57 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
-github "ReactiveCocoa/ReactiveCocoa" == 2.4.7
-github "sparkle-project/Sparkle" == 1.9.0
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-RC.1"
+github "sparkle-project/Sparkle" ~> 1.9.0
 github "calebd/MediaKeys" == 0.1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index aecaa19..96f3e90 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,4 @@
 github "calebd/MediaKeys" "v0.1.0"
-github "ReactiveCocoa/ReactiveCocoa" "v2.4.7"
-github "sparkle-project/Sparkle" "1.9.0"
+github "antitypical/Result" "1.0.1"
+github "sparkle-project/Sparkle" "1.13.0"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-RC.1"
diff --git a/Cloudy.xcodeproj/project.pbxproj b/Cloudy.xcodeproj/project.pbxproj
index e945c11..c8c460f 100644
--- a/Cloudy.xcodeproj/project.pbxproj
+++ b/Cloudy.xcodeproj/project.pbxproj
@@ -7,14 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3B0206EC1AE7461400E45D53 /* NowPlayingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B0206EB1AE7461400E45D53 /* NowPlayingController.swift */; };
+		3AE739B31C44E7350004A7A5 /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3AE739B11C44E5F40004A7A5 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		3AF748D01C46394700216897 /* Cloudy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AF748CF1C46394700216897 /* Cloudy.swift */; };
 		3B1A19201B4E681A005CE283 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA5FE361AF35A8E00A5622B /* Sparkle.framework */; };
 		3B430E261AE0A88F00AEBFBC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B430E251AE0A88F00AEBFBC /* AppDelegate.swift */; };
 		3B430E281AE0A88F00AEBFBC /* PlaybackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B430E271AE0A88F00AEBFBC /* PlaybackViewController.swift */; };
 		3B430E2A1AE0A88F00AEBFBC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3B430E291AE0A88F00AEBFBC /* Images.xcassets */; };
 		3B430E2D1AE0A88F00AEBFBC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B430E2B1AE0A88F00AEBFBC /* Main.storyboard */; };
 		3B430E441AE0B20700AEBFBC /* cloudy.js in Resources */ = {isa = PBXBuildFile; fileRef = 3B430E431AE0B20700AEBFBC /* cloudy.js */; };
-		3B430E461AE0C0FE00AEBFBC /* Defines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B430E451AE0C0FE00AEBFBC /* Defines.swift */; };
 		3B430E4A1AE0C66200AEBFBC /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B430E491AE0C66200AEBFBC /* MainWindowController.swift */; };
 		3BA5FE391AF35A9800A5622B /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA5FE361AF35A8E00A5622B /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3BB0D1B91AE2263100AB4A33 /* ReactiveCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B2332D41AE1BA48005C6654 /* ReactiveCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -31,6 +31,7 @@
 			files = (
 				3BB0D1B91AE2263100AB4A33 /* ReactiveCocoa.framework in Embed Frameworks */,
 				3BFB222C1AFA071300127AF1 /* MediaKeys.framework in Embed Frameworks */,
+				3AE739B31C44E7350004A7A5 /* Result.framework in Embed Frameworks */,
 				3BA5FE391AF35A9800A5622B /* Sparkle.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -39,7 +40,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3B0206EB1AE7461400E45D53 /* NowPlayingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NowPlayingController.swift; sourceTree = "<group>"; };
+		3AE739B11C44E5F40004A7A5 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/Mac/Result.framework; sourceTree = "<group>"; };
+		3AF748CF1C46394700216897 /* Cloudy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cloudy.swift; sourceTree = "<group>"; };
 		3B2332D41AE1BA48005C6654 /* ReactiveCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveCocoa.framework; path = Carthage/Build/Mac/ReactiveCocoa.framework; sourceTree = "<group>"; };
 		3B430E201AE0A88F00AEBFBC /* Cloudy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cloudy.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B430E241AE0A88F00AEBFBC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -48,7 +50,6 @@
 		3B430E291AE0A88F00AEBFBC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		3B430E2C1AE0A88F00AEBFBC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		3B430E431AE0B20700AEBFBC /* cloudy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = cloudy.js; sourceTree = "<group>"; };
-		3B430E451AE0C0FE00AEBFBC /* Defines.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Defines.swift; sourceTree = "<group>"; };
 		3B430E491AE0C66200AEBFBC /* MainWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
 		3BA5FE361AF35A8E00A5622B /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Carthage/Build/Mac/Sparkle.framework; sourceTree = "<group>"; };
 		3BFB22291AFA070C00127AF1 /* MediaKeys.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaKeys.framework; path = Carthage/Build/Mac/MediaKeys.framework; sourceTree = "<group>"; };
@@ -70,6 +71,7 @@
 		3B2332D81AE1BA84005C6654 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				3AE739B11C44E5F40004A7A5 /* Result.framework */,
 				3BFB22291AFA070C00127AF1 /* MediaKeys.framework */,
 				3BA5FE361AF35A8E00A5622B /* Sparkle.framework */,
 				3B2332D41AE1BA48005C6654 /* ReactiveCocoa.framework */,
@@ -100,8 +102,7 @@
 				3B430E251AE0A88F00AEBFBC /* AppDelegate.swift */,
 				3B430E491AE0C66200AEBFBC /* MainWindowController.swift */,
 				3B430E271AE0A88F00AEBFBC /* PlaybackViewController.swift */,
-				3B0206EB1AE7461400E45D53 /* NowPlayingController.swift */,
-				3B430E451AE0C0FE00AEBFBC /* Defines.swift */,
+				3AF748CF1C46394700216897 /* Cloudy.swift */,
 				3B430E421AE0A93000AEBFBC /* Resources */,
 			);
 			path = Cloudy;
@@ -146,7 +147,8 @@
 		3B430E181AE0A88F00AEBFBC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastSwiftUpdateCheck = 0720;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = "Caleb Davenport";
 				TargetAttributes = {
 					3B430E1F1AE0A88F00AEBFBC = {
@@ -197,11 +199,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3B0206EC1AE7461400E45D53 /* NowPlayingController.swift in Sources */,
 				3B430E281AE0A88F00AEBFBC /* PlaybackViewController.swift in Sources */,
 				3B430E261AE0A88F00AEBFBC /* AppDelegate.swift in Sources */,
 				3B430E4A1AE0C66200AEBFBC /* MainWindowController.swift in Sources */,
-				3B430E461AE0C0FE00AEBFBC /* Defines.swift in Sources */,
+				3AF748D01C46394700216897 /* Cloudy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -239,6 +240,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -301,7 +303,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -310,6 +311,7 @@
 				INFOPLIST_FILE = Cloudy/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				OTHER_SWIFT_FLAGS = "-DDEBUG";
+				PRODUCT_BUNDLE_IDENTIFIER = com.calebd.cloudy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -318,7 +320,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -326,6 +327,7 @@
 				);
 				INFOPLIST_FILE = Cloudy/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.calebd.cloudy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/Cloudy.xcodeproj/xcshareddata/xcschemes/Cloudy.xcscheme b/Cloudy.xcodeproj/xcshareddata/xcschemes/Cloudy.xcscheme
index 1855b63..9ff1c76 100644
--- a/Cloudy.xcodeproj/xcshareddata/xcschemes/Cloudy.xcscheme
+++ b/Cloudy.xcodeproj/xcshareddata/xcschemes/Cloudy.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,15 +38,18 @@
             ReferencedContainer = "container:Cloudy.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -62,10 +65,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/Cloudy/AppDelegate.swift b/Cloudy/AppDelegate.swift
index 05a6d9f..c735eb8 100644
--- a/Cloudy/AppDelegate.swift
+++ b/Cloudy/AppDelegate.swift
@@ -8,64 +8,64 @@
 
 import Cocoa
 
-private func DockMenu(#item: PlaybackItem?, #playing: Bool) -> NSMenu? {
-    if item == nil {
-        return nil
-    }
-
-    let menu = NSMenu()
-    menu.autoenablesItems = false
-
-    let nowPlayingItem = NSMenuItem()
-    nowPlayingItem.title = "Now Playing"
-    nowPlayingItem.enabled = false
-    menu.addItem(nowPlayingItem)
-
-    let showNameItem = NSMenuItem()
-    showNameItem.title = item?.show ?? "Now Show Title"
-    showNameItem.indentationLevel = 1
-    showNameItem.enabled = false
-    menu.addItem(showNameItem)
-
-    let episodeNameItem = NSMenuItem()
-    episodeNameItem.title = item?.episode ?? "Now Episode Title"
-    episodeNameItem.indentationLevel = 1
-    episodeNameItem.enabled = false
-    menu.addItem(episodeNameItem)
-
-    menu.addItem(NSMenuItem.separatorItem())
-
-    let togglePlaybackItem = NSMenuItem(title: playing ? "Pause" : "Play", action: "togglePlaybackState:", keyEquivalent: "")
-    menu.addItem(togglePlaybackItem)
-
-    return menu
-}
-
-private func GetPlaybackViewController() -> PlaybackViewController? {
-    let windows = NSApplication.sharedApplication().windows as? [NSWindow] ?? []
-    for window in windows {
-        if let controller = window.contentViewController as? PlaybackViewController {
-            return controller
-        }
-    }
-    return nil
-}
+//private func DockMenu(#item: PlaybackItem?, #playing: Bool) -> NSMenu? {
+//    if item == nil {
+//        return nil
+//    }
+//
+//    let menu = NSMenu()
+//    menu.autoenablesItems = false
+//
+//    let nowPlayingItem = NSMenuItem()
+//    nowPlayingItem.title = "Now Playing"
+//    nowPlayingItem.enabled = false
+//    menu.addItem(nowPlayingItem)
+//
+//    let showNameItem = NSMenuItem()
+//    showNameItem.title = item?.show ?? "Now Show Title"
+//    showNameItem.indentationLevel = 1
+//    showNameItem.enabled = false
+//    menu.addItem(showNameItem)
+//
+//    let episodeNameItem = NSMenuItem()
+//    episodeNameItem.title = item?.episode ?? "Now Episode Title"
+//    episodeNameItem.indentationLevel = 1
+//    episodeNameItem.enabled = false
+//    menu.addItem(episodeNameItem)
+//
+//    menu.addItem(NSMenuItem.separatorItem())
+//
+//    let togglePlaybackItem = NSMenuItem(title: playing ? "Pause" : "Play", action: "togglePlaybackState:", keyEquivalent: "")
+//    menu.addItem(togglePlaybackItem)
+//
+//    return menu
+//}
+
+//private func GetPlaybackViewController() -> PlaybackViewController? {
+//    let windows = NSApplication.sharedApplication().windows as? [NSWindow] ?? []
+//    for window in windows {
+//        if let controller = window.contentViewController as? PlaybackViewController {
+//            return controller
+//        }
+//    }
+//    return nil
+//}
 
 @NSApplicationMain final class AppDelegate: NSObject, NSApplicationDelegate {
 
     // MARK: - NSApplicationDelegate
 
-    func applicationDockMenu(sender: NSApplication) -> NSMenu? {
-        return DockMenu(
-            item: NowPlayingController.shared().nowPlayingItem,
-            playing: NowPlayingController.shared().playing
-        )
-    }
+//    func applicationDockMenu(sender: NSApplication) -> NSMenu? {
+//        return DockMenu(
+//            item: NowPlayingController.shared().nowPlayingItem,
+//            playing: NowPlayingController.shared().playing
+//        )
+//    }
 
 
     // MARK: - Private
 
-    @objc private func togglePlaybackState(sender: AnyObject?) {
-        GetPlaybackViewController()?.togglePlaybackState(self)
-    }
+//    @objc private func togglePlaybackState(sender: AnyObject?) {
+//        GetPlaybackViewController()?.togglePlaybackState(self)
+//    }
 }
diff --git a/Cloudy/Base.lproj/Main.storyboard b/Cloudy/Base.lproj/Main.storyboard
index 04def86..5c9dbe1 100644
--- a/Cloudy/Base.lproj/Main.storyboard
+++ b/Cloudy/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -663,10 +663,10 @@
         <!--Window Controller-->
         <scene sceneID="R2V-B0-nI4">
             <objects>
-                <windowController id="B8D-0N-5wS" customClass="MainWindowController" customModule="Cloudy" customModuleProvider="target" sceneMemberID="viewController">
-                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="IQv-IB-iLA">
+                <windowController showSeguePresentationStyle="single" id="B8D-0N-5wS" customClass="MainWindowController" customModule="Cloudy" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="Cloudy" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="PlaybackViewController" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
-                        <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+                        <rect key="contentRect" x="0.0" y="0.0" width="700" height="550"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
                         <value key="minSize" type="size" width="700" height="550"/>
                         <toolbar key="toolbar" implicitIdentifier="658273E3-72E5-4DE9-A8D8-BA5CB3075990" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="XhH-MO-OPE">
@@ -681,7 +681,7 @@
                                     <size key="minSize" width="34" height="25"/>
                                     <size key="maxSize" width="46" height="28"/>
                                     <button key="view" verticalHuggingPriority="750" id="WcS-Iy-vd0">
-                                        <rect key="frame" x="16" y="14" width="46" height="28"/>
+                                        <rect key="frame" x="15" y="14" width="46" height="28"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSShareTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="fJX-eB-wPF">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -713,7 +713,7 @@
                                     <size key="minSize" width="57" height="25"/>
                                     <size key="maxSize" width="60" height="25"/>
                                     <segmentedControl key="view" verticalHuggingPriority="750" id="WZI-AR-IJE">
-                                        <rect key="frame" x="4" y="14" width="57" height="25"/>
+                                        <rect key="frame" x="3" y="14" width="57" height="25"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="separated" trackingMode="momentary" id="RLq-K1-Pbu">
                                             <font key="font" metaFont="system"/>
@@ -735,8 +735,8 @@
                                     <nil key="toolTip"/>
                                     <size key="minSize" width="16" height="16"/>
                                     <size key="maxSize" width="32" height="32"/>
-                                    <progressIndicator key="view" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="ADh-Iy-WXR">
-                                        <rect key="frame" x="34" y="14" width="16" height="16"/>
+                                    <progressIndicator key="view" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="ADh-Iy-WXR">
+                                        <rect key="frame" x="41" y="14" width="16" height="16"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     </progressIndicator>
                                 </toolbarItem>
@@ -765,20 +765,20 @@
                 <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <userDefaultsController representsSharedInstance="YES" id="av9-B4-9Q7"/>
             </objects>
-            <point key="canvasLocation" x="75" y="312"/>
+            <point key="canvasLocation" x="74" y="448"/>
         </scene>
         <!--Playback View Controller-->
         <scene sceneID="hIz-AP-VOD">
             <objects>
                 <viewController id="XfG-lQ-9wD" customClass="PlaybackViewController" customModule="Cloudy" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="m2S-Jp-Qdl">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+                        <rect key="frame" x="0.0" y="0.0" width="700" height="550"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </view>
                 </viewController>
                 <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="75" y="719"/>
+            <point key="canvasLocation" x="74" y="1203"/>
         </scene>
     </scenes>
     <resources>
diff --git a/Cloudy/Cloudy.swift b/Cloudy/Cloudy.swift
new file mode 100644
index 0000000..cb9622f
--- /dev/null
+++ b/Cloudy/Cloudy.swift
@@ -0,0 +1,24 @@
+//
+//  Cloudy.swift
+//  Cloudy
+//
+//  Created by Caleb Davenport on 1/12/16.
+//  Copyright © 2016 Caleb Davenport. All rights reserved.
+//
+
+import WebKit
+import ReactiveCocoa
+
+extension WKWebView {
+    final var canGoBackProducer: SignalProducer<Bool, NoError> {
+        return DynamicProperty(object: self, keyPath: "canGoBack").producer.map({ $0 as! Bool })
+    }
+
+    final var canGoForwardProducer: SignalProducer<Bool, NoError> {
+        return DynamicProperty(object: self, keyPath: "canGoForward").producer.map({ $0 as! Bool })
+    }
+
+    final var loadingProducer: SignalProducer<Bool, NoError> {
+        return DynamicProperty(object: self, keyPath: "loading").producer.map({ $0 as! Bool })
+    }
+}
diff --git a/Cloudy/Defines.swift b/Cloudy/Defines.swift
deleted file mode 100644
index bec74c7..0000000
--- a/Cloudy/Defines.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  Defines.swift
-//  Cloudy
-//
-//  Created by Caleb Davenport on 4/16/15.
-//  Copyright (c) 2015 Caleb Davenport. All rights reserved.
-//
-
-import Foundation
-
-func noop() {}
-
-class PlaybackItem: NSObject {
-
-    // MARK: - Properties
-
-    let show: String?
-
-    let episode: String?
-
-
-    // MARK: - Initializers
-
-    init(episodeDictionary dictionary: [String: AnyObject]) {
-        show = dictionary["show_title"] as? String
-        episode = dictionary["episode_title"] as? String
-    }
-
-
-    // MARK: - Helpers
-
-    func prettyName() -> String? {
-        switch (show, episode) {
-        case (.Some(let show), .Some(let episode)):
-            return "\(show): \(episode)"
-        case (.Some(let show), .None):
-            return show
-        case (.None, .Some(let episode)):
-            return episode
-        default:
-            return nil
-        }
-    }
-}
diff --git a/Cloudy/Info.plist b/Cloudy/Info.plist
index 70b327f..676c011 100644
--- a/Cloudy/Info.plist
+++ b/Cloudy/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.calebd.cloudy</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -24,6 +24,11 @@
 	<string>5</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Caleb Davenport. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
diff --git a/Cloudy/MainWindowController.swift b/Cloudy/MainWindowController.swift
index b55b482..e9dc0a0 100644
--- a/Cloudy/MainWindowController.swift
+++ b/Cloudy/MainWindowController.swift
@@ -9,17 +9,21 @@
 import Cocoa
 import ReactiveCocoa
 
-final class MainWindowController: NSWindowController, NSWindowDelegate {
+final class MainWindowController: NSWindowController {
 
     // MARK: - Properties
 
-    @IBOutlet var navigationControl: NSSegmentedControl?
+    @IBOutlet private var navigationControl: NSSegmentedControl!
 
-    @IBOutlet var shareButton: NSButton?
+    @IBOutlet private var shareButton: NSButton!
 
-    @IBOutlet var playbackButton: NSButton?
+    @IBOutlet private var playbackButton: NSButton!
 
-    @IBOutlet var loadingIndicator: NSProgressIndicator?
+    @IBOutlet private var loadingIndicator: NSProgressIndicator!
+
+    private var playbackViewController: PlaybackViewController! {
+        return contentViewController as? PlaybackViewController
+    }
 
 
     // MARK: - NSWindowController
@@ -29,77 +33,61 @@ final class MainWindowController: NSWindowController, NSWindowDelegate {
 
         window?.titleVisibility = .Hidden
         window?.excludedFromWindowsMenu = true
-        shareButton?.sendActionOn(Int(NSEventMask.LeftMouseDownMask.rawValue))
-        playbackButton?.imagePosition = .ImageLeft
-
-        let nowPlayingItemSignal = NowPlayingController.shared().rac_valuesForKeyPath("nowPlayingItem", observer: self)
-        let hasNowPlayingItemSignal = nowPlayingItemSignal.map({ $0 is PlaybackItem })
-        let isPlayingSignal = NowPlayingController.shared().rac_valuesForKeyPath("playing", observer: self)
-
-        hasNowPlayingItemSignal.setKeyPath("shareButton.enabled", onObject: self)
-        hasNowPlayingItemSignal.setKeyPath("playbackButton.enabled", onObject: self)
-
-        navigationControl?.rac_liftSelector("setEnabled:forSegment:", withSignalsFromArray: [
-            rac_valuesForKeyPath("contentViewController.webView.canGoBack", observer: self),
-            RACSignal.`return`(0)
-        ])
-
-        navigationControl?.rac_liftSelector("setEnabled:forSegment:", withSignalsFromArray: [
-            rac_valuesForKeyPath("contentViewController.webView.canGoForward", observer: self),
-            RACSignal.`return`(1)
-        ])
-
-        nowPlayingItemSignal
-            .map({
-                let item = $0 as? PlaybackItem
-                return item?.prettyName() ?? "Cloudy: Nothing Playing"
+        shareButton.sendActionOn(Int(NSEventMask.LeftMouseDownMask.rawValue))
+        playbackButton.imagePosition = .ImageLeft
+
+        playbackViewController.nowPlayingItem.producer
+            .map({ $0?.compositeTitle ?? "Cloudy: Nothing Playing" })
+            .startWithNext({ [weak self] in
+                self?.playbackButton.title = $0
             })
-            .setKeyPath("playbackButton.title", onObject: self)
 
-        nowPlayingItemSignal
-            .map({
-                let item = $0 as? PlaybackItem
-                return item?.prettyName() ?? "Cloudy"
+        playbackViewController.nowPlayingItem.producer
+            .map({ $0?.compositeTitle ?? "Cloudy" })
+            .startWithNext({ [weak self] in
+                self?.window?.title = $0
             })
-            .setKeyPath("window.title", onObject: self)
-
-        let playbackButtonImageSignals = [ hasNowPlayingItemSignal, isPlayingSignal ]
-        RACSignal.combineLatest(playbackButtonImageSignals)
-            .map({
-                let tuple = $0 as! RACTuple
-                let hasNowPlayingItem = tuple.first as! Bool
-                let isPlaying = tuple.second as! Bool
-                switch (hasNowPlayingItem, isPlaying) {
-                case (true, true):
+
+        playbackViewController.nowPlayingItem.producer
+            .map({ $0 != nil })
+            .startWithNext({ [weak self] enabled in
+                self?.shareButton.enabled = enabled
+                self?.playbackButton.enabled = enabled
+            })
+
+        playbackViewController.nowPlayingItem.producer
+            .combineLatestWith(playbackViewController.isPlaying.producer)
+            .map({ nowPlayingItem, isPlaying -> NSImage? in
+                switch (nowPlayingItem, isPlaying) {
+                case (.Some, true):
                     return NSImage(named: "pause")
-                case (true, false):
+                case (.Some, false):
                     return NSImage(named: "play")
                 default:
                     return nil
                 }
             })
-            .setKeyPath("playbackButton.image", onObject: self)
-
-        rac_liftSelector("webViewLoadingDidChange:", withSignalsFromArray: [
-            rac_valuesForKeyPath("contentViewController.webView.loading", observer: self)
-        ])
-    }
+            .startWithNext({ [weak self] image in
+                self?.playbackButton.image = image
+            })
 
+        playbackViewController.webViewCanGoBack.startWithNext({ [weak self] in
+            self?.navigationControl.setEnabled($0, forSegment: 0)
+        })
 
-    // MARK: - Private
+        playbackViewController.webViewCanGoForward.startWithNext({ [weak self] in
+            self?.navigationControl.setEnabled($0, forSegment: 1)
+        })
 
-    @objc private func webViewLoadingDidChange(loading: Bool) {
-        if loading {
-            loadingIndicator?.startAnimation(self)
-        }
-        else {
-            loadingIndicator?.stopAnimation(self)
-        }
+        playbackViewController.webViewLoading.startWithNext({ [weak self] in
+            guard let indicator = self?.loadingIndicator else { return }
+            if $0 { indicator.startAnimation(nil) }
+            else { indicator.stopAnimation(nil) }
+        })
     }
+}
 
-
-    // MARK: - NSWindowDelegate
-
+extension MainWindowController: NSWindowDelegate {
     func windowShouldClose(sender: AnyObject) -> Bool {
         NSApplication.sharedApplication().terminate(self)
         return false
diff --git a/Cloudy/NowPlayingController.swift b/Cloudy/NowPlayingController.swift
deleted file mode 100644
index 8d4c628..0000000
--- a/Cloudy/NowPlayingController.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  NowPlayingController.swift
-//  Cloudy
-//
-//  Created by Caleb Davenport on 4/21/15.
-//  Copyright (c) 2015 Caleb Davenport. All rights reserved.
-//
-
-import Foundation
-
-private let SharedController = NowPlayingController()
-
-class NowPlayingController: NSObject {
-
-    // MARK: - Properties
-
-    dynamic var playing = false
-
-    dynamic var nowPlayingItem: PlaybackItem?
-
-
-    // MARK: - Public
-
-    class func shared() -> NowPlayingController {
-        return SharedController
-    }
-}
diff --git a/Cloudy/PlaybackViewController.swift b/Cloudy/PlaybackViewController.swift
index 4208ddd..9e36b4d 100644
--- a/Cloudy/PlaybackViewController.swift
+++ b/Cloudy/PlaybackViewController.swift
@@ -9,141 +9,105 @@
 import Cocoa
 import MediaKeys
 import WebKit
+import ReactiveCocoa
 
-final class PlaybackViewController: NSViewController, WKNavigationDelegate, WKScriptMessageHandler {
+final class PlaybackViewController: NSViewController {
 
     // MARK: - Properties
 
-    private let mediaKeys = MediaKeys()
-
-    private dynamic let webView: WKWebView = {
+    private lazy var webView: WKWebView = {
         let script: WKUserScript = {
-            let url = NSBundle.mainBundle().URLForResource("cloudy", withExtension: "js")!
-            let contents = String(contentsOfURL: url, encoding: NSUTF8StringEncoding, error: nil)!
+            let URL = NSBundle.mainBundle().URLForResource("cloudy", withExtension: "js")!
+            let contents =  try! String(contentsOfURL: URL, encoding: NSUTF8StringEncoding)
             return WKUserScript(source: contents, injectionTime: WKUserScriptInjectionTime.AtDocumentEnd, forMainFrameOnly: true)
         }()
 
         let configuration = WKWebViewConfiguration()
         configuration.userContentController.addUserScript(script)
+        configuration.userContentController.addScriptMessageHandler(self, name: "playbackHandler")
+        configuration.userContentController.addScriptMessageHandler(self, name: "episodeHandler")
+        configuration.userContentController.addScriptMessageHandler(self, name: "unplayedEpisodeCountHandler")
 
         #if DEBUG
             configuration.preferences.setValue(true, forKey: "developerExtrasEnabled")
         #endif
 
-        let view = WKWebView(frame: CGRectZero, configuration: configuration)
-        view.translatesAutoresizingMaskIntoConstraints = false
+        let view = WKWebView(frame: .zero, configuration: configuration)
+        view.autoresizingMask = [ .ViewWidthSizable, .ViewHeightSizable ]
+        view.navigationDelegate = self
         return view
     }()
 
+    private let _nowPlayingItem = MutableProperty<MediaItem?>(nil)
 
-    // MARK: - NSViewController
+    private let _unplayedEpisodeCount = MutableProperty<Int>(0)
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
+    private let _isPlaying = MutableProperty<Bool>(false)
 
-        mediaKeys.watch({ [unowned self] key in
-            switch key {
-            case .PlayPause:
-                self.togglePlaybackState(nil)
-            case .Forward:
-                self.seekForward()
-            case .Rewind:
-                self.seekBackward()
-            }
-        })
-
-        webView.configuration.userContentController.addScriptMessageHandler(self, name: "playbackHandler")
-        webView.configuration.userContentController.addScriptMessageHandler(self, name: "episodeHandler")
-        webView.configuration.userContentController.addScriptMessageHandler(self, name: "unplayedEpisodeCountHandler")
-        webView.navigationDelegate = self
+    var nowPlayingItem: AnyProperty<MediaItem?> { return AnyProperty(_nowPlayingItem) }
 
-        view.addSubview(webView)
-        setupConstraints()
+    var unplayedEpisodeCount: AnyProperty<Int> { return AnyProperty(_unplayedEpisodeCount) }
 
-        let url = NSURL(string: "https://overcast.fm")
-        let request = url.map({ NSURLRequest(URL: $0) })
-        request.map({ webView.loadRequest($0) })
-    }
+    var isPlaying: AnyProperty<Bool> { return AnyProperty(_isPlaying) }
 
+    var webViewCanGoBack: SignalProducer<Bool, NoError> { return webView.canGoBackProducer }
 
-    // MARK: - Public
+    var webViewCanGoForward: SignalProducer<Bool, NoError> { return webView.canGoForwardProducer }
 
-    func togglePlaybackState(sender: AnyObject?) {
-        webView.evaluateJavaScript("Cloudy.togglePlaybackState();", completionHandler: nil)
-    }
+    var webViewLoading: SignalProducer<Bool, NoError> { return webView.loadingProducer }
 
 
-    // MARK: - Private
+    // MARK: - NSViewController
 
-    private func setupConstraints() {
-        let views = [
-            "webView": webView
-        ]
+    override func viewDidLoad() {
+        super.viewDidLoad()
 
-        view.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("|[webView]|", options: nil, metrics: nil, views: views))
-        view.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|[webView]|", options: nil, metrics: nil, views: views))
-    }
+        webView.frame = view.bounds
+        view.addSubview(webView)
 
-    private func handleUpdateEpisodeMessage(message: AnyObject?) {
-        let dictionary = message as? [String: AnyObject]
-        NowPlayingController.shared().nowPlayingItem = dictionary.map({ PlaybackItem(episodeDictionary: $0) })
+        let URL = NSURL(string: "https://overcast.fm")!
+        let request = NSURLRequest(URL: URL)
+        webView.loadRequest(request)
     }
 
-    private func handleUpdatePlaybackMessage(message: AnyObject?) {
-        NowPlayingController.shared().playing = message as? Bool ?? false
-    }
 
-    private func handleUnplayedEpisodeCountMessage(message: AnyObject?) {
-        if let count = message as? Int {
-            NSApplication.sharedApplication().dockTile.badgeLabel = String(count)
-        }
-    }
+    // MARK: - Private
 
-    @objc private func performBrowserNavigation(sender: NSSegmentedControl) {
+    @objc private func navigate(sender: NSSegmentedControl) {
         switch sender.selectedSegment {
         case 0:
             webView.goBack()
         case 1:
             webView.goForward()
         default:
-            noop()
+            ()
         }
     }
 
     @objc private func share(sender: NSButton) {
-
-        // Build items
-        var items = [AnyObject]()
-        if let item = NowPlayingController.shared().nowPlayingItem?.prettyName() {
-            items.append(item)
-        }
-        if let item = webView.URL {
-            items.append(item)
-        }
-        if items.count == 0 {
+        guard
+            let text = nowPlayingItem.value?.compositeTitle,
+            let URL = webView.URL
+        else {
             return
         }
 
-        // Show picker
+        let items = [ text, URL ]
+
         let picker = NSSharingServicePicker(items: items)
-        picker.showRelativeToRect(sender.bounds, ofView: sender, preferredEdge: NSMinYEdge)
+        picker.showRelativeToRect(sender.bounds, ofView: sender, preferredEdge: .MinY)
     }
 
-    @objc private func reloadPage(sender: AnyObject?) {
+    @objc private func reload(_: AnyObject?) {
         webView.reload()
     }
 
-    private func seekBackward() {
-        webView.evaluateJavaScript("Cloudy.seekBackward();", completionHandler: nil)
-    }
-
-    private func seekForward() {
-        webView.evaluateJavaScript("Cloudy.seekForward();", completionHandler: nil)
+    @objc private func togglePlaybackState(_: AnyObject?) {
+        webView.evaluateJavaScript("Cloudy.togglePlaybackState();", completionHandler: nil)
     }
+}
 
-
-    // MARK: - WKNavigationDelegate
-
+extension PlaybackViewController: WKNavigationDelegate {
     func webView(webView: WKWebView, decidePolicyForNavigationAction navigationAction: WKNavigationAction, decisionHandler: (WKNavigationActionPolicy) -> Void) {
         if navigationAction.navigationType == .LinkActivated {
             let host = navigationAction.request.URL?.host
@@ -152,20 +116,80 @@ final class PlaybackViewController: NSViewController, WKNavigationDelegate, WKSc
         }
         decisionHandler(.Allow)
     }
+}
 
-
-    // MARK: - WKScriptMessageHandler
-
+extension PlaybackViewController: WKScriptMessageHandler {
     func userContentController(userContentController: WKUserContentController, didReceiveScriptMessage message: WKScriptMessage) {
-        switch message.name {
-        case "episodeHandler":
-            handleUpdateEpisodeMessage(message.body)
-        case "playbackHandler":
-            handleUpdatePlaybackMessage(message.body)
-        case "unplayedEpisodeCountHandler":
-            handleUnplayedEpisodeCountMessage(message.body)
+        switch (message.name, message.body) {
+        case ("episodeHandler", let body as [String: String]):
+            _nowPlayingItem.value = MediaItem(dictionary: body)
+        case ("episodeHandler", _):
+            _nowPlayingItem.value = nil
+        case ("playbackHandler", let body as Bool):
+            _isPlaying.value = body
+        case ("unplayedEpisodeCountHandler", let body as Int):
+            _unplayedEpisodeCount.value = body
         default:
-            noop()
+            ()
+        }
+    }
+}
+
+extension PlaybackViewController {
+    struct MediaItem {
+        var showTitle: String
+        var episodeTitle: String
+
+        var compositeTitle: String {
+            return "\(showTitle): \(episodeTitle)"
+        }
+
+        init?(dictionary: [String: String]) {
+            guard
+                let showName = dictionary["show_title"],
+                let episodeName = dictionary["episode_title"]
+            else {
+                return nil
+            }
+
+            self.showTitle = showName
+            self.episodeTitle = episodeName
         }
     }
 }
+
+//final class PlaybackViewController: NSViewController, WKNavigationDelegate, WKScriptMessageHandler {
+//
+//    // MARK: - Properties
+//
+//    private let mediaKeys = MediaKeys()
+//
+//
+//    // MARK: - NSViewController
+//
+//    override func viewDidLoad() {
+//        super.viewDidLoad()
+//
+//        mediaKeys.watch({ [unowned self] key in
+//            switch key {
+//            case .PlayPause:
+//                self.togglePlaybackState(nil)
+//            case .Forward:
+//                self.seekForward()
+//            case .Rewind:
+//                self.seekBackward()
+//            }
+//        })
+//    }
+//
+//
+//    // MARK: - Private
+//
+//    private func seekBackward() {
+//        webView.evaluateJavaScript("Cloudy.seekBackward();", completionHandler: nil)
+//    }
+//
+//    private func seekForward() {
+//        webView.evaluateJavaScript("Cloudy.seekForward();", completionHandler: nil)
+//    }
+//}
diff --git a/Readme.markdown b/Readme.markdown
index 402a924..a20f7ab 100644
--- a/Readme.markdown
+++ b/Readme.markdown
@@ -9,7 +9,7 @@ Cloudy uses [Carthage](https://github.com/carthage/carthage) to manage framework
 ```
 $ git clone https://github.com/calebd/cloudy
 $ cd cloudy
-$ carthage update
+$ carthage bootstrap --platform mac --no-use-binaries
 $ open Cloudy.xcodeproj
 ```