still trying to make the dates look right