Started diagnostics stuff.  Moved timing into it.