diff --git a/check_storwize/README.md b/check_storwize/README.md
new file mode 100644
index 0000000..15ab9c2
--- /dev/null
+++ b/check_storwize/README.md
@@ -0,0 +1,18 @@
+check_storwize.py
+=================
+
+Nagios plugin to check the status of a remote Storwize disk array.
+
+This plugin is designed to be syntactically compatible with check_storwize.sh from nagios exchange
+with the following differences:
+
+  - Outputs performance data
+  - GPL License
+  - Written in python
+  - More stable plugin results when disk array is broken
+
+
+EXAMPLE USAGE
+=============
+```
+```
diff --git a/check_storwize/check_storwize.py b/check_storwize/check_storwize.py
new file mode 100644
index 0000000..eef200c
--- /dev/null
+++ b/check_storwize/check_storwize.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+
+from pynag.Plugins import PluginHelper, ok, warning, critical, unknown
+from pynag.Utils import runCommand
+from collections import namedtuple
+
+valid_queries = "lsarray lsmdiskgrp"
+
+p = PluginHelper()
+p.add_option("-H", "--hostname", help="Hostname or ip address", dest="hostname")
+p.add_option("-U", "--user", help="Log in as this user to storwize", dest="user", default="nagios")
+p.add_option("-Q", "--query", help="Query to send to storwize (see also -L)", dest="query", default="lsarray")
+p.add_option("-L", "--list-queries", help="List of valid queries", dest="list_queries", action="store_true")
+p.add_option("--test", help="Run this plugin in test mode", dest="test", action="store_true")
+
+p.parse_arguments()
+
+if not p.options.hostname:
+	p.parser.error("Required options -H is missing")
+if p.options.query not in valid_queries.split():
+	p.parser.error("%s does not look like a valid query. Use -L for a list of valid queries" % (p.options.query))
+if p.options.list_queries is True:
+	p.parser.error("Valid Queries: %s" % (valid_queries))
+
+query = p.options.query
+# Connect to remote storwize and run a connect
+command = "ssh %s@%s %s" % (p.options.user, p.options.hostname, p.options.query)
+if p.options.test:
+	command = "cat tests/%s.txt" % (p.options.query)
+return_code,stdout, stderr = runCommand(command)
+
+if return_code != 0:
+	p.status(unknown)
+	p.add_summary("Got error %s when trying to log into remote storwize box" % return_code)
+	p.add_long_output("\ncommand:\n===============\n%s" % command)
+	p.add_long_output("\nStandard output:\n==============\n%s" % (stdout))
+	p.add_long_output("\nStandard stderr:\n==============\n%s" % (stderr))
+	p.exit()
+
+if stderr:
+	p.status(unknown)
+	p.add_summary("Error when connecting to storwize: %s" % stderr)
+	p.exit()
+
+
+
+lines = stdout.splitlines()
+top_line = lines.pop(0)
+headers = top_line.split()
+Row = namedtuple('Row', ' '.join(headers))
+rows = []
+for i in lines:
+	i = i.strip()
+	columns = i.split()
+	row = Row(*columns)
+	rows.append(row)
+
+if query == 'lsmdiskgrp':
+	p.add_summary("%s diskgroups found" % (len(rows)))
+	p.add_metric("number of groups" % len(rows))
+	for row in rows:
+		if row.status != 'online':
+			p.status(critical)
+			p.add_summary("group %s is %s." % (row.name, row.status)) 
+		p.add_long_output("%s: used: %s out of %s" % (row.name, row.used_capacity, row.capacity))
+		# Add a performance metric
+		metric_name = "%s_capacity" % (row.name)
+		p.add_metric(metric_name, value=row.used_capacity, max=row.capacity)
+elif query == 'lsarray':
+	p.add_summary("%s arrays found" % (len(rows)))
+	p.add_metric("number of arrays", len(rows))
+	for row in rows:
+		if row.status != 'online':
+			p.add_summary("array %s is %s." % (row.name, row.status))
+			p.status(critical)
+		# Add some performance metrics
+		metric_name = row.mdisk_name + "_capacity"
+		p.add_metric(metric_name, value=row.capacity)
+		
+else:
+	p.status(unknown)
+	p.add_summary("unsupported query: %s. See -L for list of valid queries" % (query))
+	p.exit()
+
+p.check_all_metrics()
+p.exit()