Added TODO's for some of the comments