Setup Dates

Setup dates now correctly validating