Added todo and some comments.