Lots more work on discussion and additions to intro