Incident #18763 - John is going to look at this stuff (honorific combobo...

The code from this is broken, but John wanted me to push it as-is so he can mess around with it.