Beginning to refactor TokenResolver into a first-class object