Use paragraphs in intro
Added TODOs