diff --git a/tasks/download_file.yml b/tasks/download_file.yml
new file mode 100644
index 0000000..fcdf8f0
--- /dev/null
+++ b/tasks/download_file.yml
@@ -0,0 +1,5 @@
+---
+- name: Download a single file
+  fetch:
+    src: "{{ file.path }}"
+    dest: "{{ download_folder }}"
diff --git a/tasks/download_files.yml b/tasks/download_files.yml
index 199e096..6fc9e96 100644
--- a/tasks/download_files.yml
+++ b/tasks/download_files.yml
@@ -5,9 +5,8 @@
   when: download_folder is not defined
 
 - name: Download files
-  fetch:
-    src: "{{ item.path }}"
-    dest: "{{ download_folder }}"
+  include: download_file.yml
   with_items: "{{ result.files }}"
-  when: result is defined and result.files is defined
+  loop_control:
+    loop_var: file
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 46d02c7..d1ff7a3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,8 +5,9 @@
     msg: "Please provide a download_pattern list that follows dir: 'directory name', pattern: 'file pattern'"
   when: download_pattern is not defined
 
-#- name: Create download folder
-#  local_action: file path={{ download_folder }} state=directory
+- name: Create download folder
+  become: no
+  local_action: file path={{ download_folder }} state=directory
 
 - name: Find download log files
   find:
@@ -17,6 +18,8 @@
   with_items: "{{ download_pattern }}"
   register: downloads
 
+
+
 - name: Iterate over patterns found
   include: download_files.yml
   with_items: downloads.results