diff --git a/src/Table/Table.stories.mdx b/src/Table/Table.stories.mdx
new file mode 100644
index 00000000..ab4b300d
--- /dev/null
+++ b/src/Table/Table.stories.mdx
@@ -0,0 +1,170 @@
+import { colors } from "../colors";
+import * as typography from "../typography";
+import { Table } from "./Table";
+import {
+  Description,
+  Meta,
+  Story,
+  Props,
+  Preview,
+} from "@storybook/addon-docs/blocks";
+
+<Meta title="Components|Table" />
+
+# Table
+
+<Description
+  of={Table}
+  markdown="Tables provide a structure to data and a visual grid making it easier to see relationships and are one of the most useful tools and formats for organizing and communiting structured data."
+/>
+
+## Columns
+
+The `columns` prop defines how the table will be rendered. The props table below shows it's options. Look at the source code in [`Table.tsx`](https://github.com/apollographql/space-kit/blob/master/src/Table/Table.tsx) for documentation on `columns`'s configuration.
+
+Future docs writers: please do not attempt to reproduce the `columns` config here, it'll be out of date as soon as we change something.
+
+## Density
+
+Table density is an important characteristic when considering how to present information, which includes things like information density, alignment, grouped tables, etc. Consider the information and how someone might want to read the content. For example, a spreadsheet of numbers will benefit from density compared to presenting a list of users with avatars might benefit for a little more visual space.
+
+### standard (default)
+
+<Preview>
+  <Story inline name="standard density">
+    <Table
+      keyOn="name"
+      data={[
+        {
+          name: "Alice Howell",
+          image: require("./table.stories/alice-howell.png"),
+        },
+        {
+          name: "Benjamin Lawrence",
+          image: require("./table.stories/benjamin-lawrence.png"),
+        },
+        {
+          name: "Cynthia Bowman",
+          image: require("./table.stories/cynthia-bowman.png"),
+        },
+        {
+          name: "Jeremy Jacobs",
+          image: require("./table.stories/jeremy-jacobs.png"),
+        },
+        {
+          name: "Jeremy Griffin",
+          image: require("./table.stories/jeremy-griffin.png"),
+        },
+      ]}
+      columns={[
+        {
+          id: "image",
+          render: ({ image }) => (
+            <img style={{ width: 24, height: 24 }} src={image} />
+          ),
+        },
+        {
+          id: "name",
+          headerTitle: "name",
+          render: ({ name }) => <>{name}</>,
+        },
+      ]}
+    />
+  </Story>
+</Preview>
+
+### relaxed
+
+<Preview>
+  <Story inline name="relaxed density">
+    <Table
+      density="relaxed"
+      keyOn="name"
+      data={[
+        {
+          name: "Alice Howell",
+          image: require("./table.stories/alice-howell.png"),
+        },
+        {
+          name: "Benjamin Lawrence",
+          image: require("./table.stories/benjamin-lawrence.png"),
+        },
+        {
+          name: "Cynthia Bowman",
+          image: require("./table.stories/cynthia-bowman.png"),
+        },
+        {
+          name: "Jeremy Jacobs",
+          image: require("./table.stories/jeremy-jacobs.png"),
+        },
+        {
+          name: "Jeremy Griffin",
+          image: require("./table.stories/jeremy-griffin.png"),
+        },
+      ]}
+      columns={[
+        {
+          id: "image",
+          render: ({ image }) => (
+            <img style={{ width: 24, height: 24 }} src={image} />
+          ),
+        },
+        {
+          id: "name",
+          headerTitle: "name",
+          render: ({ name }) => <>{name}</>,
+        },
+      ]}
+    />
+  </Story>
+</Preview>
+
+### condensed
+
+<Preview>
+  <Story inline name="condensed density">
+    <Table
+      density="condensed"
+      keyOn="name"
+      data={[
+        {
+          name: "Alice Howell",
+          image: require("./table.stories/alice-howell.png"),
+        },
+        {
+          name: "Benjamin Lawrence",
+          image: require("./table.stories/benjamin-lawrence.png"),
+        },
+        {
+          name: "Cynthia Bowman",
+          image: require("./table.stories/cynthia-bowman.png"),
+        },
+        {
+          name: "Jeremy Jacobs",
+          image: require("./table.stories/jeremy-jacobs.png"),
+        },
+        {
+          name: "Jeremy Griffin",
+          image: require("./table.stories/jeremy-griffin.png"),
+        },
+      ]}
+      columns={[
+        {
+          id: "image",
+          render: ({ image }) => (
+            <img style={{ width: 24, height: 24 }} src={image} />
+          ),
+        },
+        {
+          id: "name",
+          headerTitle: "name",
+          render: ({ name }) => <>{name}</>,
+        },
+      ]}
+    />
+  </Story>
+</Preview>
+
+## Props
+
+<Props of={Table} />
diff --git a/src/Table/Table.story.tsx b/src/Table/Table.story.tsx
deleted file mode 100644
index d90f9476..00000000
--- a/src/Table/Table.story.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-/** @jsx jsx */
-import { jsx } from "@emotion/core";
-import React from "react";
-import { storiesOf } from "@storybook/react";
-import { colors } from "../colors";
-import * as typography from "../typography";
-import { Table } from "./Table";
-
-interface User {
-  name: string;
-  email: string;
-  image: string;
-  dateAdded: string;
-}
-
-const users: User[] = [
-  {
-    name: "Alice Howell",
-    email: "alice@starkindustries.net",
-    image: require("./table.story/alice-howell.png"),
-    dateAdded: "05/25/2019",
-  },
-  {
-    name: "Benjamin Lawrence",
-    email: "Ben@starkindustries.net",
-    image: require("./table.story/benjamin-lawrence.png"),
-    dateAdded: "05/25/2019",
-  },
-  {
-    name: "Cynthia Bowman",
-    email: "cbowman@starkindustries.net",
-    image: require("./table.story/cynthia-bowman.png"),
-    dateAdded: "05/25/2019",
-  },
-  {
-    name: "Jeremy Jacobs",
-    email: "jj@starkindustries.net",
-    image: require("./table.story/jeremy-jacobs.png"),
-    dateAdded: "05/25/2019",
-  },
-  {
-    name: "Jeremy Griffin",
-    email: "jgriffin@starkindustries.net",
-    image: require("./table.story/jeremy-griffin.png"),
-    dateAdded: "05/25/2019",
-  },
-];
-
-const Demo: React.FC<{
-  density?: React.ComponentProps<typeof Table>["density"];
-}> = ({ density = "standard" }) => (
-  <Table<User>
-    keyOn="name"
-    css={{ color: colors.black.base }}
-    density={density}
-    // data is an array of type user (defined as a generic)
-    data={users}
-    columns={[
-      {
-        id: 1,
-        render: ({ image }) => (
-          <img css={{ width: 32, height: 32 }} src={image} />
-        ),
-      },
-      {
-        id: 2,
-        headerTitle: "description",
-        render: ({ name, email }) => (
-          <React.Fragment>
-            <div>{name}</div>
-            <div
-              css={{
-                color: colors.grey.base,
-                ...typography.base.small,
-              }}
-            >
-              {email}
-            </div>
-          </React.Fragment>
-        ),
-      },
-      {
-        id: 3,
-        headerTitle: (
-          <div
-            css={{
-              color: colors.blue.base,
-            }}
-          >
-            Date Added
-          </div>
-        ),
-        render: ({ dateAdded }) => dateAdded,
-      },
-    ]}
-  />
-);
-
-storiesOf("Table", module)
-  .addParameters({ component: Table })
-  .add("default", () => <Demo />)
-  .add("relaxed", () => <Demo density="relaxed" />)
-  .add("condensed", () => <Demo density="condensed" />);
diff --git a/src/Table/Table.tsx b/src/Table/Table.tsx
index 95ea986f..7884e815 100644
--- a/src/Table/Table.tsx
+++ b/src/Table/Table.tsx
@@ -6,27 +6,38 @@ import { colors } from "../colors";
 
 interface Props<RowShape> {
   /**
-   * All the data for the component. Should be stored in an array of objects
+   * Component data
+   *
+   * The shape of the data will be inferred from here
    */
   data: RowShape[];
 
+  /**
+   * How dense the table should be
+   *
+   * @default "standard"
+   */
   density?: "standard" | "condensed" | "relaxed";
 
   /**
-   * An array of column definitions
+   * Definition of how each column will be rendered
    */
   columns: {
     /**
-     * Title to add to the table header
+     * Column's title
      */
     headerTitle?: React.ReactNode | string;
+
     /**
-     * an id for the column
+     * Unique identifier for the column
+     *
+     * Initially, we'll just be using this for the `key` attribute on cells and
+     * `col`s
      */
     id: string | number;
     /**
-     * Properties to be applied to `col` elements nested below the `table`'s single
-     * `<colgroup>`.
+     * Properties to be applied to `col` elements nested below the `table`'s
+     * single `<colgroup>`.
      *
      * This allows you to apply styles to columns by setting a class on a single
      * element instead of _all_ elements in a table's row
@@ -37,9 +48,14 @@ interface Props<RowShape> {
     >;
 
     /**
-     * A method that accepts the data for the row and returns the inner content for the row.
+     * Render function that renders the content for the column to be placed
+     * inside the `<td>`
+     *
+     * Since this is a render function, `React.createElement` will _not_ be
+     * called, nor will propTypes be checked. This is to prevent mounting and
+     * unmounting on each render
      *
-     * Do not include a `<tr>` or a `<td>`, these are handled automatically
+     * Note: the signature of the method is the same as a `map` function
      */
     render: (
       input: Readonly<RowShape>,
@@ -49,11 +65,25 @@ interface Props<RowShape> {
   }[];
 
   /**
-   * a field name to key rows on
+   * String or method to calculate the `key` for each row
+   *
+   * When re-ordering rows (by sorting or any other means), this will ensure
+   * that DOM elements are reused correctly.
+   *
+   * Can be a string representing a field in `RowData` (inferred from `data` or
+   * included as a generic to `<Table<RowData>>`) or a function that takes the
+   * row data and returns a key
    */
   keyOn: keyof RowShape | ((row: RowShape) => any);
 }
 
+/**
+ * Tables provide a structure to data and a visual grid making it easier to see
+ * relationships and are one of the most useful tools and formats for organizing
+ * and communiting structured data.
+ *
+ * @see https://zpl.io/bAlrjJe
+ */
 export function Table<RowShape>({
   data,
   density = "standard",
diff --git a/src/Table/table.story/alice-howell.png b/src/Table/table.stories/alice-howell.png
similarity index 100%
rename from src/Table/table.story/alice-howell.png
rename to src/Table/table.stories/alice-howell.png
diff --git a/src/Table/table.story/benjamin-lawrence.png b/src/Table/table.stories/benjamin-lawrence.png
similarity index 100%
rename from src/Table/table.story/benjamin-lawrence.png
rename to src/Table/table.stories/benjamin-lawrence.png
diff --git a/src/Table/table.story/cynthia-bowman.png b/src/Table/table.stories/cynthia-bowman.png
similarity index 100%
rename from src/Table/table.story/cynthia-bowman.png
rename to src/Table/table.stories/cynthia-bowman.png
diff --git a/src/Table/table.story/jeremy-griffin.png b/src/Table/table.stories/jeremy-griffin.png
similarity index 100%
rename from src/Table/table.story/jeremy-griffin.png
rename to src/Table/table.stories/jeremy-griffin.png
diff --git a/src/Table/table.story/jeremy-jacobs.png b/src/Table/table.stories/jeremy-jacobs.png
similarity index 100%
rename from src/Table/table.story/jeremy-jacobs.png
rename to src/Table/table.stories/jeremy-jacobs.png