Added TODO items for Evan and Jesse.