Added punctuation support but its totally broken