Working on getting tracing working better.

Yaaay