Record timestamps
Get timestamps basically working
Merge remote-tracking branch 'upstream/master'