Fleshing out TODO items.