WIP: Instrumentation

Ugly right now but working through getting important pieces instrumented.