Finish work on timestamps for the moment