Start setting up to use SelectTokens to apply hints/caveats