Tests passing, merged important fixes from lab branch to master
Merged new instrumentation
Merged new instrumentation