Instrumentation

@briankip , please review. Details #107