Instrumentation

Rm #8 / Christian Jorgensen & Aaron McElligott