Added timing stuff.
Merge branch 'experiments' into experiments-plus-age