Added some more TODO items.