Added a TODO and some comments.