Changed a few things

Date is now Calendar.
Checks based on startsWith rather than contains.