Diagnostics

Its about time I actually get diagnostics put into master.
maybe decompose this out? when it gets to 5 logic levels, it can be a sign. :]