Updated with current TODO items.