diff --git a/AUTHORS b/AUTHORS
index 23aa474..1b17eac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 Author: Chris Jewell <chrism0dwk@gmail.com>
 Modified: Gareth Jeanne <contact@garethjeanne.co.uk>
-          Wolfgang Malgadey <w.malgadey@gmail.com>
\ No newline at end of file
+          Wolfgang Malgadey <w.malgadey@gmail.com>
+          Matt Clayton <matt.r.clayton@gmail.com>
diff --git a/PyTado/interface.py b/PyTado/interface.py
index 33b7d69..88838e4 100644
--- a/PyTado/interface.py
+++ b/PyTado/interface.py
@@ -9,6 +9,7 @@
 import urllib.parse
 import urllib.error
 
+from enum import IntEnum
 from http.cookiejar import CookieJar
 
 
@@ -21,6 +22,12 @@ class Tado:
                    t.getClimate(1) # Get climate, zone 1.
     """
 
+    """Constants needed for get/set Schedule and Timetable"""
+    class Timetable(IntEnum):
+        ONE_DAY = 0
+        THREE_DAY = 1
+        SEVEN_DAY = 2
+
     _debugCalls = False
 
     # Instance-wide constant info
@@ -213,6 +220,67 @@ def getClimate(self, zone):
         return {'temperature' : data['insideTemperature']['celsius'],
                 'humidity'    : data['humidity']['percentage']}
 
+    def getTimetable(self, zone):
+        """Get the Timetable type currently active"""
+        # pylint: disable=C0103
+
+        cmd = 'zones/%i/schedule/activeTimetable' % (zone)
+
+        data = self._apiCall(cmd, "GET", {}, True)
+
+        if "id" in data:
+            return Tado.Timetable(data["id"])
+
+        raise Exception('Returned data did not contain "id" : '+str(data))
+
+    def setTimetable(self, zone, id):
+        """Set the Timetable type currently active
+           id = 0 : ONE_DAY (MONDAY_TO_SUNDAY)
+           id = 1 : THREE_DAY (MONDAY_TO_FRIDAY, SATURDAY, SUNDAY)
+           id = 3 : SEVEN_DAY (MONDAY, TUESDAY, WEDNESDAY ...)"""
+        # pylint: disable=C0103
+
+        # Type checking
+        if not isinstance(id, Tado.Timetable):
+            raise TypeError('id must be an instance of Tado.Timetable')
+
+        cmd = 'zones/%i/schedule/activeTimetable' % (zone)
+
+        data = self._apiCall(cmd, "PUT", {'id': id }, True)
+        return data
+
+    def getSchedule(self, zone, id, day=None):
+        """Get the JSON representation of the schedule for a zone
+           a Zone has 3 different schedules, one for each timetable
+           (see setTimetable) """
+        # pylint: disable=C0103
+
+        # Type checking
+        if not isinstance(id, Tado.Timetable):
+            raise TypeError('id must be an instance of Tado.Timetable')
+
+        if day:
+            cmd = 'zones/%i/schedule/timetables/%i/blocks/%s' % (zone,id,day)
+        else:
+            cmd = 'zones/%i/schedule/timetables/%i/blocks' % (zone,id)
+
+        data = self._apiCall(cmd, "GET", {}, True)
+        return data
+
+
+    def setSchedule(self, zone, id, day, data):
+        """Set the schedule for a zone, day is required"""
+        # pylint: disable=C0103
+
+        # Type checking
+        if not isinstance(id, Tado.Timetable):
+            raise TypeError('id must be an instance of Tado.Timetable')
+
+        cmd = 'zones/%i/schedule/timetables/%i/blocks/%s' % (zone,id,day)
+
+        data = self._apiCall(cmd, "PUT", data, True)
+        return data
+
     def getWeather(self):
         """Gets outside weather data"""
         # pylint: disable=C0103