First draft of new text/html parser