Introduction branch

Is the TODO still true?