Working on the timestamp code