added TOC + some TODO items.