Next steps 2

Hi Rich,

Here's the deconflicted version of my old next-steps branch.

Thanks,
Jim