QPID-????: Finish work on more accurate timing function in the face of changing time