Diagnostics

Its about time I actually get diagnostics put into master.