Still trying to get the dates in the correct order