diff --git a/App/Milkshake.dmg b/App/Milkshake.dmg
index cf20b28..da878e1 100644
Binary files a/App/Milkshake.dmg and b/App/Milkshake.dmg differ
diff --git a/Milkshake.xcodeproj/project.pbxproj b/Milkshake.xcodeproj/project.pbxproj
index ec3c987..4b6dda0 100644
--- a/Milkshake.xcodeproj/project.pbxproj
+++ b/Milkshake.xcodeproj/project.pbxproj
@@ -59,6 +59,7 @@
 		05D3421028A34D620039D620 /* Crypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 05D3420F28A34D620039D620 /* Crypt.m */; };
 		05D4F5EE217CEC4A00283085 /* milkshake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 05D4F5ED217CEC4900283085 /* milkshake.icns */; };
 		05D4F5F0217CEE5100283085 /* milkshake_512x512.png in Resources */ = {isa = PBXBuildFile; fileRef = 05D4F5EF217CEE5100283085 /* milkshake_512x512.png */; };
+		05E1929928A71DCE00E81970 /* VolumeSliderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05E1929828A71DCE00E81970 /* VolumeSliderCell.swift */; };
 		05ED20D51FCCFA4F00123317 /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05ED20D41FCCFA4F00123317 /* API.swift */; };
 		05ED20DF1FCD10B000123317 /* playing.gif in Resources */ = {isa = PBXBuildFile; fileRef = 05ED20DC1FCD10B000123317 /* playing.gif */; };
 		05ED20E21FCD125C00123317 /* ResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05ED20E01FCD125C00123317 /* ResultsViewController.swift */; };
@@ -145,6 +146,7 @@
 		05D3421128A34D840039D620 /* Crypt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Crypt.h; sourceTree = "<group>"; };
 		05D4F5ED217CEC4900283085 /* milkshake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = milkshake.icns; sourceTree = "<group>"; };
 		05D4F5EF217CEE5100283085 /* milkshake_512x512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = milkshake_512x512.png; sourceTree = "<group>"; };
+		05E1929828A71DCE00E81970 /* VolumeSliderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VolumeSliderCell.swift; sourceTree = "<group>"; };
 		05ED20D41FCCFA4F00123317 /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
 		05ED20DC1FCD10B000123317 /* playing.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = playing.gif; sourceTree = "<group>"; };
 		05ED20E01FCD125C00123317 /* ResultsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultsViewController.swift; sourceTree = "<group>"; };
@@ -323,6 +325,7 @@
 				05ED20E61FCD2FBD00123317 /* SearchTableCellView.swift */,
 				05ED20E81FCD2FE200123317 /* SearchTableCellView.xib */,
 				059A061F200DC7ED003C81F1 /* SpectrumAnalyzerView.swift */,
+				05E1929828A71DCE00E81970 /* VolumeSliderCell.swift */,
 			);
 			name = views;
 			sourceTree = "<group>";
