Added more TODO code