Diagnostics

Its about time I actually get diagnostics put into master.
yeah, although, im not sure that its working correctly, im not seeing messages being received on the other side..