Adding old comments, adding TODO comments.