diff --git a/the-graph-group/the-graph-group.html b/the-graph-group/the-graph-group.html
new file mode 100644
index 00000000..471b9e49
--- /dev/null
+++ b/the-graph-group/the-graph-group.html
@@ -0,0 +1,11 @@
+<polymer-element name="the-graph-group" attributes="name label nodes">
+
+  <script>
+    Polymer('the-graph-group', {
+      name: '',
+      label: '',
+      nodes: []
+    });
+  </script>
+  
+</polymer-element>
diff --git a/the-graph-groups/the-graph-groups.html b/the-graph-groups/the-graph-groups.html
new file mode 100644
index 00000000..2bd24d72
--- /dev/null
+++ b/the-graph-groups/the-graph-groups.html
@@ -0,0 +1,15 @@
+<link rel="import" href="../the-graph-group/the-graph-group.html">
+
+<polymer-element name="the-graph-groups">
+  <template>
+    <content select="the-graph-group"></content>
+  </template>
+  <script>
+    Polymer('the-graph-groups', {
+      getGroups: function () {
+        return Array.prototype.slice.call(this.getElementsByTagName('the-graph-group'));
+      }
+    });
+  </script>
+  
+</polymer-element>
diff --git a/the-graph/the-graph.html b/the-graph/the-graph.html
index 5c45297a..b8316757 100644
--- a/the-graph/the-graph.html
+++ b/the-graph/the-graph.html
@@ -1,4 +1,5 @@
 <link rel="import" href="../the-graph-exports/the-graph-exports.html">
+<link rel="import" href="../the-graph-groups/the-graph-groups.html">
 <link rel="import" href="../the-graph-nodes/the-graph-nodes.html">
 <link rel="import" href="../the-graph-edges/the-graph-edges.html">
 <link rel="import" href="../the-graph-initials/the-graph-initials.html">
@@ -27,6 +28,11 @@
         <the-graph-export public="{{ export.public }}" private="{{ export.private }}"></the-graph-export>
       </template>
     </the-graph-exports>
+    <the-graph-groups id="groups">
+      <template repeat="{{ group in groups }}">
+      <the-graph-group name="{{ group.name }}" label="{{ group.metadata.label }}" nodes="{{ group.nodes }}"></the-graph-group>
+      </template>
+    </the-graph-groups>
   </template>
 
   <script type="text/javascript" src="../the-graph-util/the-graph-util.js"></script>
@@ -59,6 +65,7 @@
       edges: [],
       initials: [],
       exports: [],
+      groups: [],
       library: null,
       ready: function () {
         this._pan = { x: 0, y: 0 };
@@ -396,6 +403,7 @@
         this.edges = [];
         this.initials = [];
         this.exports = [];
+        this.groups = [];
         // Convert processes to an array
         for (var index in this.graph.processes) {
           var p = this.graph.processes[index];
@@ -429,6 +437,12 @@
         this.graph.exports.forEach(function (exp) {
           this.exports.push(exp);
         }.bind(this));
+        if (!this.graph.groups) {
+          this.graph.groups = [];
+        }
+        this.graph.groups.forEach(function (group) {
+          this.groups.push(group);
+        }.bind(this));
 
         this.calcMinMax();
       },
@@ -534,6 +548,7 @@
         var definition = {
           properties: this.graph.properties,
           exports: [],
+          groups: [],
           processes: {},
           connections: []
         };
@@ -582,6 +597,15 @@
             public: exp.public
           });
         });
+        this.$.groups.getGroups().forEach(function(group) {
+          definition.groups.push({
+            name: group.name,
+            nodes: group.nodes,
+            metadata: {
+              label: group.label
+            }
+          });
+        });
         return definition;
       }
     });