Added more new TODO items