diff --git a/checkuser b/checkuser
index f9dcb96..25ce0ff 100755
--- a/checkuser
+++ b/checkuser
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+set -o errexit \
+    -o pipefail \
+    -o nounset
+
 # Checks the year-based ACLs to see whether a user has reapplied
 # for their RC accounts that session.
 
@@ -31,8 +35,8 @@ id "$username" >/dev/null 2>/dev/null && echo "${GREEN}yes${RESET}" || echo "${R
 
 
 echo -n "User is in groups: "
-user_groups="$(groups "$username" 2>&1)"
-if [ $? == 0 ]; then
+if user_groups="$(groups "$username" 2>&1)"
+then
     echo "${GREEN}${user_groups#*:}${RESET}"
 else
     echo "${RED}${user_groups#groups: *:}${RESET}"
@@ -40,33 +44,76 @@ fi
 
 echo "" # Blank line for section separation
 
-declare -a sge_access_groups sge_access_group_labels
-sge_access_groups+=(AY201617)
-sge_access_group_labels+=("access group for 2016-2017")
-sge_access_groups+=(AY201718)
-sge_access_group_labels+=("access group for 2017-2018")
-sge_access_groups+=(AY201819)
-sge_access_group_labels+=("access group for 2018-2019")
-sge_access_groups+=(Open)
-sge_access_group_labels+=("Open access group")
-
-for (( access_group_index=0; access_group_index < "${#sge_access_groups[@]}"; access_group_index++ )); do
-    access_group="${sge_access_groups[$access_group_index]}"
-    access_group_label="${sge_access_group_labels[$access_group_index]}"
-
-    echo -n "Checking whether user is in $access_group_label: "
-    if qconf -su "$access_group" 2>/dev/null >/dev/null; then
-        qconf -su "$access_group" | grep -q "$username"
-        if [ $? == 0 ]
+function sge_check_acls() {
+    local access_group
+    local access_group_label
+    local -a sge_access_groups sge_access_group_labels
+
+    sge_access_groups+=(AY201617)
+    sge_access_group_labels+=("access group for 2016-2017")
+    sge_access_groups+=(AY201718)
+    sge_access_group_labels+=("access group for 2017-2018")
+    sge_access_groups+=(AY201819)
+    sge_access_group_labels+=("access group for 2018-2019")
+    sge_access_groups+=(Open)
+    sge_access_group_labels+=("Open access group")
+
+    for (( access_group_index=0; access_group_index < "${#sge_access_groups[@]}"; access_group_index++ )); do
+        access_group="${sge_access_groups[$access_group_index]}"
+        access_group_label="${sge_access_group_labels[$access_group_index]}"
+
+        echo -n "Checking whether user is in $access_group_label: "
+        if qconf -su "$access_group" 2>/dev/null >/dev/null; then
+            if qconf -su "$access_group" | grep -q "$username"
+            then
+              echo "${GREEN}yes${RESET}"
+            else
+              echo "${RED}no${RESET}"
+            fi
+        else
+            echo "${BLUE}no such group${RESET}"
+        fi
+    done
+}
+
+function sge_check_nosub() {
+    local username="$1"
+    echo -n "Checking whether user has been blocked from submitting jobs: "
+    if qconf -su NoSubmission 2>/dev/null >/dev/null
+    then
+        # check NoSubmission for blocked users
+        if qconf -su NoSubmission | grep -q "$username"
         then
-          echo "${GREEN}yes${RESET}"
+          echo "${RED}yes${RESET}"
         else
-          echo "${RED}no${RESET}"
+          echo "${GREEN}no${RESET}"
         fi
     else
-        echo "${BLUE}no such group${RESET}"
+        echo "${GREEN}no (no blocked ACL here)${RESET}"
     fi
-done
+}
+
+function slurm_check_user_exists() {
+    local username="$1"
+    echo -n "Checking whether user is in Slurm DB: "
+    command -v jq >/dev/null || echo "${RED}could not check, jq not found${RESET}"
+    if sacctmgr --json list user "$username" \
+        | jq -er '.users[].name' >/dev/null
+    then
+        echo "${GREEN}yes${RESET}"
+    else
+        echo "${RED}no${RESET}"
+    fi
+}
+
+
+if command -v qconf >/dev/null; then
+    sge_check_acls "$username"
+    sge_check_nosub "$username"
+elif command -v sacctmgr >/dev/null; then
+    slurm_check_user_exists "$username"
+fi
+
 
 echo -n "Checking whether user is in the actual PAM userlist: "
 pam_listfile="/var/opt/sge/shared/userlist"
