Punting, out of scope.  Please create slack card for refactor.