added more TODO's