Marked stuff as todo.