diff --git a/bin/clustertool b/bin/clustertool
new file mode 100755
index 0000000000..ec57e254d9
--- /dev/null
+++ b/bin/clustertool
@@ -0,0 +1,55 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
+    for include in /usr/share/cassandra/cassandra.in.sh \
+                   /usr/local/share/cassandra/cassandra.in.sh \
+                   /opt/cassandra/cassandra.in.sh \
+                   `dirname $0`/cassandra.in.sh; do
+        if [ -r $include ]; then
+            . $include
+            break
+        fi
+    done
+elif [ -r $CASSANDRA_INCLUDE ]; then
+    . $CASSANDRA_INCLUDE
+fi
+
+# Use JAVA_HOME if set, otherwise look for java in PATH
+if [ -x $JAVA_HOME/bin/java ]; then
+    JAVA=$JAVA_HOME/bin/java
+else
+    JAVA=`which java`
+fi
+
+if [ -z $CASSANDRA_CONF -o -z $CLASSPATH ]; then
+    echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2
+    exit 1
+fi
+
+# Special-case path variables.
+case "`uname`" in
+    CYGWIN*) 
+        CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+        CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"`
+    ;;
+esac
+
+$JAVA -cp $CLASSPATH org.apache.cassandra.tools.ClusterCmd $@
+
+# vi:ai sw=4 ts=4 tw=0 et
diff --git a/src/java/org/apache/cassandra/tools/ClusterCmd.java b/src/java/org/apache/cassandra/tools/ClusterCmd.java
new file mode 100644
index 0000000000..53203d0b3f
--- /dev/null
+++ b/src/java/org/apache/cassandra/tools/ClusterCmd.java
@@ -0,0 +1,202 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.tools;
+
+import java.io.IOException;
+import java.util.List;
+import java.net.InetAddress;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+/**
+ * JMX cluster wide operations for Cassandra.
+ */
+public class ClusterCmd {
+    private static final String HOST_OPTION = "host";
+    private static final String PORT_OPTION = "port";
+    private static final int defaultPort = 8080;
+    private static Options options = null;
+    private CommandLine cmd = null;
+    private NodeProbe probe;
+    private String host;
+    private int port;
+
+    static
+    {
+        options = new Options();
+        Option optHost = new Option(HOST_OPTION, true, "node hostname or ip address");
+        optHost.setRequired(true);
+        options.addOption(optHost);
+        options.addOption(PORT_OPTION, true, "remote jmx agent port number");
+    }
+
+    /**
+     * Creates a ClusterProbe using command-line arguments.
+     *
+     * @param cmdArgs list of arguments passed on the command line
+     * @throws ParseException for missing required, or unrecognized options
+     * @throws IOException on connection failures
+     */
+    private ClusterCmd(String[] cmdArgs) throws ParseException, IOException, InterruptedException
+    {
+        parseArgs(cmdArgs);
+        this.host = cmd.getOptionValue(HOST_OPTION);
+
+        String portNum = cmd.getOptionValue(PORT_OPTION);
+        if (portNum != null)
+        {
+            try
+            {
+                this.port = Integer.parseInt(portNum);
+            }
+            catch (NumberFormatException e)
+            {
+                throw new ParseException("Port must be a number");
+            }
+        }
+        else
+        {
+            this.port = defaultPort;
+        }
+
+        probe = new NodeProbe(host, port);
+    }
+
+    /**
+     * Creates a ClusterProbe using the specified JMX host and port.
+     *
+     * @param host hostname or IP address of the JMX agent
+     * @param port TCP port of the remote JMX agent
+     * @throws IOException on connection failures
+     */
+    public ClusterCmd(String host, int port) throws IOException, InterruptedException
+    {
+        this.host = host;
+        this.port = port;
+        probe = new NodeProbe(host, port);
+    }
+
+    /**
+     * Creates a ClusterProbe using the specified JMX host and default port.
+     *
+     * @param host hostname or IP address of the JMX agent
+     * @throws IOException on connection failures
+     */
+    public ClusterCmd(String host) throws IOException, InterruptedException
+    {
+        this(host, defaultPort);
+    }
+
+    /**
+     * Parse the supplied command line arguments.
+     *
+     * @param args arguments passed on the command line
+     * @throws ParseException for missing required, or unrecognized options
+     */
+    private void parseArgs(String[] args) throws ParseException
+    {
+        CommandLineParser parser = new PosixParser();
+        cmd = parser.parse(options, args);
+    }
+
+    /**
+     * Retrieve any non-option arguments passed on the command line.
+     *
+     * @return non-option command args
+     */
+    private String[] getArgs()
+    {
+        return cmd.getArgs();
+    }
+
+    /**
+     * Prints usage information to stdout.
+     */
+    private static void printUsage()
+    {
+        HelpFormatter hf = new HelpFormatter();
+        String header = String.format(
+                "%nAvailable commands: get_endpoints [key]");
+        String usage = String.format("java %s -host <arg> <command>%n", ClusterCmd.class.getName());
+        hf.printHelp(usage, "", options, header);
+    }
+    
+    public void printEndPoints(String key)
+    {
+        List<InetAddress> endpoints = probe.getEndPoints(key);
+        System.out.println(String.format("%-17s: %s", "Key", key));
+        System.out.println(String.format("%-17s: %s", "Endpoints", endpoints));
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) throws IOException, InterruptedException
+    {
+        ClusterCmd probe = null;
+        try
+        {
+            probe = new ClusterCmd(args);
+        }
+        catch (ParseException pe)
+        {
+            System.err.println(pe.getMessage());
+            ClusterCmd.printUsage();
+            System.exit(1);
+        }
+        catch (IOException ioe)
+        {
+            System.err.println("Error connecting to remote JMX agent!");
+            ioe.printStackTrace();
+            System.exit(3);
+        }
+
+        if (probe.getArgs().length < 1)
+        {
+            System.err.println("Missing argument for command.");
+            ClusterCmd.printUsage();
+            System.exit(1);
+        }
+
+        // Execute the requested command.
+        String[] arguments = probe.getArgs();
+        String cmdName = arguments[0];
+        if (cmdName.equals("get_endpoints"))
+        {
+            if (arguments.length <= 1)
+            {
+                System.err.println("missing key argument");
+            }
+            probe.printEndPoints(arguments[1]);
+        }
+        else
+        {
+            System.err.println("Unrecognized command: " + cmdName + ".");
+            ClusterCmd.printUsage();
+            System.exit(1);
+        }
+
+        System.exit(0);
+    }
+    
+}