Added TODO items for contributors