Added a few TODO items.