diff --git a/BigGulp.xcodeproj/project.pbxproj b/BigGulp.xcodeproj/project.pbxproj
index 462275f..abbe0de 100644
--- a/BigGulp.xcodeproj/project.pbxproj
+++ b/BigGulp.xcodeproj/project.pbxproj
@@ -64,6 +64,7 @@
 		65F295DD1AA3B314003D4016 /* NSUserDefaults-BigGulp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F295DB1AA3B311003D4016 /* NSUserDefaults-BigGulp.swift */; };
 		65F295E31AA61F4B003D4016 /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 65F295E21AA61F4B003D4016 /* Onboarding.storyboard */; };
 		696B3059AB57E24FA7EEA307 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9472BDFA39F9529F02380169 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		7BBBDA1EA024CAEDA92009EA /* Pods_BigGulpTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A01D32D47AD6F4810507097 /* Pods_BigGulpTests.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		D4CE697120972CE291433FD5 /* Pods_BigGulpTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A01D32D47AD6F4810507097 /* Pods_BigGulpTests.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		D8974C0C139A1D0A12CAE27A /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9472BDFA39F9529F02380169 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 /* End PBXBuildFile section */
@@ -201,6 +202,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				696B3059AB57E24FA7EEA307 /* Pods.framework in Frameworks */,
+				7BBBDA1EA024CAEDA92009EA /* Pods_BigGulpTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -342,9 +344,9 @@
 			children = (
 				65B67E5F1A924BCC000A3CCD /* BigGulp */,
 				6567DAF31A97A43C00857A43 /* BigGulpToday */,
-				65B67E771A924BCC000A3CCD /* BigGulpTests */,
 				6585CFA81AAC9A8300CA27F3 /* BigGulp WatchKit Extension */,
 				6585CFBA1AAC9A8300CA27F3 /* BigGulp WatchKit App */,
+				65B67E771A924BCC000A3CCD /* BigGulpTests */,
 				65B67E5E1A924BCC000A3CCD /* Products */,
 				BF687DAEDF50F34E88CA7A48 /* Pods */,
 				67E925FAFF6ADF6DA2BD003B /* Frameworks */,
