Much work towards #5989.  The diagram is up, I just need to fill it in.