Added Todos and comments