Moved date handling down to finish rather than options