Instrumentation

Work in progress