@@ -750,7 +752,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BigGulpTests/Pods-BigGulpTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		D3F03390AD26351258934912 /* Embed Pods Frameworks */ = {
@@ -1105,6 +1107,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				DEFINES_MODULE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1160,6 +1163,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1191,12 +1195,13 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5940FD500B5BF8735B6311F3 /* Pods.debug.xcconfig */;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = BigGulp/BigGulp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEFINES_MODULE = NO;
+				DEFINES_MODULE = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = BigGulp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -1212,12 +1217,13 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6903FDD88E08C7ECB5026E69 /* Pods.release.xcconfig */;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = BigGulp/BigGulp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEFINES_MODULE = NO;
+				DEFINES_MODULE = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = BigGulp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
diff --git a/BigGulp/Model/Entry.swift b/BigGulp/Model/Entry.swift
index 37ef77b..542bf1e 100644
--- a/BigGulp/Model/Entry.swift
+++ b/BigGulp/Model/Entry.swift
@@ -1,12 +1,12 @@
 import Foundation
 import Realm
 
-class Entry: RLMObject {
-    dynamic var date = Entry.defaultDate()
-    dynamic var quantity = 0.0
-    dynamic var percentage = 0.0
-    dynamic var goal = 0.0
-    dynamic var gulps = RLMArray(objectClassName: Gulp.className())
+public class Entry: RLMObject {
+    dynamic public var date = Entry.defaultDate()
+    dynamic public var quantity = 0.0
+    dynamic public var percentage = 0.0
+    dynamic public var goal = 0.0
+    dynamic public var gulps = RLMArray(objectClassName: Gulp.className())
 
     class func defaultDate() -> String {
         let dateFormat = NSDateFormatter()
@@ -14,7 +14,7 @@ class Entry: RLMObject {
         return dateFormat.stringFromDate(NSDate())
     }
 
-    override class func primaryKey() -> String {
+    override public class func primaryKey() -> String {
         return "date"
     }
 
diff --git a/BigGulp/Model/EntryHandler.swift b/BigGulp/Model/EntryHandler.swift
index 02e7397..1c38bf5 100644
--- a/BigGulp/Model/EntryHandler.swift
+++ b/BigGulp/Model/EntryHandler.swift
@@ -1,8 +1,8 @@
 import Foundation
 import Realm
 
-class EntryHandler: NSObject {
-    func currentEntry() -> Entry {
+public class EntryHandler: NSObject {
+    public func currentEntry() -> Entry {
         let directory: NSURL = NSFileManager.defaultManager().containerURLForSecurityApplicationGroupIdentifier("group.it.fancypixel.BigGulp")!
         let realmPath = directory.path!.stringByAppendingPathComponent("db.realm")
         RLMRealm.setDefaultRealmPath(realmPath)
@@ -21,12 +21,12 @@ class EntryHandler: NSObject {
         }
     }
 
-    func addGulp(quantity: Double) {
+    public func addGulp(quantity: Double) {
         let entry = currentEntry()
         entry.addGulp(quantity, goal: NSUserDefaults.groupUserDefaults().doubleForKey(Settings.Gulp.Goal.key()), realm: RLMRealm.defaultRealm())
     }
 
-    func removeLastGulp() {
+    public func removeLastGulp() {
         let realm = RLMRealm.defaultRealm()
         let entry = currentEntry()
         if let gulp = entry.gulps.lastObject() as? Gulp {
diff --git a/BigGulp/Onboarding.storyboard b/BigGulp/Onboarding.storyboard
index cb62376..f5e6bc2 100644
--- a/BigGulp/Onboarding.storyboard
+++ b/BigGulp/Onboarding.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="By6-Ql-uIz">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14E7f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="By6-Ql-uIz">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -28,7 +28,7 @@
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I’m here to help you keeping track of a simple healthy habit: 
drinking water." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-89-LG1">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I’m here to help you keep track of a simple healthy habit: 
drinking water." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-89-LG1">
                                 <rect key="frame" x="16" y="140" width="288" height="66"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="16"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/BigGulp/Support/Settings.swift b/BigGulp/Support/Settings.swift
index a459310..6bb6344 100644
--- a/BigGulp/Support/Settings.swift
+++ b/BigGulp/Support/Settings.swift
@@ -22,12 +22,12 @@ enum UnitsOfMeasure: Int {
     }
 }
 
-class Settings {
+public class Settings {
 
-    enum General: Int {
+    public enum General: Int {
         case UnitOfMeasure, OnboardingShown
 
-        func key() -> String {
+        public func key() -> String {
             switch self {
             case .UnitOfMeasure:
                 return "UNIT_OF_MEASURE"
@@ -37,9 +37,9 @@ class Settings {
         }
     }
 
-    enum Gulp: Int {
+    public enum Gulp: Int {
         case Big, Small, Goal
-        func key() -> String {
+        public func key() -> String {
             switch self {
             case .Big:
                 return "GULP_BIG"
@@ -51,9 +51,9 @@ class Settings {
         }
     }
 
-    enum Notification: Int {
+    public enum Notification: Int {
         case On, From, To, Interval
-        func key() -> String {
+        public func key() -> String {
             switch self {
             case .On:
                 return "NOTIFICATION_ON"
@@ -67,7 +67,7 @@ class Settings {
         }
     }
 
-    class func registerDefaults() {
+    public class func registerDefaults() {
         let userDefaults = NSUserDefaults.groupUserDefaults()
 
         // The defaults registered with registerDefaults are ignore by the Today Extension. :/
@@ -85,7 +85,7 @@ class Settings {
         userDefaults.synchronize()
     }
     
-    class func registerDefaultsForLiter() {
+    public class func registerDefaultsForLiter() {
         let userDefaults = NSUserDefaults.groupUserDefaults()
         userDefaults.setDouble(0.5, forKey: Gulp.Big.key())
         userDefaults.setDouble(0.2, forKey: Gulp.Small.key())
@@ -93,7 +93,7 @@ class Settings {
         userDefaults.synchronize()
     }
     
-    class func registerDefaultsForOunces() {
+    public class func registerDefaultsForOunces() {
         let userDefaults = NSUserDefaults.groupUserDefaults()
         userDefaults.setDouble(16, forKey: Gulp.Big.key())
         userDefaults.setDouble(8, forKey: Gulp.Small.key())
diff --git a/BigGulp/ViewControllers/DrinkViewController+Animations.swift b/BigGulp/ViewControllers/DrinkViewController+Animations.swift
index 64e0711..6289d67 100644
--- a/BigGulp/ViewControllers/DrinkViewController+Animations.swift
+++ b/BigGulp/ViewControllers/DrinkViewController+Animations.swift
@@ -3,7 +3,8 @@ import pop
 extension DrinkViewController {
 
     func initAnimation() {
-        [self.smallButton, self.largeButton].map({$0.alpha = 0})
+        self.smallButton.alpha = 0
+        self.largeButton.alpha = 0
     }
 
     func expandAddButton() {
diff --git a/BigGulp/ViewControllers/DrinkViewController.swift b/BigGulp/ViewControllers/DrinkViewController.swift
index 506afff..cf12074 100644
--- a/BigGulp/ViewControllers/DrinkViewController.swift
+++ b/BigGulp/ViewControllers/DrinkViewController.swift
@@ -4,20 +4,20 @@ import UICountingLabel
 import MMWormhole
 import AMPopTip
 
-class DrinkViewController: UIViewController, UIAlertViewDelegate {
-
-    @IBOutlet weak var progressMeter: DPMeterView!
-    @IBOutlet weak var percentageLabel: UICountingLabel!
-    @IBOutlet weak var addButton: UIButton!
-    @IBOutlet weak var smallButton: UIButton!
-    @IBOutlet weak var largeButton: UIButton!
-    @IBOutlet weak var minusButton: UIButton!
-    @IBOutlet var entryHandler: EntryHandler!
-    let userDefaults = NSUserDefaults.groupUserDefaults()
+public class DrinkViewController: UIViewController, UIAlertViewDelegate {
+
+    @IBOutlet public weak var progressMeter: DPMeterView!
+    @IBOutlet public weak var percentageLabel: UICountingLabel!
+    @IBOutlet public weak var addButton: UIButton!
+    @IBOutlet public weak var smallButton: UIButton!
+    @IBOutlet public weak var largeButton: UIButton!
+    @IBOutlet public weak var minusButton: UIButton!
+    @IBOutlet public var entryHandler: EntryHandler!
+    public var userDefaults = NSUserDefaults.groupUserDefaults()
     var expanded = false
     let wormhole = MMWormhole(applicationGroupIdentifier: "group.it.fancypixel.BigGulp", optionalDirectory: "biggulp")
 
-    override func viewDidLoad() {
+    public override func viewDidLoad() {
         super.viewDidLoad()
 
         self.title = "Drink!"   
@@ -38,17 +38,17 @@ class DrinkViewController: UIViewController, UIAlertViewDelegate {
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "updateUI", name: UIApplicationDidBecomeActiveNotification, object: nil)
     }
 
-    override func viewDidLayoutSubviews() {
+    public override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         self.progressMeter.setShape(ProgressMeter.pathFromRect(self.progressMeter.frame))
     }
 
-    override func viewWillAppear(animated: Bool) {
+    public override func viewWillAppear(animated: Bool) {
         super.viewWillAppear(animated)
         updateUI()
     }
 
-    override func viewDidAppear(animated: Bool) {
+    public override func viewDidAppear(animated: Bool) {
         super.viewDidAppear(animated)
     }
 
@@ -60,7 +60,7 @@ class DrinkViewController: UIViewController, UIAlertViewDelegate {
 
     func updateUI() {
         self.percentageLabel.countFromCurrentValueTo(Float(ceil(self.entryHandler.currentEntry().percentage)))
-        self.progressMeter.setProgress(CGFloat(self.entryHandler.currentEntry().percentage / 100.0), duration: 2)
+        self.progressMeter.setProgress(CGFloat(self.entryHandler.currentEntry().percentage / 100.0), duration: 1.5)
     }
 
     @IBAction func addButtonAction(sender: UIButton) {
@@ -71,7 +71,7 @@ class DrinkViewController: UIViewController, UIAlertViewDelegate {
         }
     }
 
-    @IBAction func selectionButtonAction(sender: UIButton) {
+    @IBAction public func selectionButtonAction(sender: UIButton) {
         contractAddButton()
         if (!self.userDefaults.boolForKey("UNDO_HINT")) {
             self.userDefaults.setBool(true, forKey: "UNDO_HINT")
@@ -93,7 +93,7 @@ class DrinkViewController: UIViewController, UIAlertViewDelegate {
         alert.show()
     }
 
-    func alertView(alertView: UIAlertView, clickedButtonAtIndex buttonIndex: Int) {
+    public func alertView(alertView: UIAlertView, clickedButtonAtIndex buttonIndex: Int) {
         if (buttonIndex > 0) {
             self.entryHandler.removeLastGulp()
             updateUI()
diff --git a/BigGulpTests/DrinkViewControllerTests.swift b/BigGulpTests/DrinkViewControllerTests.swift
index 72c13b6..7d9766e 100644
--- a/BigGulpTests/DrinkViewControllerTests.swift
+++ b/BigGulpTests/DrinkViewControllerTests.swift
@@ -1,23 +1,77 @@
 import UIKit
-//import Quick
-//import Nimble
+import Quick
+import Nimble
+import Nimble_Snapshots
 
+import Gulps
 
-/* Test currently crashes the compiler, I'll be uploading the suite as soon as I figure out why :) */
+class MockEntryHandler: EntryHandler {
+    let entry = Entry()
+    override func currentEntry() -> Entry {
+        return entry
+    }
 
+    override func addGulp(quantity: Double) {
+        entry.percentage = quantity
+        println(entry.percentage)
+    }
+}
 
-//import BigGulp
+class MockUserDefaults: NSUserDefaults {
+    override func doubleForKey(defaultName: String) -> Double {
+        if (defaultName == Settings.Gulp.Small.key()) {
+            return 10
+        } else {
+            return 20
+        }
+    }
 
-//class DrinkViewControllerSpecs: QuickSpec {
-//
-//    override func spec() {
-//        var viewController: DrinkViewController!
-//
-//        describe("viewDidLoad") {
-//            beforeEach {
-//                viewController.view
-//            }
-//        }
-//        
-//    }
-//}
+    override func boolForKey(defaultName: String) -> Bool {
+        return true
+    }
+}
+
+class DrinkViewControllerSpecs: QuickSpec {
+    override func spec() {
+        var subject: DrinkViewController!
+
+        beforeEach {
+            let storyboard = UIStoryboard(name: "Main", bundle: NSBundle.mainBundle())
+            let tabBarController = storyboard.instantiateInitialViewController() as! UITabBarController
+            let navigationController = tabBarController.viewControllers![0] as! UINavigationController
+            subject = navigationController.topViewController as! DrinkViewController
+            subject.entryHandler = MockEntryHandler()
+            subject.userDefaults = MockUserDefaults()
+            UIApplication.sharedApplication().keyWindow!.rootViewController = tabBarController
+            NSRunLoop.mainRunLoop().runUntilDate(NSDate())
+            subject.percentageLabel.animationDuration = 0.1 // makes testing easier
+        }
+
+        describe("when the controller loads") {
+            it("should display the starting progress as 0%") {
+                expect(subject.percentageLabel.text).to(equal("0%"))
+                expect(subject.progressMeter.progress).to(equal(0))
+            }
+
+            it("should present an empty meter") {
+                expect(subject.progressMeter).to(haveValidSnapshot())
+            }
+        }
+
+        describe("when a small gulp is added") {
+            it("should update the progress") {
+                subject.selectionButtonAction(subject.smallButton)
+                expect(subject.percentageLabel.text).toEventually(equal("10%"))
+                expect(subject.progressMeter).toEventually(haveValidSnapshot())
+            }
+        }
+
+        describe("when a big gulp is added") {
+            it("should update the progress label") {
+                subject.selectionButtonAction(subject.largeButton)
+                expect(subject.percentageLabel.text).toEventually(equal("20%"))
+                expect(subject.progressMeter).toEventually(haveValidSnapshot())
+            }
+        }
+    }
+}
diff --git a/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_a_big_gulp_is_added__should_update_the_progress_label@2x.png b/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_a_big_gulp_is_added__should_update_the_progress_label@2x.png
new file mode 100644
index 0000000..bff4956
Binary files /dev/null and b/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_a_big_gulp_is_added__should_update_the_progress_label@2x.png differ
diff --git a/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_a_small_gulp_is_added__should_update_the_progress@2x.png b/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_a_small_gulp_is_added__should_update_the_progress@2x.png
new file mode 100644
index 0000000..234b656
Binary files /dev/null and b/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_a_small_gulp_is_added__should_update_the_progress@2x.png differ
diff --git a/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_the_controller_loads__should_present_an_empty_meter@2x.png b/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_the_controller_loads__should_present_an_empty_meter@2x.png
new file mode 100644
index 0000000..4093e49
Binary files /dev/null and b/BigGulpTests/ReferenceImages/DrinkViewControllerTests/when_the_controller_loads__should_present_an_empty_meter@2x.png differ
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..1eac732
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'cocoapods', '0.37.0.beta.1'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..f36da54
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,57 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    claide (0.8.1)
+    cocoapods (0.37.0.beta.1)
+      activesupport (>= 3.2.15)
+      claide (~> 0.8.1)
+      cocoapods-core (= 0.37.0.beta.1)
+      cocoapods-downloader (~> 0.9.0)
+      cocoapods-plugins (~> 0.4.2)
+      cocoapods-trunk (~> 0.6.0)
+      cocoapods-try (~> 0.4.3)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      molinillo (~> 0.2.3)
+      nap (~> 0.8)
+      open4 (~> 1.3)
+      xcodeproj (~> 0.24.0)
+    cocoapods-core (0.37.0.beta.1)
+      activesupport (>= 3.2.15)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 0.8.0)
+    cocoapods-downloader (0.9.0)
+    cocoapods-plugins (0.4.2)
+      nap
+    cocoapods-trunk (0.6.0)
+      nap (>= 0.8)
+      netrc (= 0.7.8)
+    cocoapods-try (0.4.3)
+    colored (1.2)
+    escape (0.0.4)
+    fuzzy_match (2.0.4)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
+    molinillo (0.2.3)
+    nap (0.8.0)
+    netrc (0.7.8)
+    open4 (1.3.4)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.24.0)
+      activesupport (>= 3)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods (= 0.37.0.beta.1)
diff --git a/Podfile b/Podfile
index 728269b..e92c3e5 100644
--- a/Podfile
+++ b/Podfile
@@ -2,18 +2,31 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 
 pod 'pop', '~> 1.0'
+pod 'MMWormhole', '~> 1.1'
+pod 'Realm', '~> 0.91'
 pod 'AMPopTip', '~> 0.7'
 pod 'UICountingLabel', '~> 1.2'
-pod 'Realm', '~> 0.91'
 pod 'AMWaveTransition', '~> 0.5'
-pod 'MMWormhole', '~> 1.1'
 pod 'AHKActionSheet', '~> 0.5'
-pod 'JTCalendar', git: 'git@github.com:andreamazz/JTCalendar.git', branch: 'develop'
+pod 'JTCalendar', git: 'https://github.com/andreamazz/JTCalendar', branch: 'develop'
 pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
 
 target 'BigGulpTests', exclusive: true do
-  pod 'Quick'
-  pod 'Nimble'
+  pod 'Realm/Headers'
+  pod 'Quick', ' ~> 0.3'
+  pod 'Nimble', '~> 0.4'
+  pod 'Nimble-Snapshots', '~> 0.4'
+
+# figure out how to remove the duplication below. Can't get link_with to work
+  pod 'pop', '~> 1.0'
+  pod 'MMWormhole', '~> 1.1'
+  pod 'Realm', '~> 0.91'
+  pod 'AMPopTip', '~> 0.7'
+  pod 'UICountingLabel', '~> 1.2'
+  pod 'AMWaveTransition', '~> 0.5'
+  pod 'AHKActionSheet', '~> 0.5'
+  pod 'JTCalendar', git: 'https://github.com/andreamazz/JTCalendar', branch: 'develop'
+  pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
 end
 
 inhibit_all_warnings!