Removed/Added TODO's to guide the last few additions.