Add token, and add ability to mark as viewed.