Noted some TODO items.