I will try this after implementing tests.  inputProvider uses uri methods.  Don't want to possibly disrupt that.  Adding todo