Diagnostics

Its about time I actually get diagnostics put into master.
this method is rated `// XXX` ?