More TODOs, and putting the parsed output on the page.