working on dates
times working now