Should this be turned into a date object?