Added more TODO notes