More refactoring working towards getting chunked downloads working