Rename, write token function a little more.