Added TODO, expanded ignore list.