Added todos and comments.