Progress on getting instrumentation functions to run