More rewriting of forms. Getting closer.