Can we add some instrumentation here as well? This seems like a good thing to keep a meter of.