diff --git a/adafruit_seesaw/keypad.py b/adafruit_seesaw/keypad.py
index 031e975..eb3a8c8 100644
--- a/adafruit_seesaw/keypad.py
+++ b/adafruit_seesaw/keypad.py
@@ -26,6 +26,10 @@
 ====================================================
 """
 
+import struct
+from enum import IntEnum
+from typing import NamedTuple
+
 try:
     from micropython import const
 except ImportError:
@@ -48,6 +52,30 @@ def const(x):
 _KEYPAD_COUNT = const(0x04)
 _KEYPAD_FIFO = const(0x10)
 
+
+class ResponseType(IntEnum):
+    # Types for the repsonse
+    TYPE_KEY = 0
+    TYPE_COUNT = 1
+    TYPE_STATUS = 2
+    TYPE_INVALID = 0xff
+
+
+class SeesawKeyResponse(NamedTuple):
+    response_type: ResponseType
+    data: int
+
+    unpacker: struct.Struct = struct.Struct('<BB')
+
+    @classmethod
+    def unpack(cls, buf: bytearray):
+        return SeesawKeyResponse(*cls.unpacker.unpack(buf))
+
+    @classmethod
+    def unpack_from(cls, buf: bytearray, frm: int):
+        return SeesawKeyResponse(*cls.unpacker.unpack_from(buf, frm))
+
+
 # pylint: disable=too-few-public-methods
 class KeyEvent:
     """Holds information about a key event in its properties
@@ -103,7 +131,11 @@ def interrupt_enabled(self, value):
     @property
     def count(self):
         """Retrieve or set the number of keys"""
-        return self.read8(_KEYPAD_BASE, _KEYPAD_COUNT)
+        buf = self.readn(_KEYPAD_BASE, _KEYPAD_COUNT, 2)
+        d = SeesawKeyResponse.unpack(buf)
+        if d.response_type != self.TYPE_COUNT:
+            return 0
+        return d.data
 
     # pylint: disable=unused-argument, no-self-use
     @count.setter
@@ -134,6 +166,8 @@ def read_keypad(self, num):
         """Read data from the keypad
 
         :param int num: The number of bytes to read"""
-        ret = bytearray(num)
-        self.read(_KEYPAD_BASE, _KEYPAD_FIFO, ret)
-        return ret
+        buf = bytearray(num * 2)
+        self.read(_KEYPAD_BASE, _KEYPAD_FIFO, buf)
+
+        return [SeesawKeyResponse.unpack_from(buf, i)
+            for i in range(0, num)]
diff --git a/adafruit_seesaw/seesaw.py b/adafruit_seesaw/seesaw.py
index 113e8b9..8fc6fbb 100644
--- a/adafruit_seesaw/seesaw.py
+++ b/adafruit_seesaw/seesaw.py
@@ -427,6 +427,12 @@ def read8(self, reg_base, reg):
         self.read(reg_base, reg, ret)
         return ret[0]
 
+    def readn(self, reg_base, reg, n):
+        """Read an arbitrary I2C byte register on the device"""
+        ret = bytearray(n)
+        self.read(reg_base, reg, ret)
+        return ret
+
     def read(self, reg_base, reg, buf, delay=0.0006):
         """Read an arbitrary I2C register range on the device"""
         self.write(reg_base, reg)