More suggestions for how we might run the tutorial
Fixed merge conflicts