Updated for July 15-18 workshop (almost ready).