#71 start of fixing IsBetween date