Progress on Input with dates

Working out the many new cases to account for