@@ -79,26 +126,10 @@ else
     echo "${RED}no${RESET}"
 fi
 
-echo -n "Checking whether user has been blocked from submitting jobs: "
-if qconf -su NoSubmission 2>/dev/null >/dev/null
-then
-    # check NoSubmission for blocked users
-    qconf -su NoSubmission | grep -q "$username"
-    if [ $? == 0 ]
-    then
-      echo "${RED}yes${RESET}"
-    else
-      echo "${GREEN}no${RESET}"
-    fi
-else
-    echo "${GREEN}no (no blocked ACL here)${RESET}"
-fi
-
 echo "" # Blank line for section separation
 
 echo -n "Checking whether user has a home directory: "
-stat --printf='' "/home/${username}" 2>/dev/null
-if [ $? == 0 ]
+if stat --printf='' "/home/${username}" 2>/dev/null
 then
   echo "${GREEN}yes${RESET}"
 else
@@ -106,10 +137,10 @@ else
 fi
 
 echo -n "Checking whether user has a scratch directory: "
-stat --printf='' "/scratch/scratch/${username}" 2>/dev/null
-if [ $? == 0 ]
+if stat --printf='' "/scratch/scratch/${username}" 2>/dev/null
 then
   echo "${GREEN}yes${RESET}"
+  flag_has_no_scratch=n
 else
   echo "${RED}no${RESET}"
   flag_has_no_scratch=y
@@ -126,7 +157,7 @@ fi
 
 echo -n "Checking whether scratch directory is *owned* by that user: "
 owner="$(stat --printf=%U "/scratch/scratch/${username}" 2>/dev/null)"
-if [ -z "$flag_has_no_scratch" ]; 
+if [ "$flag_has_no_scratch" == "n" ]
 then
     if [ "$owner" == "$username" ]
     then
@@ -140,7 +171,7 @@ fi
 
 echo -n "Checking whether home directory is usable by owner: "
 perms="$(stat --printf=%A "/home/${username}" 2>/dev/null)"
-if [[ "${perms:1:3}" =~ rwx ]];
+if [[ "${perms:1:3}" =~ rwx ]]
 then
     echo "${GREEN}yes${RESET}"
 else 
@@ -148,7 +179,7 @@ else
 fi
 
 echo -n "Checking whether scratch directory is usable by owner: "
-if [ -z "$flag_has_no_scratch" ];
+if [ "$flag_has_no_scratch" == "n" ]
 then
     perms="$(stat --printf=%A "/scratch/scratch/${username}" 2>/dev/null)"
     if [[ "${perms:1:3}" =~ rwx ]];
diff --git a/copy_my_data.myriad.2020-05-11 b/copy_my_data.myriad.2020-05-11
deleted file mode 100755
index 533b355..0000000
--- a/copy_my_data.myriad.2020-05-11
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -o errexit \
-    -o nounset
-
-log_file="copy_log.$(date +%Y-%m-%d--%H:%M:%S)"
-
-echo "This will copy all your data from the Old Scratch space to the new Scratch space."
-echo ""
-echo "If it is interrupted, you can run it again, and it will pick up where it left off."
-echo ""
-echo "It will log progress to a file in your home directory, named: \"$log_file\""
-echo ""
-read -n 1 -p "Press any key to continue."
-
-cd
-rsync -avh --log-file="$log_file" OldScratch/ Scratch/
-
-
-
-
diff --git a/createuser b/createuser
index 5da9c56..557febf 100755
--- a/createuser
+++ b/createuser
@@ -4,7 +4,7 @@ set -e
 
 export LC_ALL=C
 
