added in date handling and testing