Instrumentation

More to come here later.