@@ -395,7 +398,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Dean Liu";
 				TargetAttributes = {
 					48F749421FCCEBD000F0A853 = {
@@ -545,6 +548,7 @@
 				054A31171FF5D5B10022D06E /* HeaderTableCellView.swift in Sources */,
 				05ED21131FD6ED8F00123317 /* MusicItem.swift in Sources */,
 				05A57E692010E90F00B8FBCB /* NSBezierPath+CGPath.swift in Sources */,
+				05E1929928A71DCE00E81970 /* VolumeSliderCell.swift in Sources */,
 				48F749491FCCEBD000F0A853 /* MainViewController.swift in Sources */,
 				054130351FE01EBA0067DCFE /* PlayerButton.swift in Sources */,
 				48F749581FCCECBD00F0A853 /* RoundView.swift in Sources */,
@@ -605,6 +609,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -614,6 +619,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -621,8 +627,10 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -661,6 +669,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -670,6 +679,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -677,8 +687,10 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -715,7 +727,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = S9FKV88H43;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Milkshake/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -739,7 +751,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = S9FKV88H43;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Milkshake/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
diff --git a/Milkshake.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Milkshake.xcscheme b/Milkshake.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Milkshake.xcscheme
index d865996..0c8b13e 100644
--- a/Milkshake.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Milkshake.xcscheme
+++ b/Milkshake.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Milkshake.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate
index 57c28b0..656e677 100644
Binary files a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate and b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 08b0bbe..4e66856 100644
--- a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -7,95 +7,76 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "9FA24512-758E-48DC-97BA-E2B973F825CD"
+            uuid = "13ED5B57-6F02-47DE-BE55-3E3D9B570A79"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Milkshake/API.swift"
-            timestampString = "681811592.794281"
+            timestampString = "681811592.795244"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "103"
-            endingLineNumber = "103"
-            landmarkName = "request(_:params:callbackHandler:)"
+            startingLineNumber = "184"
+            endingLineNumber = "184"
+            landmarkName = "_partnerAuthUserLogin(username:password:partnerAuthToken:partnerId:syncTime:callbackHandler:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         BreakpointExtensionID = "Xcode.Breakpoint.RuntimeIssueBreakpoint">
          <BreakpointContent
-            uuid = "532C079F-CB08-459F-A49D-F6887A763BED"
-            shouldBeEnabled = "No"
+            uuid = "6C47B28C-DB93-4FB2-A7EE-6559D20A7CB2"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Milkshake/API.swift"
-            timestampString = "681811592.794768"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "150"
-            endingLineNumber = "150"
-            landmarkName = "auth(username:pass:callbackHandler:)"
-            landmarkType = "7">
+            breakpointStackSelectionBehavior = "1"
+            type = "4">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "13ED5B57-6F02-47DE-BE55-3E3D9B570A79"
+            uuid = "BDF4016D-5ABA-457D-9D74-6D8F7A7F7197"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Milkshake/API.swift"
-            timestampString = "681811592.795244"
+            filePath = "Milkshake/SearchTableCellView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "193"
-            endingLineNumber = "193"
-            landmarkName = "partnerAuthUserLogin(username:password:partnerAuthToken:partnerId:syncTime:callbackHandler:)"
+            startingLineNumber = "152"
+            endingLineNumber = "152"
+            landmarkName = "setCellWithSearchResult(result:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "B11F9EBD-A194-4B01-BF47-F7BA775E7C6D"
+            uuid = "124704E2-BEF9-4CED-A107-4FD1C49AEF66"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Milkshake/LoginViewController.swift"
-            timestampString = "681804855.496473"
+            filePath = "Milkshake/AppDelegate.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
-            endingLineNumber = "63"
-            landmarkName = "callbackPartnerAuthUserLogin(results:)"
+            startingLineNumber = "253"
+            endingLineNumber = "253"
+            landmarkName = "handleSuccessLogin(results:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.RuntimeIssueBreakpoint">
-         <BreakpointContent
-            uuid = "6C47B28C-DB93-4FB2-A7EE-6559D20A7CB2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            type = "4">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "BDF4016D-5ABA-457D-9D74-6D8F7A7F7197"
+            uuid = "7ACBECDD-E24A-4F93-A99A-6BDB9B4CDC32"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Milkshake/SearchTableCellView.swift"
+            filePath = "Milkshake/Util.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "152"
-            endingLineNumber = "152"
-            landmarkName = "setCellWithSearchResult(result:)"
+            startingLineNumber = "558"
+            endingLineNumber = "558"
+            landmarkName = "parseArtistIntoItems(artistResults:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
diff --git a/Milkshake/API.swift b/Milkshake/API.swift
index ee63047..1652f54 100644
--- a/Milkshake/API.swift
+++ b/Milkshake/API.swift
@@ -88,15 +88,17 @@ class API: NSObject {
                 }
                 let rv = responseValue as! [String: AnyObject]
 
-                if (rv["errorCode"] as? Int) == 1001 {
+                if (rv["errorCode"] as? Int ?? 0) == 1001 {
                     print("Token needs to be refreshed!!")
                     self.X_AuthToken = ""
 
                     if let dictionary = Locksmith.loadDataForUserAccount(userAccount: "Milkshake") {
                         let username = dictionary["username"] as! String
                         let password = dictionary["password"] as! String
-                        self.auth(username: username, pass: password) { responseDict in
-                            self.X_AuthToken = responseDict["authToken"] as? String;
+                        
+                        self.authPartnerAndUser(username: username, password: password) { responseDict in
+                            self.X_AuthToken = responseDict["result"]!["userAuthToken"] as? String;
+                            
                             // Clear the station queues because they're all expired
                             if url.hasSuffix("annotateObjectsSimple") {
                                 print("Clearing out... trying again")
@@ -141,30 +143,19 @@ class API: NSObject {
         print(self.cookies)
     }
         
-    
-    func auth(username:String, pass:String, callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) -> ()) {
-        let parameters: [String: Any] = [
-            "existingAuthToken": "",
-            "username": username,
-            "password": pass,
-            "keepLoggedIn": NSNumber(value: true)
-        ]
-        let url: String = "\(Constants.pandoraApiUrlV1)/auth/login"
-        self.request(url, params: parameters, callbackHandler: callbackHandler)
-    }
-    
-    func auth(username:String, token:String, callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) -> ()) {
-        let params: [String: Any] = [
-            "existingAuthToken": token,
-            "username": username,
-            "password": "",
-            "keepLoggedIn": true
-        ]
-        let url: String = "\(Constants.pandoraApiUrlV1)/auth/login"
-        self.request(url, params: params, callbackHandler: callbackHandler)
+    func authPartnerAndUser(username:String, password:String, callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) ->()){
+        
+        self._partnerAuthPartnerLogin() { responseDict in
+            let partnerAuthToken = responseDict["result"]!["partnerAuthToken"] as! String
+            let partnerId = responseDict["result"]!["partnerId"] as! String
+            let syncTimeEnc = responseDict["result"]!["syncTime"] as! String
+            let syncTime = PandoraDecryptTime(syncTimeEnc, Constants.decryptPassword)
+            
+            self._partnerAuthUserLogin(username: username, password: password, partnerAuthToken: partnerAuthToken, partnerId: partnerId, syncTime: syncTime, callbackHandler: callbackHandler)
+        }
     }
     
-    func partnerAuthPartnerLogin(callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) ->()){
+    func _partnerAuthPartnerLogin(callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) ->()){
         let params: [String: String] = [
             "username": Constants.username,
             "password": Constants.password,
@@ -176,7 +167,7 @@ class API: NSObject {
         self.requestTuner(url, params: params, encrypted: false, callbackHandler: callbackHandler)
     }
     
-    func partnerAuthUserLogin(username:String, password:String, partnerAuthToken:String, partnerId:String, syncTime:Int, callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) ->()){
+    func _partnerAuthUserLogin(username:String, password:String, partnerAuthToken:String, partnerId:String, syncTime:Int, callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) ->()){
         let params: [String: Any] = [
             "loginType": "user",
             "username": username,
@@ -194,6 +185,12 @@ class API: NSObject {
         self.requestTuner(urlParams.url!.absoluteString, params: params, encrypted: true, callbackHandler: callbackHandler)
     }
     
+    func billingInfo(callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) -> ()) {
+        let url: String = "\(Constants.pandoraApiUrlV1)/billing/infoV2"
+        let params: [String: Any] = [:]
+        self.request(url, params: params, callbackHandler: callbackHandler)
+    }
+    
     func playbackResumed(forceActive:Bool, callbackHandler:@escaping(_ Dictionary:[String:AnyObject]) -> ()) {
         let params: [String: Any] = [
             "forceActive": true
diff --git a/Milkshake/AppDelegate.swift b/Milkshake/AppDelegate.swift
index b6e5c30..aa4405d 100644
--- a/Milkshake/AppDelegate.swift
+++ b/Milkshake/AppDelegate.swift
@@ -244,20 +244,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, LoginProtocol {
     func handleSuccessLogin(results: Dictionary<String, AnyObject>) {
         let authToken = results["userAuthToken"] as! String
         self.listenerId = results["userId"] as! String
-//        self.isPremium = (config["branding"] as! String).lowercased() == "pandorapremium"
-//        self.listenerId = results["listenerId"] as! String
-        
-        if self.isPremium == false {
-            self.menuArtists.isHidden = true
-            self.menuPlaylist.isHidden = true
-        }
-        // Setting
+
         let defaults = UserDefaults.standard
         defaults.set(authToken, forKey: "authToken")
         self.api.X_AuthToken = authToken
-        print ("x auth token....")
-        print(self.api.X_AuthToken!)
-        self.launchMain()
+        
+        self.api.billingInfo() { results in
+            self.isPremium = ((results["activeProduct"]?["productTier"] as? String) ?? "").lowercased() == "pandora_premium"
+            if self.isPremium == false {
+                self.menuArtists.isHidden = true
+                self.menuPlaylist.isHidden = true
+                self.menuShuffle.isHidden = true
+            }
+            self.launchMain()
+        }
     }
 
     func isRadio() -> Bool {
diff --git a/Milkshake/Base.lproj/Main.storyboard b/Milkshake/Base.lproj/Main.storyboard
index 53b608c..ee0ed2e 100644
--- a/Milkshake/Base.lproj/Main.storyboard
+++ b/Milkshake/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -652,7 +652,7 @@
                                 </connections>
                             </textField>
                             <button fixedFrame="YES" alphaValue="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="woE-DP-iHe">
-                                <rect key="frame" x="9" y="370" width="18" height="18"/>
+                                <rect key="frame" x="7" y="368" width="18" height="18"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="search" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="sKh-eL-7k3">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -663,7 +663,7 @@
                                 </connections>
                             </button>
                             <button fixedFrame="YES" alphaValue="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="oeN-jH-7uG">
-                                <rect key="frame" x="269" y="369" width="20" height="20"/>
+                                <rect key="frame" x="269" y="368" width="20" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="menu" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="TB4-cy-2Ya">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/Milkshake/Crypt.m b/Milkshake/Crypt.m
index 61c5fe1..f8eb561 100644
--- a/Milkshake/Crypt.m
+++ b/Milkshake/Crypt.m
@@ -2,6 +2,9 @@
 #include "blowfish.h"
 #import "Crypt.h"
 
+// Source:
+// https://github.com/HermesApp/Hermes/blob/78f8bf498e09411299b31a994f3c9fbb3bb4d3b4/Sources/Pandora/Crypt.m
+
 /* Conversion from hex to int and int to hex */
 static char i2h[16] = "0123456789abcdef";
 static char h2i[256] = {
diff --git a/Milkshake/Info.plist b/Milkshake/Info.plist
index aa51543..0fad6ff 100644
--- a/Milkshake/Info.plist
+++ b/Milkshake/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>39</string>
+	<string>40</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.music</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Milkshake/LoginViewController.swift b/Milkshake/LoginViewController.swift
index 81c7f56..1ff24fb 100644
--- a/Milkshake/LoginViewController.swift
+++ b/Milkshake/LoginViewController.swift
@@ -48,26 +48,6 @@ class LoginViewController: NSViewController {
         self.passwordField.nextKeyView = self.rememberButton
         self.rememberButton.nextKeyView = self.loginButton
         self.loginButton.nextKeyView = self.usernameField
-    }    
-    func callbackPartnerAuth(results: [String: AnyObject]) {
-        let token = results["result"]!["partnerAuthToken"] as! String
-        let partnerId = results["result"]!["partnerId"] as! String
-        let syncTimeEnc = results["result"]!["syncTime"] as! String
-        
-        
-        let syncTime = PandoraDecryptTime(syncTimeEnc, Constants.decryptPassword)
-        self.appDelegate.api.partnerAuthUserLogin(username: self.usernameField.stringValue, password: self.passwordField.stringValue, partnerAuthToken: token, partnerId: partnerId, syncTime: syncTime, callbackHandler: callbackPartnerAuthUserLogin);
-    }
-    
-    func callbackPartnerAuthUserLogin(results: [String: AnyObject]) {
-        if (results["stat"] as? String) != "ok"{
-            if (results["code"] as? Int ?? 0) >= 0 {
-                errorTextField.stringValue = "Invalid username or credentials"
-            }
-        } else {
-            let result = results["result"] as! Dictionary<String, AnyObject>
-            self.delegate?.handleSuccessLogin(results: result)
-        }
     }
     
     @IBAction func loginAction(_ sender: Any) {
@@ -78,7 +58,15 @@ class LoginViewController: NSViewController {
         if rememberButton.state == NSControl.StateValue.on {
             try? Locksmith.updateData(data: userData, forUserAccount: "Milkshake")
         }
-        
-        self.appDelegate.api.partnerAuthPartnerLogin(callbackHandler: callbackPartnerAuth);
+        self.appDelegate.api.authPartnerAndUser(username: self.usernameField.stringValue, password: self.passwordField.stringValue) { results in 
+            if (results["stat"] as? String) != "ok"{
+                if (results["code"] as? Int ?? 0) >= 0 {
+                    self.errorTextField.stringValue = "Invalid username or credentials"
+                }
+            } else {
+                let result = results["result"] as! Dictionary<String, AnyObject>
+                self.delegate?.handleSuccessLogin(results: result)
+            }
+        }
     }
 }
diff --git a/Milkshake/MyTextField.swift b/Milkshake/MyTextField.swift
index e37e907..e6b47b2 100644
--- a/Milkshake/MyTextField.swift
+++ b/Milkshake/MyTextField.swift
@@ -11,27 +11,27 @@
 import Cocoa
 
 class MyTextField: NSTextField {
-    
-    override func becomeFirstResponder() -> Bool {
-        let responderStatus = super.becomeFirstResponder()
-        
-        if let selectionRange = self.currentEditor()?.selectedRange {
-            self.currentEditor()?.selectedRange = NSMakeRange(selectionRange.length, 0)
-        }
-        
-        let fieldEditor = self.window?.fieldEditor(true, for: self) as! NSTextView
-        fieldEditor.insertionPointColor = NSColor(calibratedRed: 0.8, green: 0.8, blue: 0.8, alpha: 0.8)
-
-        return responderStatus
-    }
-    
-    override func mouseDown(with event: NSEvent) {
-        print ("TextField MOUSE DOWN")
-    }
-   
-    override var wantsDefaultClipping: Bool {
-        return false
-    }
+//    
+//    override func becomeFirstResponder() -> Bool {
+//        let responderStatus = super.becomeFirstResponder()
+//        
+//        if let selectionRange = self.currentEditor()?.selectedRange {
+//            self.currentEditor()?.selectedRange = NSMakeRange(selectionRange.length, 0)
+//        }
+//        
+//        let fieldEditor = self.window?.fieldEditor(true, for: self) as! NSTextView
+//        fieldEditor.insertionPointColor = NSColor(calibratedRed: 0.8, green: 0.8, blue: 0.8, alpha: 0.8)
+//
+//        return responderStatus
+//    }
+//    
+//    override func mouseDown(with event: NSEvent) {
+//        print ("TextField MOUSE DOWN")
+//    }
+//   
+//    override var wantsDefaultClipping: Bool {
+//        return false
+//    }
 
     
 }
diff --git a/Milkshake/NowPlayingViewController.swift b/Milkshake/NowPlayingViewController.swift
index 3b7f6f2..bb817a2 100644
--- a/Milkshake/NowPlayingViewController.swift
+++ b/Milkshake/NowPlayingViewController.swift
@@ -45,6 +45,7 @@ class NowPlayingViewController: NSViewController {
     @IBOutlet weak var artistLink: FlatButton!
     @IBOutlet weak var albumLink: FlatButton!
     @IBOutlet weak var volumeSlider: NSSlider!
+    @IBOutlet weak var volumeSliderCell: VolumeSliderCell!
     @IBOutlet weak var spectrumView: SpectrumAnalyzerView!
     
     let appDelegate = NSApplication.shared.delegate as! AppDelegate
@@ -187,9 +188,12 @@ class NowPlayingViewController: NSViewController {
             }
         }
         
-        // spectrum
+        // spectrum + volume
         if let color = item.dominantColor {
-            self.spectrumView.barFillColor = NSColor(hex: color)
+            let color = NSColor(hex: color)
+            self.spectrumView.barFillColor = color
+            self.volumeSliderCell.backgroundColor = color.complementary()
+            self.volumeSlider.setNeedsDisplay()
         } else {
             self.spectrumView.barFillColor = NSColor(calibratedRed: 250/255.0, green: 148/255.0, blue: 55/255.0, alpha: 0.55)
         }
diff --git a/Milkshake/NowPlayingViewController.xib b/Milkshake/NowPlayingViewController.xib
index 7078f00..32ca025 100644
--- a/Milkshake/NowPlayingViewController.xib
+++ b/Milkshake/NowPlayingViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -24,6 +24,7 @@
                 <outlet property="titleTextField" destination="8BT-eN-H79" id="Lb4-ib-R2c"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
                 <outlet property="volumeSlider" destination="EN1-7a-H9R" id="5MS-hX-Q6A"/>
+                <outlet property="volumeSliderCell" destination="2cR-1K-gwn" id="K3o-MC-8JQ"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -53,7 +54,7 @@
                 <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EN1-7a-H9R">
                     <rect key="frame" x="39" y="147" width="224" height="19"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <sliderCell key="cell" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="above" sliderType="linear" id="2cR-1K-gwn"/>
+                    <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="above" sliderType="linear" id="2cR-1K-gwn" customClass="VolumeSliderCell" customModule="Milkshake" customModuleProvider="target"/>
                     <connections>
                         <action selector="sliderDragged:" target="-2" id="XLI-Su-B4O"/>
                     </connections>
diff --git a/Milkshake/Util.swift b/Milkshake/Util.swift
index e740cdc..a28c7d2 100644
--- a/Milkshake/Util.swift
+++ b/Milkshake/Util.swift
@@ -391,7 +391,8 @@ class Util: NSObject {
         var items: [MusicItem] = []
         
         // Limit 50 stations only for time being
-        let stations = (stationResult["stations"] as! [[String: Any]]).prefix(50)
+        let stations = ((stationResult["stations"] as? [[String: Any]]) ?? []).prefix(50)
+        
         
         for station in stations {
             var albumArt = ""
@@ -437,9 +438,8 @@ class Util: NSObject {
     class func parsePlaylistSearchIntoItems(playlistSearchResult:[String: AnyObject]) -> [MusicItem] {
         
         var items: [MusicItem] = []
-        let annotationsDict = playlistSearchResult["annotations"] as! [String: AnyObject]
-        
-        let playlistsArray = playlistSearchResult["items"] as! [[String: Any]]
+        let annotationsDict = playlistSearchResult["annotations"] as? [String: AnyObject] ?? [:]
+        let playlistsArray = playlistSearchResult["items"] as? [[String: Any]] ?? []
         
         for playlist in playlistsArray{
             let musicItem = MusicItem()
@@ -556,8 +556,8 @@ class Util: NSObject {
                 musicItem.shareableUrlPath = row["shareableUrlPath"] as? String
                 musicItem.cellType = CellType.ARTIST
                 
-                if let icon = row["icon"]!["thorId"] as? String {
-                    let albumArt = "https://content-images.p-cdn.com/"+(icon)
+                if let icon = row["icon"]?["thorId"] as? String {
+                    let albumArt = "https://content-images.p-cdn.com/\(icon)_250W_250H.jpg"
                     musicItem.albumArt = albumArt
                 }
                 items.append(musicItem)
diff --git a/Milkshake/VolumeSliderCell.swift b/Milkshake/VolumeSliderCell.swift
new file mode 100644
index 0000000..abc901e
--- /dev/null
+++ b/Milkshake/VolumeSliderCell.swift
@@ -0,0 +1,35 @@
+//
+//  VolumeSlider.swift
+//  Milkshake
+//
+//  Created by Dean Liu on 8/12/22.
+//  Copyright © 2022 Dean Liu. All rights reserved.
+//
+
+import Cocoa
+
+class VolumeSliderCell: NSSliderCell {
+    
+    var backgroundColor: NSColor = NSColor(calibratedRed: 250/255.0, green: 148/255.0, blue: 55/255.0, alpha: 0.55)
+        
+    required init(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    override func drawBar(inside rect: NSRect, flipped: Bool) {
+        var rect = rect
+        rect.size.height = CGFloat(5)
+        let barRadius = CGFloat(2.5)
+        let value = CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
+        let finalWidth = CGFloat(value * (self.controlView!.frame.size.width - 8))
+        var leftRect = rect
+        leftRect.size.width = finalWidth
+        let bg = NSBezierPath(roundedRect: rect, xRadius: barRadius, yRadius: barRadius)
+        backgroundColor.withAlphaComponent(0.25).setFill()
+        bg.fill()
+        let active = NSBezierPath(roundedRect: leftRect, xRadius: barRadius, yRadius: barRadius)
+        backgroundColor.setFill()
+        active.fill()
+    }
+
+}
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
index 7c9c226..a715431 100644
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@@ -630,7 +630,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 1250;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -854,6 +854,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -861,8 +862,10 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -981,6 +984,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -988,8 +992,10 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Alamofire.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Alamofire.xcscheme
index 44dc41e..4a54031 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Alamofire.xcscheme
+++ b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Alamofire.xcscheme
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = '88E9EC28B8B46C3631E6B242B50F4442'
-               BlueprintName = 'Alamofire'
-               ReferencedContainer = 'container:Pods.xcodeproj'
-               BuildableName = 'Alamofire.framework'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "88E9EC28B8B46C3631E6B242B50F4442"
+               BuildableName = "Alamofire.framework"
+               BlueprintName = "Alamofire"
+               ReferencedContainer = "container:Pods.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -38,17 +39,14 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/HotKey.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/HotKey.xcscheme
index df8b1e1..78c3d1e 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/HotKey.xcscheme
+++ b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/HotKey.xcscheme
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'CD7CA7613D1AE9B77775DCDC34F87472'
-               BlueprintName = 'HotKey'
-               ReferencedContainer = 'container:Pods.xcodeproj'
-               BuildableName = 'HotKey.framework'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CD7CA7613D1AE9B77775DCDC34F87472"
+               BuildableName = "HotKey.framework"
+               BlueprintName = "HotKey"
+               ReferencedContainer = "container:Pods.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -38,17 +39,14 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Kingfisher.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Kingfisher.xcscheme
index c069cce..5425da6 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Kingfisher.xcscheme
+++ b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Kingfisher.xcscheme
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = '6F712943B3C5592E82604940D11CE08A'
-               BlueprintName = 'Kingfisher'
-               ReferencedContainer = 'container:Pods.xcodeproj'
-               BuildableName = 'Kingfisher.framework'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6F712943B3C5592E82604940D11CE08A"
+               BuildableName = "Kingfisher.framework"
+               BlueprintName = "Kingfisher"
+               ReferencedContainer = "container:Pods.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -38,17 +39,14 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Locksmith.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Locksmith.xcscheme
index fc18485..d2bb5ab 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Locksmith.xcscheme
+++ b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Locksmith.xcscheme
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'B36864D6B3D5D12ED6AD209CCE16F927'
-               BlueprintName = 'Locksmith'
-               ReferencedContainer = 'container:Pods.xcodeproj'
-               BuildableName = 'Locksmith.framework'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B36864D6B3D5D12ED6AD209CCE16F927"
+               BuildableName = "Locksmith.framework"
+               BlueprintName = "Locksmith"
+               ReferencedContainer = "container:Pods.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -38,17 +39,14 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Pods-Milkshake.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Pods-Milkshake.xcscheme
index 6bb36a7..3b93438 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Pods-Milkshake.xcscheme
+++ b/Pods/Pods.xcodeproj/xcuserdata/dean.xcuserdatad/xcschemes/Pods-Milkshake.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Pods.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"