Updated TODO items
Added more TODO items