Comment 31 for bug 1358340

OK well I'm going to go ahead and try to finish this work up by implementing what's in comment #26. Comment #30 lays out a simpler configuration screen, but it's not clear to me how final that is, or when it will be. So unless I hear otherwise, I'm going to start with #26. Olga, let me know when you & your team are ready to sign off on something like #30.