Kinda hacky additions to NSDate
Cleaned up these method names