Reimplement data model/control so we don't swamp whooly.