Adding some more TODO itens