Edw file2

Ready for merge.  Most functionality restored that was affected by view changes to file collection and ES.  Candidate for release 3.  There may be one additional pull request for this release if time permits.