[#3] Updating TODO list and adding comments.