Start of work to handle timestamp windows