Added a table of contents and some TODO's