diff --git a/.gitignore b/.gitignore
index 840a47c00374..e2507519f676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,6 @@ target/
 *.py~
 tmp/
 
+# Other
 docs/examples/data/*
+.DS_Store
diff --git a/qcodes/instrument_drivers/tektronix/Keithley_2400.py b/qcodes/instrument_drivers/tektronix/Keithley_2400.py
new file mode 100644
index 000000000000..92f69dbdebd5
--- /dev/null
+++ b/qcodes/instrument_drivers/tektronix/Keithley_2400.py
@@ -0,0 +1,31 @@
+from qcodes import VisaInstrument
+from qcodes.utils.validators import Numbers
+
+
+class Keithley_2400(VisaInstrument):
+    """
+    Driver for the Keithley 2400 multimeter.
+
+    Args:
+      name
+      address
+      reset (bool): optional
+    """
+
+    def __init__(self, name, address, reset=False, **kwargs):
+        super().__init__(name, address, terminator='\n', **kwargs)
+
+        self.add_parameter(name='voltage',
+                           set_cmd='SOURCE:VOLTAGE:LEVEL {:.4f}',
+                           get_cmd='SOURCE:VOLTAGE:LEVEL?',
+                           get_parser=float,
+                           vals=Numbers(-10, 10)
+                           )
+
+        if reset:
+            self.initialise()
+        self.connect_message()
+
+    def initialise(self):
+        self.write('SOURCE:FUNCTION:MODE VOLTAGE')
+        self.write('INIT')