some work on token.py