         }
         
         var cal = NSCalendar.currentCalendar()
-        var currentComps = cal.components(NSCalendarUnit.DayCalendarUnit, fromDate: self)
-        var compareComps = cal.components(NSCalendarUnit.DayCalendarUnit, fromDate: compareDate)
+        var currentComps = cal.components(NSCalendarUnit.CalendarUnitDay, fromDate: self)
+        var compareComps = cal.components(NSCalendarUnit.CalendarUnitDay, fromDate: compareDate)
         
         return (currentComps.day == compareComps.day)
     }

        
    
    private func dateString() -> String {
        var comps = NSCalendar.currentCalendar().components(NSCalendarUnit.MonthCalendarUnit | NSCalendarUnit.DayCalendarUnit, fromDate: self)
        return "\(NSDate.monthStringForIndex(comps.month)) \(comps.day)"
        
    }
    
    
    public func timeString() -> String {
        var comps = NSCalendar.currentCalendar().components(NSCalendarUnit.HourCalendarUnit | NSCalendarUnit.MinuteCalendarUnit, fromDate: self)
        var hours = comps.hour
        var amPm = "am"
        

    class public func dateForNextHour(date: NSDate) -> NSDate! {
        
        var cal = NSCalendar.currentCalendar()
        var comps = cal.components(NSCalendarUnit.CalendarUnitCalendar |
            NSCalendarUnit.CalendarUnitTimeZone |
            NSCalendarUnit.CalendarUnitYear |
            NSCalendarUnit.CalendarUnitMonth |
            NSCalendarUnit.CalendarUnitWeekOfYear |
            NSCalendarUnit.CalendarUnitWeekday |
            NSCalendarUnit.CalendarUnitHour |
            NSCalendarUnit.CalendarUnitMinute |
            NSCalendarUnit.CalendarUnitSecond, fromDate: date.dateByAddingTimeInterval(60*60))
        
        comps.second = 0
        comps.minute = 0
