diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index cd80d7cb0d9..225ab2fd72e 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -18,6 +18,14 @@
 # under the License.
 #
 
+#
+# Environment variables that can be set to influence the behavior
+# of this script
+#
+# ACCUMULO_LOCALHOST_ADDRESSES - set to a space delimited string of localhost names
+#                                and addresses to override the default lookups
+#
+
 function print_usage {
   cat <<EOF
 Usage: accumulo-cluster <command> (<argument> ...) [<option> ...]
@@ -27,19 +35,139 @@ Options:
 
 Commands:
   create-config              Creates cluster config
-  restart                    Restarts the Accumulo cluster
-  start                      Starts Accumulo cluster
-  stop                       Stops Accumulo cluster
-  kill                       Kills Accumulo cluster
-  start-servers [--all|--tservers [group]|--sservers [group]|--compactors [group]]
-                             Starts various server types, can optionally specify a group
-  stop-servers [--all|--tservers [group]|--sservers [group]|--compactors [group]]
-                             Starts various server types, can optionally specify a group
-  start-here                 Starts all services on this node
-  stop-here                  Stops all services on this node
+  start-here                 Starts all services on this node (deprecated, alias for "start --local --all")
+  stop-here                  Stops all services on this node (deprecated, alias for "stop --local --all")
+  restart [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
+                             Restarts the Accumulo cluster
+  start [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
+                             Starts Accumulo cluster services
+  stop [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
+                             Stops Accumulo cluster services
+  kill [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
+                             Kills Accumulo cluster services
+
+  Examples:
+
+  accumulo-cluster start                                   # start all servers
+  accumulo-cluster start --dry-run                         # print debug information and commands to be executed
+  accumulo-cluster start --local                           # start all local services
+  accumulo-cluster start --local --manager                 # start local manager services
+  accumulo-cluster start --tservers                        # start all tservers
+  accumulo-cluster start --tservers=group1                 # start all group1 tservers
+  accumulo-cluster start --local --manager --tservers      # Start the local manager and local tservers
+
 EOF
 }
 
+function parse_args {
+  DEBUG=0
+  ARG_LOCAL=0
+  ARG_ALL=0
+  ARG_MANAGER=0
+  ARG_GC=0
+  ARG_MONITOR=0
+  ARG_TSERVER=0
+  ARG_TSERVER_GROUP=""
+  ARG_SSERVER=0
+  ARG_SSERVER_GROUP=""
+  ARG_COMPACTOR=0
+  ARG_COMPACTOR_GROUP=""
+
+  PARSE_OUTPUT=$(getopt -o "" --long "dry-run,all,local,manager,gc,monitor,tservers::,sservers::,compactors::" -n 'accumulo-cluster' -- "$@")
+  eval set -- "$PARSE_OUTPUT"
+
+  while true; do
+    case "$1" in
+      --dry-run)
+        DEBUG=1
+        debug "debug: ${DEBUG} args: ${PARSE_OUTPUT}"
+        shift 1
+        ;;
+      --all)
+        ARG_ALL=1
+        shift 1
+        ;;
+      --local)
+        ARG_LOCAL=1
+        shift 1
+        ;;
+      --manager)
+        ARG_MANAGER=1
+        shift 1
+        ;;
+      --gc)
+        ARG_GC=1
+        shift 1
+        ;;
+      --monitor)
+        ARG_MONITOR=1
+        shift 1
+        ;;
+      --tservers)
+        ARG_TSERVER=1
+        if [ -n "$2" ]; then
+          ARG_TSERVER_GROUP="$2"
+        fi
+        shift 2
+        ;;
+      --sservers)
+        ARG_SSERVER=1
+        if [ -n "$2" ]; then
+          ARG_SSERVER_GROUP="$2"
+        fi
+        shift 2
+        ;;
+      --compactors)
+        ARG_COMPACTOR=1
+        if [ -n "$2" ]; then
+          ARG_COMPACTOR_GROUP="$2"
+        fi
+        shift 2
+        ;;
+      --)
+        shift
+        break
+        ;;
+      *)
+        echo "Unhandled option: $1"
+        print_usage
+        exit 1
+        ;;
+    esac
+  done
+
+  # All and any of the others are mutually exclusive
+  if [[ $ARG_ALL == 1 && ($ARG_MANAGER == 1 ||
+    $ARG_GC == 1 || $ARG_MONITOR == 1 || $ARG_TSERVER == 1 ||
+    $ARG_SSERVER == 1 || $ARG_COMPACTOR == 1) ]]; then
+    echo "--all cannot be used with other options"
+    print_usage
+    exit 1
+  fi
+
+  # Handle the case where no args were passed
+  if [[ $ARG_MANAGER == 0 && $ARG_GC == 0 &&
+    $ARG_MONITOR == 0 && $ARG_TSERVER == 0 &&
+    $ARG_SSERVER == 0 && $ARG_COMPACTOR == 0 ]]; then
+    ARG_ALL=1
+  fi
+
+  if isDebug; then
+    echo "DEBUG=$DEBUG"
+    echo "ARG_ALL=$ARG_ALL"
+    echo "ARG_LOCAL=$ARG_LOCAL"
+    echo "ARG_MANAGER=$ARG_MANAGER"
+    echo "ARG_GC=$ARG_GC"
+    echo "ARG_MONITOR=$ARG_MONITOR"
+    echo "ARG_TSERVER=$ARG_TSERVER"
+    echo "ARG_TSERVER_GROUP=$ARG_TSERVER_GROUP"
+    echo "ARG_SSERVER=$ARG_SSERVER"
+    echo "ARG_SSERVER_GROUP=$ARG_SSERVER_GROUP"
+    echo "ARG_COMPACTOR=$ARG_COMPACTOR"
+    echo "ARG_COMPACTOR_GROUP=$ARG_COMPACTOR_GROUP"
+  fi
+}
+
 function invalid_args {
   echo -e "Invalid arguments: $1\n"
   print_usage 1>&2
@@ -67,6 +195,27 @@ debugAndRun() {
   fi
 }
 
+function canRunOnHost() {
+
+  if [[ $ARG_LOCAL == 0 ]]; then
+    return 0
+  fi
+
+  if [[ -z $1 ]]; then
+    echo "Host argument expected"
+    exit 1
+  fi
+
+  local found=0
+  for addr in "${LOCAL_HOST_ADDRESSES[@]}"; do
+    if [[ $1 == "$addr" ]]; then
+      found=1
+      break
+    fi
+  done
+  [[ $found == 1 ]]
+}
+
 function parse_config {
 
   if [[ ! -f ${conf}/cluster.yaml ]]; then
@@ -142,474 +291,168 @@ function parse_config {
 
 }
 
-function control_service() {
+function execute_command() {
   control_cmd="$1"
   host="$2"
   service="$3"
-  servers_per_host="$4"
-
-  if [[ $host == localhost || $host == "$(hostname -s)" || $host == "$(hostname -f)" || "$(hostname -I)" =~ $host ]]; then
-    #
-    # The server processes take arguments using "-o". Always add the "general.process.bind.addr" argument
-    # using the value of $host
-    #
-    if [[ $# -gt 4 ]]; then
-      debugAndRun ACCUMULO_CLUSTER_ARG="${servers_per_host}" "${bin}/accumulo-service" "$service" "$control_cmd" "-o" "general.process.bind.addr=$host" "${@:5}"
-    else
-      debugAndRun ACCUMULO_CLUSTER_ARG="${servers_per_host}" "${bin}/accumulo-service" "$service" "$control_cmd" "-o" "general.process.bind.addr=$host"
-    fi
-  else
-    if [[ $# -gt 4 ]]; then
-      EXTRA_ARGS="${*:5}"
-      debugAndRun "$SSH" "$host" "bash -c 'ACCUMULO_CLUSTER_ARG=${servers_per_host} ${bin}/accumulo-service \"$service\" \"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\" $EXTRA_ARGS '"
-    else
-      debugAndRun "$SSH" "$host" "bash -c 'ACCUMULO_CLUSTER_ARG=${servers_per_host} ${bin}/accumulo-service \"$service\" \"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\"'"
-    fi
-  fi
-}
+  group="$4"
+  shift 4
 
-function start_service() {
-  control_service start "$@"
-}
+  S="${service^^}S_PER_HOST_${group}"
+  servers_per_host="${!S:-1}"
 
-function start_compactors() {
-  if [[ -z $COMPACTOR_GROUPS ]]; then
-    echo "No compactor groups configured..."
+  if [[ $ARG_LOCAL == 1 ]]; then
+    debugAndRun ACCUMULO_CLUSTER_ARG="${servers_per_host}" "${bin}/accumulo-service" "$service" "$control_cmd" "-o" "general.process.bind.addr=$host" "$@"
   else
-    echo -n "Starting compactor servers ..."
-    groups=$COMPACTOR_GROUPS
-    if [[ -n $1 ]]; then
-      groups="$1"
-      echo "Only starting servers for group: ${groups}"
-    fi
-    for group in $groups; do
-      Q="COMPACTOR_HOSTS_${group}"
-      S="COMPACTORS_PER_HOST_${group}"
-      if [[ -n ${!Q} ]]; then
-        for compactor in ${!Q}; do
-          start_service "$compactor" compactor "${!S}" "-o" "compactor.group=$group"
-        done
-      else
-        echo "${group} is not a valid compactor group ...exiting"
-      fi
-    done
+    debugAndRun "$SSH" "$host" "bash -c 'ACCUMULO_CLUSTER_ARG=${servers_per_host} ${bin}/accumulo-service \"$service\" \"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\" ${*@Q}'"
   fi
 }
 
-function stop_compactors() {
-  if [[ -z $COMPACTOR_GROUPS ]]; then
-    echo "No compactor groups configured..."
+function compute_localhost_addresses() {
+  if [[ -n $ACCUMULO_LOCALHOST_ADDRESSES ]]; then
+    read -r -a LOCAL_HOST_ADDRESSES <<<"$ACCUMULO_LOCALHOST_ADDRESSES"
   else
-    echo "Stopping compactor servers ..."
-    groups=$COMPACTOR_GROUPS
-    if [[ -n $1 ]]; then
-      groups="$1"
-      echo "Only stopping servers for group: ${groups}"
-    fi
-    for group in $groups; do
-      Q="COMPACTOR_HOSTS_${group}"
-      S="COMPACTORS_PER_HOST_${group}"
-      if [[ -n ${!Q} ]]; then
-        for compactor in ${!Q}; do
-          stop_service "$compactor" compactor "${!S}" "-o" "compactor.group=$group"
-        done
-      else
-        echo "${group} is not a valid compaction group ...exiting"
-      fi
-    done
+    read -r -a localhost_names <<<"$(getent hosts | tr '\n' ' ' | tr -s ' ' | tr ' ' '\n' | sort -u | tr '\n' ' ')"
+    read -r -a localhost_interfaces <<<"$(hostname -I)"
+    LOCAL_HOST_ADDRESSES+=("${localhost_names[@]}" "${localhost_interfaces[@]}")
   fi
+  debug "${LOCAL_HOST_ADDRESSES[*]}"
 }
 
-function start_sservers() {
-  if [[ -z $SSERVER_GROUPS ]]; then
-    echo "No scan server groups configured..."
-  else
-    echo "Starting scan servers ..."
-    groups=$SSERVER_GROUPS
-    if [[ -n $1 ]]; then
-      groups="$1"
-      echo "Only starting servers for group: ${groups}"
-    fi
-    for group in $groups; do
-      G="SSERVER_HOSTS_${group}"
-      S="SSERVERS_PER_HOST_${group}"
-      if [[ -n ${!G} ]]; then
-        for sserver in ${!G}; do
-          start_service "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-        done
-      else
-        echo "${group} is not a valid resource group ...exiting"
-      fi
-    done
+function control_services() {
+  unset DISPLAY
+  operation="$1"
+
+  if [[ $operation != "start" &&
+    $operation != "stop" &&
+    $operation != "kill" ]]; then
+    echo "Invalid operation: $operation"
+    exit 1
   fi
-}
 
-function stop_sservers() {
-  if [[ -z $SSERVER_GROUPS ]]; then
-    echo "No scan server groups configured..."
-  else
-    echo "Stopping scan servers ..."
-    groups=$SSERVER_GROUPS
-    if [[ -n $1 ]]; then
-      groups="$1"
-      echo "Only stopping servers for group: ${groups}"
-    fi
-    for group in $groups; do
-      G="SSERVER_HOSTS_${group}"
-      S="SSERVERS_PER_HOST_${group}"
-      if [[ -n ${!G} ]]; then
-        for sserver in ${!G}; do
-          stop_service "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-        done
+  if [[ $ARG_ALL == 1 && $operation == "stop" ]]; then
+    echo "Stopping Accumulo cluster..."
+    if ! isDebug; then
+      if ! ${accumulo_cmd} admin stopAll; then
+        echo "Invalid password or unable to connect to the manager"
+        echo "Initiating forced shutdown in 15 seconds (Ctrl-C to abort)"
+        sleep 10
+        echo "Initiating forced shutdown in  5 seconds (Ctrl-C to abort)"
       else
-        echo "${group} is not a valid resource group ...exiting"
+        echo "Accumulo shut down cleanly"
+        echo "Utilities and unresponsive servers will shut down in 5 seconds (Ctrl-C to abort)"
       fi
+      sleep 5
+    fi
+  elif [[ $ARG_LOCAL == 1 && $ARG_TSERVER == 1 && $operation == "stop" ]]; then
+    tserver_groups=$TSERVER_GROUPS
+    if [[ -n $ARG_TSERVER_GROUP ]]; then
+      tserver_groups=$ARG_TSERVER_GROUP
+    fi
+    for addr in "${LOCAL_HOST_ADDRESSES[@]}"; do
+      for group in $tserver_groups; do
+        G="TSERVER_HOSTS_${group}"
+        for tserver in ${!G}; do
+          if echo "$tserver" | grep -q "$addr"; then
+            if ! isDebug; then
+              ${accumulo_cmd} admin stop "$addr"
+            else
+              debug "Stopping tservers on $addr via admin command"
+            fi
+          fi
+        done
+      done
     done
+  elif [[ $ARG_ALL == 1 && $operation == "kill" ]]; then
+    echo "Killing Accumulo cluster..."
   fi
-}
-
-function start_tservers() {
-  echo "Starting tablet servers ..."
-  groups=$TSERVER_GROUPS
-  if [[ -n $1 ]]; then
-    groups="$1"
-    echo "Only starting servers for group: ${groups}"
-  fi
-  for group in $groups; do
-    echo "Starting tablet servers for group $group"
-    count=1
-    G="TSERVER_HOSTS_${group}"
-    S="TSERVERS_PER_HOST_${group}"
-    for tserver in ${!G}; do
-      echo -n "."
-      start_service "$tserver" tserver "${!S}" "-o" "tserver.group=$group"
-      if ((++count % 72 == 0)); then
-        echo
-        wait
-      fi
-    done
-  done
-  echo " done"
-}
-
-function start_all() {
-  unset DISPLAY
-
-  start_tservers
-
-  for manager in $MANAGER_HOSTS; do
-    start_service "$manager" manager "1"
-  done
-
-  for gc in $GC_HOSTS; do
-    start_service "$gc" gc "1"
-  done
-
-  for monitor in $MONITOR_HOSTS; do
-    start_service "$monitor" monitor "1"
-  done
-
-  for group in $SSERVER_GROUPS; do
-    echo "Starting scan servers for group $group"
-    G="SSERVER_HOSTS_${group}"
-    S="SSERVERS_PER_HOST_${group}"
-    for sserver in ${!G}; do
-      start_service "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-    done
-  done
-
-  for group in $COMPACTOR_GROUPS; do
-    echo "Starting compactors for group $group"
-    Q="COMPACTOR_HOSTS_${group}"
-    S="COMPACTORS_PER_HOST_${group}"
-    for compactor in ${!Q}; do
-      start_service "$compactor" compactor "${!S}" "-o" "compactor.group=$group"
-    done
-  done
-
-}
 
-function start_here() {
-
-  local_hosts="$(hostname -a 2>/dev/null) $(hostname) localhost 127.0.0.1 $(hostname -I)"
-
-  for group in $TSERVER_GROUPS; do
-    echo "Starting tablet servers for group $group"
-    for host in $local_hosts; do
-      G="TSERVER_HOSTS_${group}"
-      S="TSERVERS_PER_HOST_${group}"
-      for tserver in ${!G}; do
-        if echo "$tserver" | grep -q "^${host}\$"; then
-          start_service "$tserver" tserver "${!S}" "-o" "tserver.group=$group"
+  if [[ $ARG_ALL == 1 || $ARG_TSERVER == 1 ]]; then
+    tserver_groups=$TSERVER_GROUPS
+    if [[ -n $ARG_TSERVER_GROUP ]]; then
+      tserver_groups=$ARG_TSERVER_GROUP
+    fi
+    for group in $tserver_groups; do
+      echo "${cmd}ing tablet servers for group $group"
+      count=1
+      hosts="TSERVER_HOSTS_${group}"
+      for tserver in ${!hosts}; do
+        if canRunOnHost "$tserver"; then
+          echo -n "."
+          execute_command "$operation" "$tserver" tserver "${group}" "-o" "tserver.group=$group"
+          if ((++count % 72 == 0)); then
+            echo
+            wait
+          fi
         fi
       done
     done
-  done
+    echo "done"
+  fi
 
-  for host in $local_hosts; do
+  if [[ $ARG_ALL == 1 || $ARG_MANAGER == 1 ]]; then
     for manager in $MANAGER_HOSTS; do
-      if echo "$manager" | grep -q "^${host}\$"; then
-        start_service "$host" manager "1"
-        break
+      if canRunOnHost "$manager"; then
+        execute_command "$operation" "$manager" manager "default"
       fi
     done
-  done
+  fi
 
-  for host in $local_hosts; do
+  if [[ $ARG_ALL == 1 || $ARG_GC == 1 ]]; then
     for gc in $GC_HOSTS; do
-      if echo "$gc" | grep -q "^${host}\$"; then
-        start_service "$host" gc "1"
-        break
+      if canRunOnHost "$gc"; then
+        execute_command "$operation" "$gc" gc "default"
       fi
     done
-  done
+  fi
 
-  for host in $local_hosts; do
+  if [[ $ARG_ALL == 1 || $ARG_MONITOR == 1 ]]; then
     for monitor in $MONITOR_HOSTS; do
-      if echo "$monitor" | grep -q "^${host}\$"; then
-        start_service "$host" monitor "1"
-        break
+      if canRunOnHost "$monitor"; then
+        execute_command "$operation" "$monitor" monitor "default"
       fi
     done
-  done
-
-  for group in $SSERVER_GROUPS; do
-    echo "Starting scan servers for group $group"
-    for host in $local_hosts; do
-      G="SSERVER_HOSTS_${group}"
-      S="SSERVERS_PER_HOST_${group}"
-      for sserver in ${!G}; do
-        if echo "$sserver" | grep -q "^${host}\$"; then
-          start_service "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-        fi
-      done
-    done
-  done
-
-  for group in $COMPACTOR_GROUPS; do
-    echo "Starting compactors for group $group"
-    for host in $local_hosts; do
-      Q="COMPACTOR_HOSTS_${group}"
-      S="COMPACTORS_PER_HOST_${group}"
-      for compactor in ${!Q}; do
-        if echo "$compactor" | grep -q "^${host}\$"; then
-          start_service "$compactor" compactor "${!S}" "-o" "compactor.group=$group"
-        fi
-      done
-    done
-  done
-
-}
-
-function end_service() {
-  control_service "$@"
-}
-
-function stop_service() {
-  end_service "stop" "$@"
-}
-
-function kill_service() {
-  end_service "kill" "$@"
-}
-
-function stop_tservers() {
-
-  echo "Stopping unresponsive tablet servers (if any)..."
-  groups=$TSERVER_GROUPS
-  if [[ -n $1 ]]; then
-    groups="$1"
-    echo "Only stopping servers for group: ${groups}"
   fi
-  for group in $groups; do
-    echo "Stopping tablet servers for group $group"
-    G="TSERVER_HOSTS_${group}"
-    S="TSERVERS_PER_HOST_${group}"
-    for tserver in ${!G}; do
-      stop_service "$tserver" tserver "${!S}" "-o" "tserver.group=$group" &
-    done
-  done
-
-  sleep 10
 
-  echo "Stopping unresponsive tablet servers hard (if any)..."
-  for group in $groups; do
-    G="TSERVER_HOSTS_${group}"
-    S="TSERVERS_PER_HOST_${group}"
-    for tserver in ${!G}; do
-      kill_service "$tserver" tserver "${!S}" "-o" "tserver.group=$group" &
-    done
-    echo "Cleaning tablet server entries from zookeeper"
-    if ! isDebug; then
-      ${accumulo_cmd} org.apache.accumulo.server.util.ZooZap -tservers -group "$group"
+  if [[ $ARG_ALL == 1 || $ARG_SSERVER == 1 ]]; then
+    sserver_groups=$SSERVER_GROUPS
+    if [[ -n $ARG_SSERVER_GROUP ]]; then
+      sserver_groups=$ARG_SSERVER_GROUP
     fi
-  done
-
-}
-
-function kill_all() {
-  echo "Killing Accumulo cluster..."
-
-  for manager in $MANAGER_HOSTS; do
-    kill_service "$manager" manager "1"
-  done
-
-  for gc in $GC_HOSTS; do
-    kill_service "$gc" gc "1"
-  done
-
-  for monitor in $MONITOR_HOSTS; do
-    kill_service "$monitor" monitor "1"
-  done
-
-  for group in $SSERVER_GROUPS; do
-    echo "Killing scan servers for group $group"
-    G="SSERVER_HOSTS_${group}"
-    S="SSERVERS_PER_HOST_${group}"
-    for sserver in ${!G}; do
-      kill_service "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-    done
-  done
-
-  for group in $TSERVER_GROUPS; do
-    echo "Killing tablet servers for group $group"
-    G="TSERVER_HOSTS_${group}"
-    S="TSERVERS_PER_HOST_${group}"
-    for tserver in ${!G}; do
-      kill_service "$tserver" tserver "${!S}" "-o" "tserver.group=$group"
-    done
-  done
-
-  for group in $COMPACTOR_GROUPS; do
-    echo "Killing compactors for group $group"
-    Q="COMPACTOR_HOSTS_${group}"
-    S="COMPACTORS_PER_HOST_${group}"
-    for compactor in ${!Q}; do
-      kill_service "$compactor" compactor "${!S}" "-o" "compactor.group=$group"
+    for group in $sserver_groups; do
+      echo "${cmd}ing scan servers for group $group"
+      hosts="SSERVER_HOSTS_${group}"
+      for sserver in ${!hosts}; do
+        if canRunOnHost "$sserver"; then
+          execute_command "$operation" "$sserver" sserver "${group}" "-o" "sserver.group=$group"
+        fi
+      done
     done
-  done
-
-  echo "Cleaning all server entries in ZooKeeper"
-  if ! isDebug; then
-    ${accumulo_cmd} org.apache.accumulo.server.util.ZooZap -manager -tservers -compactors -sservers
   fi
-}
 
-function stop_all() {
-  echo "Stopping Accumulo cluster..."
-  if ! isDebug; then
-    if ! ${accumulo_cmd} admin stopAll; then
-      echo "Invalid password or unable to connect to the manager"
-      echo "Initiating forced shutdown in 15 seconds (Ctrl-C to abort)"
-      sleep 10
-      echo "Initiating forced shutdown in  5 seconds (Ctrl-C to abort)"
-    else
-      echo "Accumulo shut down cleanly"
-      echo "Utilities and unresponsive servers will shut down in 5 seconds (Ctrl-C to abort)"
+  if [[ $ARG_ALL == 1 || $ARG_COMPACTOR == 1 ]]; then
+    compactor_groups=$COMPACTOR_GROUPS
+    if [[ -n $ARG_COMPACTOR_GROUP ]]; then
+      compactor_groups=$ARG_COMPACTOR_GROUP
     fi
-    sleep 5
-  fi
-
-  # Look for processes not killed by 'admin stopAll'
-
-  for end_cmd in "stop" "kill"; do
-
-    for manager in $MANAGER_HOSTS; do
-      end_service $end_cmd "$manager" manager "1"
-    done
-
-    for gc in $GC_HOSTS; do
-      end_service $end_cmd "$gc" gc "1"
-    done
-
-    for monitor in $MONITOR_HOSTS; do
-      end_service $end_cmd "$monitor" monitor "1"
-    done
-
-    for group in $SSERVER_GROUPS; do
-      echo "Stopping scan servers for group $group"
-      G="SSERVER_HOSTS_${group}"
-      S="SSERVERS_PER_HOST_${group}"
-      for sserver in ${!G}; do
-        end_service $end_cmd "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-      done
-    done
-
-    for group in $COMPACTOR_GROUPS; do
-      echo "Stopping compactors for group $group"
-      Q="COMPACTOR_HOSTS_${group}"
-      S="COMPACTORS_PER_HOST_${group}"
-      for compactor in ${!Q}; do
-        end_service $end_cmd "$compactor" compactor "${!S}" "-o" "compactor.group=$group"
+    for group in $compactor_groups; do
+      echo "${cmd}ing compactors for group $group"
+      hosts="COMPACTOR_HOSTS_${group}"
+      for compactor in ${!hosts}; do
+        if canRunOnHost "$compactor"; then
+          execute_command "$operation" "$compactor" compactor "${group}" "-o" "compactor.group=$group"
+        fi
       done
     done
-
-  done
-
-  # stop tserver still running
-  stop_tservers
-
-  echo "Cleaning all server entries in ZooKeeper"
-  if ! isDebug; then
-    ${accumulo_cmd} org.apache.accumulo.server.util.ZooZap -manager -tservers -compactors -sservers
   fi
-}
-
-function stop_here() {
-  # Determine hostname without errors to user
-  hosts_to_check=("$(hostname -a 2>/dev/null | head -1)" "$(hostname -f)")
 
-  if echo "${TSERVER_HOSTS}" | grep -Eq 'localhost|127[.]0[.]0[.]1'; then
+  if [[ $ARG_LOCAL == 0 && $ARG_ALL == 1 && ($operation == "stop" || $operation == "kill") ]]; then
     if ! isDebug; then
-      ${accumulo_cmd} admin stop localhost
-    else
-      debug "Stopping tservers on localhost via admin command"
+      echo "Cleaning all server entries in ZooKeeper"
+      ${accumulo_cmd} org.apache.accumulo.server.util.ZooZap -manager -tservers -compactors -sservers
     fi
-  else
-    for host in "${hosts_to_check[@]}"; do
-      for group in $TSERVER_GROUPS; do
-        G="TSERVER_HOSTS_${group}"
-        for tserver in ${!G}; do
-          if echo "$tserver" | grep -q "$host"; then
-            if ! isDebug; then
-              ${accumulo_cmd} admin stop "$host"
-            else
-              debug "Stopping tservers on $host via admin command"
-            fi
-          fi
-        done
-      done
-    done
   fi
 
-  for host in "${hosts_to_check[@]}"; do
-    for end_cmd in "stop" "kill"; do
-      for svc in gc manager monitor; do
-        end_service $end_cmd "$host" $svc "1"
-      done
-      for group in $TSERVER_GROUPS; do
-        G="TSERVER_HOSTS_${group}"
-        S="TSERVERS_PER_HOST_${group}"
-        for tserver in ${!G}; do
-          end_service $end_cmd "$tserver" tserver "${!S}" "-o" "tserver.group=$group"
-        done
-      done
-      for group in $SSERVER_GROUPS; do
-        G="SSERVER_HOSTS_${group}"
-        S="SSERVERS_PER_HOST_${group}"
-        for sserver in ${!G}; do
-          end_service $end_cmd "$sserver" sserver "${!S}" "-o" "sserver.group=$group"
-        done
-      done
-      for group in $COMPACTOR_GROUPS; do
-        Q="COMPACTOR_HOSTS_${group}"
-        S="COMPACTORS_PER_HOST_${group}"
-        for compactor in ${!Q}; do
-          end_service $end_cmd "$host" compactor "${!S}" "-o" "compactor.group=$group"
-        done
-      done
-    done
-  done
 }
 
 function main() {
@@ -632,22 +475,13 @@ function main() {
   accumulo_cmd="${bin}/accumulo"
   SSH='ssh -qnf -o ConnectTimeout=2'
 
-  # Copy input arguments into new array
-  # removing any options
-  DEBUG=0
-  i=0
-  declare -a program_args
-  for arg in "$@"; do
-    if [[ $arg == "--dry-run" ]]; then
-      DEBUG=1
-    else
-      program_args[i++]="$arg"
-    fi
-  done
+  cmd="$1"
+  shift
+  parse_args "$@"
 
-  debug "debug: ${DEBUG} args: ${program_args[*]}"
+  compute_localhost_addresses
 
-  case "${program_args[0]}" in
+  case "${cmd}" in
     create-config)
       if [[ -f "$conf"/cluster.yaml ]]; then
         echo "ERROR : ${conf}/cluster.yaml already exists, not overwriting"
@@ -685,75 +519,39 @@ EOF
       ;;
     restart)
       parse_config
-      stop_all
+      control_services stop
+      control_services kill
       # Make sure the JVM has a chance to fully exit
       sleep 1
-      start_all
+      control_services start
       ;;
     start)
       parse_config
-      start_all
+      control_services start
       ;;
     stop)
       parse_config
-      stop_all
+      control_services stop
       ;;
     kill)
       parse_config
-      kill_all
+      control_services kill
       ;;
     start-here)
       parse_config
-      start_here
+      ARG_ALL=1
+      ARG_LOCAL=1
+      control_services start
       ;;
     stop-here)
       parse_config
-      stop_here
-      ;;
-    start-servers)
-      parse_config
-      subcommand="${program_args[1]}"
-      case "$subcommand" in
-        "--all" | "")
-          start_all
-          ;;
-        "--tservers")
-          start_tservers "${program_args[@]:2}"
-          ;;
-        "--sservers")
-          start_sservers "${program_args[@]:2}"
-          ;;
-        "--compactors")
-          start_compactors "${program_args[@]:2}"
-          ;;
-        *)
-          invalid_args "'$subcommand' is an invalid <command>"
-          ;;
-      esac
-      ;;
-    stop-servers)
-      parse_config
-      subcommand="${program_args[1]}"
-      case "$subcommand" in
-        "--all" | "")
-          stop_all
-          ;;
-        "--tservers")
-          stop_tservers "${program_args[@]:2}"
-          ;;
-        "--sservers")
-          stop_sservers "${program_args[@]:2}"
-          ;;
-        "--compactors")
-          stop_compactors "${program_args[@]:2}"
-          ;;
-        *)
-          invalid_args "'$subcommand' is an invalid <command>"
-          ;;
-      esac
+      ARG_ALL=1
+      ARG_LOCAL=1
+      control_services stop
+      control_services kill
       ;;
     *)
-      invalid_args "${program_args[0]} is an invalid <command>"
+      invalid_args "${cmd} is an invalid <command>"
       ;;
   esac
 }