Added todo list, and something else. Just check the diff