Mainline

Open PR for reviewing changes as I make them ...