Adding some 'todos'