Some more work on the tutorial...