User test

Probably time to update master. This includes work by Geisel for the past several months plus new interface changes.