working still on date range
Have to work out good logic for it