diff --git a/roles/enable_root/tasks/main.yml b/roles/enable_root/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d7c65d2cd51bbe4d60bc0add181f778c552be49f
--- /dev/null
+++ b/roles/enable_root/tasks/main.yml
@@ -0,0 +1,3 @@
+- name: add key to root ssh
+  template: dest=/root/.ssh/authorized_keys mode=600 owner=root group=root src=authorized_keys.j2
+  sudo: true
diff --git a/roles/enable_root/templates/authorized_keys.j2 b/roles/enable_root/templates/authorized_keys.j2
new file mode 100644
index 0000000000000000000000000000000000000000..05cb91b928ab0b196cdf2c28c2617b74be9422ec
--- /dev/null
+++ b/roles/enable_root/templates/authorized_keys.j2
@@ -0,0 +1,10 @@
+no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command="echo 'Please login as the user \"ec2-user\" rather than the user \"root\".';echo;sleep 10" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt/cu47VucrAcmE8T+W4IiBQhZvzSQWaG8ORmEx+OV6d7JmeHtdpLrducKywIkdRJAh2KFsXawewFcYCoBgWRzBon7vZqcECY0Lu6uuQiPtfdAHDwBZpt7WD67UGU9m4eJXTOfVc0T9W/igwiofSt7XAlSrOSpuxyrwaNiFmZhWXOy61AGioSVCuOijzVUZHTJ2gIBx433+Y7TzCSP0LXlEypYxAsYnIeRtiiINRRCHSehUBmi9mnp+Y6J/LUg0CN2bJaoq4Zj/elGCflh4s/69w8vH7JpzqP1yzH0AFXS2C8l1Hs9SXTA2a4XrqJYg/JqP8j8lJXy+b28y6WgBBvVQ== jupiter@cvlproject.monash.edu
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPijQ597uLqEPAvVZXQlSjrUfFl2h7SRBTCRhH4hQJMVu55dhFYiojJZ0tjjV3jTcgWs1AsyRp3wDtNp8iQxbwEY2JPxCOjNuH0et4I/y3y6VUjcVWanSaIkdPf5AFNb9KIXo3Hvdyvav8SfFpioRQ0FKp8SZs1JYXpuQ0mZY26oKCKcNsWXv9ZN7knUN0xvYNMycpCnI2Nl666Zrs0gGyJ6e+Xq5bpk1lm8nuK9q52bTRjxqtdEBuSGwkZea+NBJzpYw5rEucteQI66y6tzFuYJk2WC4bUifffIxnkQXKYVynJg1MJ2CGI69r9hXt9eUtH3WrDxrJGmCau8jD3lib hines@sparge
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnakq6Lgq2n6yjcMaC7xQXMDMRdN33T6mPCqRy+TPdu0aPvVty0UFeAWsCyTxHeVfst9Vr0HwRRBvNihp1CJuOWGbk0H5a8yALDhLqoHazv2jlMQcLDgTktw0Jgo38+tcBShJyey1iHh8X5WgsS5/hgxR3OzoNBEzqzHUidMO/EI0ahNlM60l8EYL8Ww799NmPgqdPbwxK9nHsoFmx/NKhnUdronSg33L0CJZT3t2fccXAq+4Pbm7uYEkL3T/NgMdgpG5mKS3mKDtKyyKm2gOf3fVzExFew2etBxB3ANPEWvSuJ2XwXQv8sFE1722XQVR4RFgilCWUqXSN7EmqoHkNQ== jupiter@cvlproject
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAsBtPRJtDJzyW+Utu0v03wklUpvzS5c1E34ysGDMepGU8VT1phJQ2EwRPWVLdRjVHnuhrEeeUHMyQwOtLEdvTPFnw5u/4bHQ+37iwtAeTV6oyPARJVzJLRGuDUuFdkQbXN7xxi/0KUljWgswLN34UV+p5PL79kQlErh1QCN06z5k=
+
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2xrAkFRdYBpYs14AYSzdPFcIOt2zKXIgjPpyj/6eg/yl3y8N84T9VNw9ATRzb3+PJEw1lOfah6xLkFl7FueT6359y14c7wkNByGHgcL022SludkhM2zBe/3ebhcBs11L4Z725rqVnGDSKdKuwZjbCmUtu/nHwGYU/BnLKbQXMVyq53L5cbIyWGfvItPnwCF2ZMy1v0lmnFs1O3qDK9U/qcwc/77MTB0Z/ey0zsoXvmxjkdYr+zgQLRNm2+fkCXn+ZorbeDwWjhHE21arhMym5x3VG0XU2Ob9nL1Z2xEGQVSnBVWeadTMNzkfM8U07Md2tSOIC5B3ePETxk97puxbEQ== root@m2-m
+
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApJTDPfappcYbNE3Z0+5Vsm4Sw2xD3PdcW+V1w6X6tpebG/bpUhnn9XsALkZYyKttql2vV3bqL6Fx5ZAFhHRhH0exdQEgc8hSvpX5gCCCUNqrL+mP8f4S59E0ha5+nBmMaf4WABHiZYfeoGhn7HHNQY0Up/qfzDPSvWo+ZaVQAqXcYLGTxaP70yywHOYABakJtBVKKkI1YPu83HFDVfw1PoYVaS5GAmEscq6nwoyC0Jm/pDirUtMoRibG2iiV6uYKQDvWrO9fBrGmavpmUT/ECtmcnrWj7V9zXzSi17HJhkq6gYc68iu6h8TBNJrIUE9Kgi07aWFRM9fbIM1ZVD/aEQ== ec2-user@cvl23server
+
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpuXUhr1Vzl1WljuFYSFIArU8wtlKWpkVLF4hCUb4dVWNEPU/FM1gkg4hPH+rTNPManRAJ8vxiCtMgLtvae2j1elO0edkM6BZReVDFMYo0fZVBbVR8fzvXRWD5ArXJeNI2uZ4fYTil3SoC3N0n+ySjqFriIkcBpxthKVcoOlK+yccOvCPGNWgqcSGFfMEKTR8P18ED83i7sOF2nzpH0RBo2/N7ry5Gzvfw859W7KScw/3uI7fzog6hW/P4niOQIZfG56enHHos0l7oymxeQRiYITqvf9Es1VatEfybk+tJhTVf1LcIqoM9v9bc0yd6QqST0+6ZiTJXCQCthmS0JVX1 hines@tun
diff --git a/roles/extra_rpms/tasks/main.yml b/roles/extra_rpms/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ab2ca4e988e38176fa19762a08a4fd2af2f19d16
--- /dev/null
+++ b/roles/extra_rpms/tasks/main.yml
@@ -0,0 +1,12 @@
+---
+
+- name: "update cache"
+  shell: yum update -y
+  sudo: true
+
+- name: "Install extra packages"
+  yum: "name={{ item }} state=latest"
+  with_items:
+    pkgs
+  sudo: true
+
diff --git a/roles/extra_rpms/vars/main.yml b/roles/extra_rpms/vars/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..768896499182f393a9e8e6180dfa5ab481a89140
--- /dev/null
+++ b/roles/extra_rpms/vars/main.yml
@@ -0,0 +1,239 @@
+pkgs:
+ - atlas
+ - babel
+ - bc
+ - bitmap-console-fonts
+ - bitmap-fangsongti-fonts
+ - bitmap-fixed-fonts
+ - bitmap-fonts-compat
+ - bitmap-lucida-typewriter-fonts
+ - bitmap-miscfixed-fonts
+ - compiz-gnome
+ - db4-cxx
+ - db4-devel
+ - dejavu-sans-fonts
+ - enchant
+ - eog
+ - evince
+ - file-roller
+ - firefox
+ - firstboot
+ - fltk
+ - fontconfig
+ - fontpackages-filesystem
+ - freeglut
+ - ftgl
+ - fuse-sshfs
+ - gd
+ - gdbm-devel
+ - gdm
+ - gedit
+ - gettext
+ - gettext-libs
+ - ghostscript-fonts
+ - giflib
+ - giflib
+ - glibc
+ - glibc
+ - glx-utils
+ - gnome-applets
+ - gnome-backgrounds
+ - gnome-bluetooth-libs
+ - gnome-desktop
+ - gnome-disk-utility
+ - gnome-disk-utility-libs
+ - gnome-disk-utility-ui-libs
+ - gnome-doc-utils-stylesheets
+ - gnome-icon-theme
+ - gnome-keyring
+ - gnome-keyring-pam
+ - gnome-mag
+ - gnome-media
+ - gnome-media-libs
+ - gnome-menus
+ - gnome-panel
+ - gnome-panel-libs
+ - gnome-python2
+ - gnome-python2-applet
+ - gnome-python2-bonobo
+ - gnome-python2-canvas
+ - gnome-python2-desktop
+ - gnome-python2-extras
+ - gnome-python2-gconf
+ - gnome-python2-gnome
+ - gnome-python2-gnomevfs
+ - gnome-python2-libegg
+ - gnome-python2-libwnck
+ - gnome-screensaver
+ - gnome-session
+ - gnome-session-xsession
+ - gnome-settings-daemon
+ - gnome-speech
+ - gnome-system-monitor
+ - gnome-terminal
+ - gnome-themes
+ - gnome-user-docs
+ - gnome-user-share
+ - gnome-utils
+ - gnome-utils-libs
+ - gnome-vfs2
+ - gnome-vfs2-smb
+ - graphviz
+ - gsl
+ - gtkglext-libs
+ - gtksourceview2
+ - gvfs-fuse
+ - hal
+ - hdf
+ - hdf
+ - hdf5
+ - ImageMagick
+ - ImageMagick-c++
+ - inotify-tools
+ - java-1.7.0-openjdk
+ - jline
+ - leafpad
+ - libblkid
+ - libdrm
+ - libfontenc
+ - libgail-gnome
+ - libgnome
+ - libgnomecanvas
+ - libgnomekbd
+ - libgnomeui
+ - libICE
+ - libjpeg
+ - libopenraw-gnome
+ - libSM
+ - libuuid
+ - libX11
+ - libXau
+ - libXaw
+ - libxcb
+ - libXext
+ - libXext-devel
+ - libXfont
+ - libXi
+ - libXinerama
+ - libxml2
+ - libxml2-python
+ - libXp
+ - libXpm
+ - libXt
+ - libXtst
+ - mod_ssl
+ - mysql-server
+ - nagios-plugins
+ - nagios-plugins-disk
+ - nagios-plugins-load
+ - nagios-plugins-nrpe
+ - nagios-plugins-perl
+ - nagios-plugins-users
+ - nautilus
+ - nautilus-open-terminal
+ - neon
+ - nrpe
+ - nss-softokn-freebl
+ - numactl
+ - numpy
+ - numpy-f2py
+ - openmotif
+ - openssh-askpass
+ - openssl098e
+ - oxygen-icon-theme
+ - perl-devel
+ - perl-ExtUtils-MakeMaker
+ - perl-ExtUtils-ParseXS
+ - perl-Test-Harness
+ - perl-Time-HiRes
+ - pexpect
+ - php
+ - php-cli
+ - php-common
+ - php-ldap
+ - php-mysql
+ - php-pdo
+ - php-pear
+ - pinentry-gtk
+ - plymouth-system-theme
+ - polkit-gnome
+ - postgresql
+ - postgresql-libs
+ - postgresql-server
+ - PyGreSQL
+ - pygtksourceview
+ - python-babel
+ - python-dateutil
+ - python-devel
+ - python-matplotlib
+ - python-nose
+ - python-paramiko
+ - python-pmw
+ - python-setuptools
+ - pytz
+ - qhull
+ - qt
+ - qt3
+ - qt-sqlite
+ - qt-x11
+ - rhino
+ - scipy
+ - spice-vdagent
+ - suitesparse
+ - system-gnome-theme
+ - tcsh
+ - Terminal
+ - texlive-texmf-errata-fonts
+ - texlive-texmf-fonts
+ - tk
+ - tkinter
+ - tumbler
+ - tzdata-java
+ - unixODBC
+ - unzip
+ - util-linux-ng
+ - uuid
+ - wacomexpresskeys
+ - wdaemon
+ - wxBase
+ - wxGTK
+ - wxGTK-gl
+ - wxGTK-media
+ - wxpropgrid
+ - wxPython
+ - xml-common
+ - xml-commons-apis
+ - xml-commons-resolver
+ - xmlrpc-c
+ - xmlrpc-c-client
+ - xorg-x11-drivers
+ - xorg-x11-fonts-100dpi
+ - xorg-x11-fonts-75dpi
+ - xorg-x11-fonts-cyrillic
+ - xorg-x11-fonts-ethiopic
+ - xorg-x11-fonts-ISO8859-1-100dpi
+ - xorg-x11-fonts-ISO8859-14-100dpi
+ - xorg-x11-fonts-ISO8859-14-75dpi
+ - xorg-x11-fonts-ISO8859-15-100dpi
+ - xorg-x11-fonts-ISO8859-15-75dpi
+ - xorg-x11-fonts-ISO8859-1-75dpi
+ - xorg-x11-fonts-ISO8859-2-100dpi
+ - xorg-x11-fonts-ISO8859-2-75dpi
+ - xorg-x11-fonts-ISO8859-9-100dpi
+ - xorg-x11-fonts-ISO8859-9-75dpi
+ - xorg-x11-fonts-misc
+ - xorg-x11-fonts-Type1
+ - xorg-x11-font-utils
+ - xorg-x11-server-utils
+ - xorg-x11-server-Xorg
+ - xorg-x11-util-macros
+ - xorg-x11-utils
+ - xorg-x11-xauth
+ - xorg-x11-xinit
+ - xvattr
+ - yum-utils
+ - zip
+ - perl-HTML-Parser
+ - perl-HTML-Tagset 
+ - postgresql-contrib
+ - environment-modules
diff --git a/roles/modulefiles/tasks/main.yml b/roles/modulefiles/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9325b28977a7eb542e67f2a48642b44df7ad42a2
--- /dev/null
+++ b/roles/modulefiles/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: add /usr/local/Modules to the module file path
+  lineinfile: 
+  args:
+    dest: /usr/share/Modules/init/.modulespath
+    line: /usr/local/Modules/modulefiles
+  sudo: true
diff --git a/roles/nfs-client/tasks/mountFileSystem.yml b/roles/nfs-client/tasks/mountFileSystem.yml
index 1f7a8d17fb2d31c5cb1e3a10d0cd6e1bfcaacaf5..f37695de96babc5a2ab7d7ce185d120cae7fe3fd 100644
--- a/roles/nfs-client/tasks/mountFileSystem.yml
+++ b/roles/nfs-client/tasks/mountFileSystem.yml
@@ -11,7 +11,7 @@
   sudo: true
 
 - name: "Mounting NFS mounts"
-  mount: name={{ item.src }} src={{ item.ipv4 }}:{{ item.name }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
+  mount: name={{ item.name }} src={{ item.ipv4 }}:{{ item.src }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
   with_items: exportList 
   notify: "restart authentication"
   notify: "restart idmap"
@@ -26,7 +26,7 @@
   when: firstMount | failed
 
 - name: "Mounting NFS mounts"
-  mount: name={{ item.src }} src={{ item.ipv4 }}:{{ item.name }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
+  mount: name={{ item.name }} src={{ item.ipv4 }}:{{ item.src }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
   with_items: exportList 
   notify: "restart authentication"
   notify: "restart idmap"