Diagnostics

Its about time I actually get diagnostics put into master.
this time should either be a constant, like `diag.ResponseTimeout` or a parameter