Change Datetime dependency to Dates

I wasn't quite sure if I ran the tests right, but didn't see any issues. Let me know if there are any other changes to make.