Will/more logging and metrics

Part one of several.  @gradyward