New token logic.... And some other goodies