Adding token functionality to TODO list