diff --git a/roles/sage905.mark2/defaults/main.yml b/roles/sage905.mark2/defaults/main.yml
index 87481b1..f4cd959 100755
--- a/roles/sage905.mark2/defaults/main.yml
+++ b/roles/sage905.mark2/defaults/main.yml
@@ -2,4 +2,6 @@
 # defaults file for sage905.mark2
 mark2_repo: "https://github.com/gsand/mark2.git"
 mark2_version: "master"
-mark2_keep_updated: true
\ No newline at end of file
+mark2_keep_updated: true
+minecraft_user: minecraft
+minecraft_group: minecraft
\ No newline at end of file
diff --git a/roles/sage905.mark2/tasks/main.yml b/roles/sage905.mark2/tasks/main.yml
index 9013957..d34f3ed 100755
--- a/roles/sage905.mark2/tasks/main.yml
+++ b/roles/sage905.mark2/tasks/main.yml
@@ -17,32 +17,13 @@
   yum: name="@Development tools" state=present
   when: ansible_os_family == 'RedHat'
   
-- name: Ensure git is available
+- name: Ensure required packages are available
   yum:
-    name: git
+    name:
+      - git
+      - nano
     state: present
 
-# Not needed with IDM  
-# - name: Create minecraft group
-#   become: true
-#   group: 
-#     name: minecraft 
-#     state: present 
-#     system: yes
-
-# - name: Create minecraft user
-#   become: true
-#   user:
-#     name: minecraft
-#     comment: "Minecraft Server"
-#     createhome: yes
-#     system: yes
-#     groups: minecraft
-#     home: /var/games/minecraft
-#     shell: /bin/bash
-#     state: present
-
-
 - name: Create Directories
   become: true
   file: 
@@ -52,16 +33,22 @@
     group: "{{ item.group }}"
     mode: "{{ item.mode }}"
   loop:
-    - {name: /usr/games/minecraft, state: directory, owner: minecraft, group: minecraft, mode: "0755"}
-    - {name: /var/games/minecraft, state: directory, owner: minecraft, group: minecraft, mode: "0755"}
+    - {name: /usr/games/minecraft, state: directory, owner: "{{ minecraft_user }}", group: "{{ minecraft_user }}", mode: "0755"}
+    - {name: /var/games/minecraft, state: directory, owner: "{{ minecraft_user }}", group: "{{ minecraft_user }}", mode: "0775"}
 
 - name: Allow group to access minecraft directory
   become: true
-  file: name=/var/games/minecraft group=minecraft mode=0775
+  file: name=/var/games/minecraft group={{ minecraft_user }} mode=0775
+
+- name: Set default editor to nano
+  copy:
+      dest: /etc/profile.d/nano.sh
+      content: 'export VISUAL="nano"\nexport EDITOR="nano"'
+      owner: root
 
 - name: Clone Mark2 git repo
   become: true
-  become_user: minecraft
+  become_user: "{{ minecraft_user }}"
   git: 
     repo: "{{ mark2_repo }}"
     version: "{{ mark2_version }}" 
@@ -71,7 +58,7 @@
 
 - name: Set git core.filemode setting
   become: true
-  become_user: minecraft
+  become_user: "{{ minecraft_user }}"
   ini_file:
     dest: /usr/games/minecraft/.git/config
     section: core
@@ -80,7 +67,7 @@
 
 - name: Give minecraft group access to server dir
   become: true
-  file: name=/var/games/minecraft/servers owner=minecraft group=minecraft mode=0775 state=directory
+  file: name=/var/games/minecraft/servers owner={{ minecraft_user }} group={{ minecraft_user }} mode=0775 state=directory
 
 - name: Python development tools available
   become: true
@@ -108,7 +95,7 @@
 
 - name: Link to executable
   become: true
-  file: src=/usr/games/minecraft/mark2 dest=/usr/local/bin/mark2 state=link
+  file: src=/usr/games/minecraft/mark2 dest=/usr/bin/mark2 state=link
   notify: Restart mark2
 
 # - name: Install mineos config from distribution
