move over to Token object