Merge augment-glance branch into main

Enough changes that are working well enough (for development) that I'd rather have it as the main branch.