diff --git a/roles/make_filesystems/tasks/main.yml b/roles/make_filesystems/tasks/main.yml
index b25a554d6960ca9736a1dcee46ec0d08276a9eff..34b0c6ed5ac859fbed246f88cce09b8eb3263d81 100644
--- a/roles/make_filesystems/tasks/main.yml
+++ b/roles/make_filesystems/tasks/main.yml
@@ -1,13 +1,31 @@
 ---
-- name: Format File Systems
-  filesystem: fstype={{ item.fstype }} dev={{ item.dev }} opts={{ item.opts }}
-  with_items: mkFileSystems
+- name: format volumes
+  filesystem: fstype={{ item.fstype }} dev={{ hostvars[ansible_hostname]['ansible_host_volumes'][item.name]['dev'] }}
+  with_items: volumes
   sudo: true
-  when: mkFileSystems is defined
 
-- name: Mount device 
-  mount: name={{ item.name }} src={{ item.dev }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
-  with_items: mountFileSystems
+- name: format volumes
+  mount: name={{ item.mntpt }} fstype={{ item.fstype }} src={{ hostvars[ansible_hostname]['ansible_host_volumes'][item.name]['dev'] }} state=mounted
+  with_items: volumes
   sudo: true
-  when: mountFileSystems is defined
 
+- name: symlink volumes
+  file: force=yes state=link src="{{ item.mntpt }}" path="{{ item.linkto }}"
+  when: item.linkto is defined
+  with_items: volumes
+  sudo: true
+
+
+#- name: Format File Systems
+#  filesystem: fstype={{ item.fstype }} dev={{ item.dev }} opts={{ item.opts }}
+#  with_items: mkFileSystems
+#  sudo: true
+#  when: mkFileSystems is defined
+#
+#- name: Mount device 
+#  mount: name={{ item.name }} src={{ item.dev }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
+#  with_items: mountFileSystems
+#  sudo: true
+#  when: mountFileSystems is defined
+#
+#