bit of refactoring and redesign also added a bit more instrumentation.