Diagnostics

Its about time I actually get diagnostics put into master.
yeah... so much churn! all in the name of nicely formatted code!