Instrumentation rebased

@AmbientOSX Didn't know if you had local changes so I made a new branch.