Picked up and extended the work JT has been doing on the diagnostics, adding six more features to complete the requirements as set out by SK. Waiting for the next build to complete so we can check that they're all working as expected.