Part 3 so far, also instrumentation stuff