Refactor of transfers, and now up/download resumes