Wip 7810

This is triggering MDS crash #9173
Yes and yes.  This is Mk.1, I'd like to come back later and make it smarter.