diff --git a/bin/blackbox_addadmin.sh b/bin/blackbox_addadmin.sh
new file mode 100755
index 0000000..9ddb662
--- /dev/null
+++ b/bin/blackbox_addadmin.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd keyrings/live
+touch blackbox-admins.txt
+sort  -fdu -o blackbox-admins.txt <(echo "$1") blackbox-admins.txt
diff --git a/bin/blackbox_common.sh b/bin/blackbox_common.sh
index 2420cce..ec00a33 100755
--- a/bin/blackbox_common.sh
+++ b/bin/blackbox_common.sh
@@ -16,6 +16,9 @@ function fail_if_bad_environment() {
 
   :
 
+  # TODO: Consider: cd $(git rev-parse --show-toplevel)
+  # And: hg root
+
   ## Are we in the base directory.
   #if [[ ! $(pwd) =~ \/puppet$ ]]; then
   #  echo 'ERROR: Please run this script from the base directory.'