Make this refactoring joab a TODO(), and add a note in the other classes that could use it.