yes, this should be public; exposing the class was the whole point of the refactoring