WIP - Add support for downloading zips