Added TODO's at top of file