Diagnostics

Its about time I actually get diagnostics put into master.
I was building a tower to appease the p2p gods... :(