Starting next build, need suggestions on instrumentation