Diagnostics

Planned diagnostics: