This also refactors a bit when we take timestamps.