-PLATFORM=""
+cluster_name="${CLUSTER_NAME:-}"
 ACL=""
 
 # Make sure we have a userid to create
@@ -15,7 +15,7 @@ then
 fi 
 
 # Check that the userid starts with a letter and is alphanumeric, 7 chars
-if echo $1 | grep -qE '^[[:lower:]][[:lower:][:digit:]]{6}$' ;
+if echo "$1" | grep -qE '^[[:lower:]][[:lower:][:digit:]]{6}$' ;
 then
     echo "Valid user string: $1" 1>&2
 else
@@ -26,8 +26,22 @@ fi
 
 
 # Work out where we are
-</opt/sge/default/common/cluster_name read -r PLATFORM || (echo "Error: could not determine cluster." >&2; exit 1)
-case "$PLATFORM" in
+if [[ -n "$cluster_name" ]]; then
+    # Allow overriding cluster_name for testing/whatever
+    echo "Warning: cluster name overridden as \"$cluster_name\"" >&2
+    cluster_name="$cluster_name"
+elif [[ -r /opt/sge/default/common/cluster_name ]]; then
+    cluster_name="$(cat /opt/sge/default/common/cluster_name)"
+elif command -v sacctmgr >/dev/null; then
+    cluster_name="$(sacctmgr -pn list cluster | cut -f 1 -d '|')"
+elif [[ -r /shared/ucl/etc/cluster_name ]]; then
+    cluster_name="$(cat /shared/ucl/etc/cluster_name)"
+else
+    echo "Error: could not find a way to determine cluster name." >&2
+    exit 1
+fi
+
+case "$cluster_name" in
     "grace")
         ACL="Open"
         ;;
@@ -45,12 +59,12 @@ case "$PLATFORM" in
         exit 1
         ;;
     *)
-        echo "Error: unknown cluster: $PLATFORM" >&2
+        echo "Error: unknown cluster: $cluster_name" >&2
         exit 1
         ;;
 esac
 
-if [[ "$PLATFORM" == "legion" ]]; then
+if [[ "$cluster_name" == "legion" ]]; then
     echo "Reminder: new accounts unassociated with existing paid projects 
           are no longer to be created on Legion (as of 2019-01-01). "
     read -r -p "Are you sure you want to create this account? Please type 'yes' if so: " response
@@ -60,7 +74,7 @@ if [[ "$PLATFORM" == "legion" ]]; then
     fi
 fi
 
-if [[ "$PLATFORM" == "grace" ]]; then
+if [[ "$cluster_name" == "grace" ]]; then
     echo "Reminder: new accounts are no longer to be created on Grace."
     read -r -p "Are you sure you want to create this account? Please type 'yes' if so: " response
     if [[ "$response" != "yes" ]]; then
@@ -70,16 +84,29 @@ if [[ "$PLATFORM" == "grace" ]]; then
 fi
 
 echo "creating account for $1"
-qconf -au "$1" "$ACL"
+if command -v qconf >/dev/null; then
+    qconf -au "$1" "$ACL"
+elif command -v sacctmgr >/dev/null; then
+    echo "Slurm user adding is not yet implemented since the details of cluster implementation have not yet been finalised."
+    echo "You'll need the sacctmgr command, probably something like this:"
+    echo ""
+    echo "  sacctmgr add user name=\"\$username\""
+    echo ""
+    echo "You'll also need at least Operator privileges on Slurm. (Or sudo access to get them.)"
+    exit 1
+else
+    echo "Error: no mechanism for adding users found." >&2
+    exit 1
+fi
 
 RECIPIENT=$1@ucl.ac.uk
 echo "Emailing user ${RECIPIENT}"
 /usr/sbin/sendmail -t<<EOF
 From: rc-support@ucl.ac.uk
 To: ${RECIPIENT}
-Subject: ${PLATFORM^} account
+Subject: ${cluster_name^} account
 
