Add more TODO's
comments