This supersedes !132, and overlaps to some degree with !134.

This incorporates work from the following people:

Co-authored-by: David Eichmann <EichmannD@gmail.com>
Co-authored-by: Matthew Pickering <matthewtpickering@gmail.com>