Add TODO, refactor DOMHandler to a new package.