Move all the time related stuff onto the Timestream