Added TODO about punctuation or spaces