Adding a shitload of comments
Updating the ToDo's