change to accept buffer; less converting
track tempstore chunks in our own collection rather than in the file object
Merge origin/master