Expanded out the date object a bit more. Need to set up more testcases.