Introduction branch

Same comment as before: Is the TODO still true?