Complete itokenize function (still broken), update TODO