diff --git a/roles/sage905.waterfall/.travis.yml b/roles/sage905.waterfall/.travis.yml
new file mode 100644
index 0000000..36bbf62
--- /dev/null
+++ b/roles/sage905.waterfall/.travis.yml
@@ -0,0 +1,29 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' >ansible.cfg
+
+script:
+  # Basic role syntax check
+  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/roles/sage905.waterfall/README.md b/roles/sage905.waterfall/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/roles/sage905.waterfall/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/sage905.waterfall/defaults/main.yml b/roles/sage905.waterfall/defaults/main.yml
new file mode 100644
index 0000000..e91535d
--- /dev/null
+++ b/roles/sage905.waterfall/defaults/main.yml
@@ -0,0 +1,13 @@
+---
+# defaults file for sage905.waterfall
+minecraft_user: minecraft
+minecraft_group: minecraft
+waterfall_url: "https://papermc.io/ci/job/Waterfall/lastSuccessfulBuild/artifact/Waterfall-Proxy/bootstrap/target/Waterfall.jar"
+waterfall_module_url: "https://papermc.io/ci/job/Waterfall/lastSuccessfulBuild/artifact/Waterfall-Proxy/"
+waterfall_modules:
+  - cmd_alert
+  - cmd_find
+  - cmd_list
+  - cmd_send
+  - cmd_server
+  - reconnect_yaml
diff --git a/roles/sage905.waterfall/files/checkservers.sh b/roles/sage905.waterfall/files/checkservers.sh
new file mode 100644
index 0000000..5eba250
--- /dev/null
+++ b/roles/sage905.waterfall/files/checkservers.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+WATERFALL_DIR=/var/games/waterfall
+
+if [ -f /var/games/minecraft/.shutdown_mc ]; then
+  exit 1
+fi
+
+# Is Process running?
+ps -ef | grep -v grep | grep -q Waterfall.jar
+if [ $? -eq 1 ]; then
+  echo "Waterfall not running. Restarting... "  |  /bin/mail -s "Server Restart - WATERFALL"  ptoal@takeflight.ca
+  cd $WATERFALL_DIR && tmux new-session -d -s waterfall /usr/games/waterfall/run_waterfall.sh
+fi
\ No newline at end of file
diff --git a/roles/sage905.waterfall/files/run_waterfall.sh b/roles/sage905.waterfall/files/run_waterfall.sh
new file mode 100644
index 0000000..ae3f71e
--- /dev/null
+++ b/roles/sage905.waterfall/files/run_waterfall.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+cd /usr/games/waterfall
+java  -Xmx512M -Xms512M -jar /usr/games/waterfall/Waterfall.jar
\ No newline at end of file
diff --git a/roles/sage905.waterfall/handlers/main.yml b/roles/sage905.waterfall/handlers/main.yml
new file mode 100644
index 0000000..a227f38
--- /dev/null
+++ b/roles/sage905.waterfall/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for sage905.waterfall
\ No newline at end of file
diff --git a/roles/sage905.waterfall/meta/main.yml b/roles/sage905.waterfall/meta/main.yml
new file mode 100644
index 0000000..227ad9c
--- /dev/null
+++ b/roles/sage905.waterfall/meta/main.yml
@@ -0,0 +1,53 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.9
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
+  
\ No newline at end of file
diff --git a/roles/sage905.waterfall/tasks/main.yml b/roles/sage905.waterfall/tasks/main.yml
new file mode 100644
index 0000000..ffa38f8
--- /dev/null
+++ b/roles/sage905.waterfall/tasks/main.yml
@@ -0,0 +1,54 @@
+---
+# tasks file for sage905.waterfall
+- name: Tmux installed
+  yum:
+    name: tmux
+    state: latest
+    
+- name: Ensure Waterfall Directories exist
+  file:
+    name: "{{ item }}"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    state: directory
+  loop:
+    - /usr/games/waterfall
+    - /var/games/waterfall
+
+- name: Waterfall jar up to date
+  get_url:
+    url: "{{ waterfall_url }}"
+    dest: /usr/games/waterfall
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+  
+- name: Waterfall modules up to date
+  get_url:
+    url: "{{waterfall_module_url}}module/{{ item|regex_replace('_','-') }}/target/{{ item }}.jar"
+    dest: /usr/games/waterfall
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+  loop: "{{ waterfall_modules }}"
+
+- name: Waterfall scripts up to date
+  copy:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: minecraft
+    group: minecraft
+    mode: 0755
+  loop:
+    - { src: run_waterfall.sh, dest: /usr/games/waterfall }
+    - { src: checkservers.sh, dest: /usr/games/waterfall }
+
+- name: Set up crontab
+  cron:
+    month: '*'
+    job: /usr/games/waterfall/checkservers.sh
+    user: minecraft
+    day: '*'
+    minute: '*'
+    name: waterfall_check
+    hour: '*'
+    state: present
+    weekday: '*'
diff --git a/roles/sage905.waterfall/tests/inventory b/roles/sage905.waterfall/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/roles/sage905.waterfall/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/roles/sage905.waterfall/tests/test.yml b/roles/sage905.waterfall/tests/test.yml
new file mode 100644
index 0000000..9e920ee
--- /dev/null
+++ b/roles/sage905.waterfall/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - sage905.waterfall
\ No newline at end of file
diff --git a/roles/sage905.waterfall/vars/main.yml b/roles/sage905.waterfall/vars/main.yml
new file mode 100644
index 0000000..26ccc5d
--- /dev/null
+++ b/roles/sage905.waterfall/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for sage905.waterfall
\ No newline at end of file
diff --git a/site.yml b/site.yml
index 339d50c..a5c8d9c 100644
--- a/site.yml
+++ b/site.yml
@@ -44,4 +44,5 @@
   become: true
   roles:
     - sage905.mark2
+    - sage905.waterfall