Part 2 of Jonathan's contributions (somewhat incomplete)