Right on.  @tpitale merge when ready!