Instrumentation rebased

@AmbientOSX Didn't know if you had local changes so I made a new branch.
Much of this file is indented with tabs. In Sublime: Click Tabs/Spaces button in the bottom right and convert indentation to spaces.