-We are happy to confirm that your account to use the Research Computing ${PLATFORM^} 
+We are happy to confirm that your account to use the Research Computing ${cluster_name^} 
 HPC cluster is now active. You should be able to log in within 5 minutes of 
 receiving this email.
 
@@ -88,7 +115,7 @@ the system.
 
 GETTING HELP 
 
-Information to help you get started in using ${PLATFORM^} is available at 
+Information to help you get started in using ${cluster_name^} is available at 
 
 https://www.rc.ucl.ac.uk/docs/
 
@@ -97,7 +124,7 @@ including a user guide covering all of our systems.
 ANNOUNCEMENTS 
 
 Emails relating to planned outages, service changes etc will be sent to the
-${PLATFORM}-users@ucl.ac.uk email list. You have been subscribed to this
+${cluster_name}-users@ucl.ac.uk email list. You have been subscribed to this
 list using the email address associated with your main UCL userid - please
 make sure that you read all notices sent to this address promptly and
 observe the requests/guidelines they contain. 
diff --git a/budgets b/gold/budgets
similarity index 100%
rename from budgets
rename to gold/budgets
diff --git a/gbalance b/gold/gbalance
similarity index 100%
rename from gbalance
rename to gold/gbalance
diff --git a/gchproject b/gold/gchproject
similarity index 100%
rename from gchproject
rename to gold/gchproject
diff --git a/glsaccount b/gold/glsaccount
similarity index 100%
rename from glsaccount
rename to gold/glsaccount
diff --git a/glsalloc b/gold/glsalloc
similarity index 100%
rename from glsalloc
rename to gold/glsalloc
diff --git a/glsproject b/gold/glsproject
similarity index 100%
rename from glsproject
rename to gold/glsproject
diff --git a/glsres b/gold/glsres
similarity index 100%
rename from glsres
rename to gold/glsres
diff --git a/glstxn b/gold/glstxn
similarity index 100%
rename from glstxn
rename to gold/glstxn
diff --git a/glsuser b/gold/glsuser
similarity index 100%
rename from glsuser
rename to gold/glsuser
diff --git a/gmkuser b/gold/gmkuser
similarity index 100%
rename from gmkuser
rename to gold/gmkuser
diff --git a/gstatement b/gold/gstatement
similarity index 100%
rename from gstatement
rename to gold/gstatement
diff --git a/gtransfer b/gold/gtransfer
similarity index 100%
rename from gtransfer
rename to gold/gtransfer
diff --git a/gusage b/gold/gusage
similarity index 100%
rename from gusage
rename to gold/gusage
diff --git a/refreshsafegold b/gold/refreshsafegold
similarity index 100%
rename from refreshsafegold
rename to gold/refreshsafegold
diff --git a/safegold b/gold/safegold
similarity index 100%
rename from safegold
rename to gold/safegold
diff --git a/transfergold b/gold/transfergold
similarity index 100%
rename from transfergold
rename to gold/transfergold
diff --git a/isha256sum b/irods/isha256sum
similarity index 100%
rename from isha256sum
rename to irods/isha256sum
diff --git a/mkiconfig b/irods/mkiconfig
similarity index 100%
rename from mkiconfig
rename to irods/mkiconfig
diff --git a/createMichaeluser b/mmm/createMichaeluser
similarity index 100%
rename from createMichaeluser
rename to mmm/createMichaeluser
diff --git a/createThomasuser b/mmm/createThomasuser
similarity index 100%
rename from createThomasuser
rename to mmm/createThomasuser
diff --git a/createYounguser b/mmm/createYounguser
similarity index 100%
rename from createYounguser
rename to mmm/createYounguser
diff --git a/michael-add b/mmm/michael-add
similarity index 100%
rename from michael-add
rename to mmm/michael-add
diff --git a/michael-create b/mmm/michael-create
similarity index 100%
rename from michael-create
rename to mmm/michael-create
diff --git a/michael-deactivate b/mmm/michael-deactivate
similarity index 100%
rename from michael-deactivate
rename to mmm/michael-deactivate
diff --git a/michael-show b/mmm/michael-show
similarity index 100%
rename from michael-show
rename to mmm/michael-show
diff --git a/mmm-to-email b/mmm/mmm-to-email
similarity index 100%
rename from mmm-to-email
rename to mmm/mmm-to-email
diff --git a/thomas-add b/mmm/thomas-add
similarity index 100%
rename from thomas-add
rename to mmm/thomas-add
diff --git a/thomas-add-test b/mmm/thomas-add-test
similarity index 100%
rename from thomas-add-test
rename to mmm/thomas-add-test
diff --git a/thomas-allocs b/mmm/thomas-allocs
similarity index 100%
rename from thomas-allocs
rename to mmm/thomas-allocs
diff --git a/thomas-create b/mmm/thomas-create
similarity index 100%
rename from thomas-create
rename to mmm/thomas-create
diff --git a/thomas-deactivate b/mmm/thomas-deactivate
similarity index 100%
rename from thomas-deactivate
rename to mmm/thomas-deactivate
diff --git a/thomas-show b/mmm/thomas-show
similarity index 100%
rename from thomas-show
rename to mmm/thomas-show
diff --git a/thomas-show-test b/mmm/thomas-show-test
similarity index 100%
rename from thomas-show-test
rename to mmm/thomas-show-test
diff --git a/thomas/allocations.py b/mmm/thomas/allocations.py
similarity index 100%
rename from thomas/allocations.py
rename to mmm/thomas/allocations.py
diff --git a/thomas/mmm_to_email.py b/mmm/thomas/mmm_to_email.py
similarity index 100%
rename from thomas/mmm_to_email.py
rename to mmm/thomas/mmm_to_email.py
diff --git a/thomas/safe_gold.py b/mmm/thomas/safe_gold.py
similarity index 100%
rename from thomas/safe_gold.py
rename to mmm/thomas/safe_gold.py
diff --git a/thomas/safe_json_decoder.py b/mmm/thomas/safe_json_decoder.py
similarity index 100%
rename from thomas/safe_json_decoder.py
rename to mmm/thomas/safe_json_decoder.py
diff --git a/thomas/safe_tickets.py b/mmm/thomas/safe_tickets.py
similarity index 100%
rename from thomas/safe_tickets.py
rename to mmm/thomas/safe_tickets.py
diff --git a/thomas/thomas_add.py b/mmm/thomas/thomas_add.py
similarity index 100%
rename from thomas/thomas_add.py
rename to mmm/thomas/thomas_add.py
diff --git a/thomas/thomas_create.py b/mmm/thomas/thomas_create.py
similarity index 100%
rename from thomas/thomas_create.py
rename to mmm/thomas/thomas_create.py
diff --git a/thomas/thomas_deactivate.py b/mmm/thomas/thomas_deactivate.py
similarity index 100%
rename from thomas/thomas_deactivate.py
rename to mmm/thomas/thomas_deactivate.py
diff --git a/thomas/thomas_queries.py b/mmm/thomas/thomas_queries.py
similarity index 100%
rename from thomas/thomas_queries.py
rename to mmm/thomas/thomas_queries.py
diff --git a/thomas/thomas_show.py b/mmm/thomas/thomas_show.py
similarity index 100%
rename from thomas/thomas_show.py
rename to mmm/thomas/thomas_show.py
diff --git a/thomas/thomas_utils.py b/mmm/thomas/thomas_utils.py
similarity index 100%
rename from thomas/thomas_utils.py
rename to mmm/thomas/thomas_utils.py
diff --git a/thomas/validate.py b/mmm/thomas/validate.py
similarity index 100%
rename from thomas/validate.py
rename to mmm/thomas/validate.py
diff --git a/young-add b/mmm/young-add
similarity index 100%
rename from young-add
rename to mmm/young-add
diff --git a/young-allocs b/mmm/young-allocs
similarity index 100%
rename from young-allocs
rename to mmm/young-allocs
diff --git a/young-create b/mmm/young-create
similarity index 100%
rename from young-create
rename to mmm/young-create
diff --git a/young-deactivate b/mmm/young-deactivate
similarity index 100%
rename from young-deactivate
rename to mmm/young-deactivate
diff --git a/young-show b/mmm/young-show
similarity index 100%
rename from young-show
rename to mmm/young-show
diff --git a/findtrouble b/sge/findtrouble
similarity index 100%
rename from findtrouble
rename to sge/findtrouble
diff --git a/nodeclass b/sge/nodeclass
similarity index 100%
rename from nodeclass
rename to sge/nodeclass
diff --git a/nodesforjob b/sge/nodesforjob
similarity index 100%
rename from nodesforjob
rename to sge/nodesforjob
diff --git a/nodetypes b/sge/nodetypes
similarity index 100%
rename from nodetypes
rename to sge/nodetypes
diff --git a/qexplain b/sge/qexplain
similarity index 100%
rename from qexplain
rename to sge/qexplain
diff --git a/qq b/sge/qq
similarity index 100%
rename from qq
rename to sge/qq
diff --git a/schednodes b/sge/schednodes
similarity index 100%
rename from schednodes
rename to sge/schednodes
diff --git a/scriptfor b/sge/scriptfor
similarity index 100%
rename from scriptfor
rename to sge/scriptfor
diff --git a/unownednodes b/sge/unownednodes
similarity index 100%
rename from unownednodes
rename to sge/unownednodes
diff --git a/whatsonmynode b/sge/whatsonmynode
similarity index 100%
rename from whatsonmynode
rename to sge/whatsonmynode
diff --git a/to-grace b/to-grace
deleted file mode 100755
index c469793..0000000
--- a/to-grace
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-E_DOESNOTEXIST=2
-E_UNKNOWNSOURCE=4
-E_NOTYOURS=5
-E_NOTTHOSEFILES=6
-E_FAILEDREADLINK=7
-
-if  hostname -A | grep -q legion
-then
-   target_host="login01.ext.grace.ucl.ac.uk"
-elif hostname -A | grep -q grace
-then
-   target_host="login05.external.legion.ucl.ac.uk"
-else
-   echo -e "This script does not know where it is.\n It is panicking, like a lost kitten. \n"
-   exit $E_UNKNOWNSOURCE
-fi
-
-for source in "$@"; do
-  if [ ! -e "$source" ]; then
-    echo "File or directory does not exist: $source" >&2
-    exit $E_DOESNOTEXIST
-  fi
-
-  source_path=`readlink -e "$source"`
-
-  if [ $? -ne 0 ]; then
-    echo "Could not determine full path of file: $source" >&2
-    exit $E_FAILEDREADLINK
-  fi
-
-  # Check owner of target
-  owner=`stat -c%U "$source_path"`
-  current_user=`whoami`
-
-  if [ "$owner" != "$current_user" ]; then
-    echo "This script will not operate on files you do not own." >&2
-    exit $E_NOTYOURS
-  fi
-
-
-  echo "Trying to transfer: ${source_path}" >&2
-  case "${source_path}" in
-    /imports/iridis/*)
-      tar -cz ${source_path} | ssh -t "$target_host" tar -xvz --xform="simports/iridis/${current_user}/iridis_import/"
-      # ^-- So, if you send over your iridis files, they'll end up in
-      #  ~/iridis_imports
-      # which isn't ideal but isn't the worst either
-      #
-      # At least I hope that's what'll happen
-      # oh and tar strips the leading / automatically
-      ;;
-    /home/${current_user}/*|/imports/home?/${current_user}/*|/scratch/scratch/${current_user}/*)
-      tar -cz ${source_path} | ssh -t "$target_host" tar -xvz --xform="simports/home./${current_user}/./"
-     # ^-- I was going to use rsync here but the /imports/home? link messed that up 
-      #rsync -a --stats -r --relative "$source_path" "$target_host":"$target_relative"
-      ;;
-    *)
-      echo "This script will not operate on files outside your home or Scratch area." >&2
-      exit $E_NOTTHOSEFILES
-      ;;
-  esac
-
-done