Broke out date handling to a service