More tracing infrastructure
HOLY CRAP IT WORKS