Downloads redo

Merged 🚄 Job van der Voort 🚀 requested to merge downloads-redo into master