Added more TODO items based on IRC discussion with fredcooke.