added TODOs and Table of contens