more work towards moving token defintion into .inc file