Reworked dates and times to use date objects.