Work in progress, making download step optional