diff --git a/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java b/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java
index 980c9fe1d..24fca46e6 100644
--- a/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java
+++ b/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java
@@ -7,6 +7,12 @@ import org.json.JSONWriter;
 
 public class AnonymousNode extends Node {
 	private static final long serialVersionUID = -6956243664838720646L;
+	
+	final public FreebaseType type;
+	
+	public AnonymousNode(FreebaseType type) {
+		this.type = type;
+	}
 
 	@Override
 	public void write(JSONWriter writer, Properties options)
diff --git a/src/main/java/com/metaweb/gridworks/protograph/CellNode.java b/src/main/java/com/metaweb/gridworks/protograph/CellNode.java
new file mode 100644
index 000000000..0a30b7c6d
--- /dev/null
+++ b/src/main/java/com/metaweb/gridworks/protograph/CellNode.java
@@ -0,0 +1,32 @@
+package com.metaweb.gridworks.protograph;
+
+import java.util.Properties;
+
+import org.json.JSONException;
+import org.json.JSONWriter;
+
+public class CellNode extends Node {
+	private static final long serialVersionUID = 5820786756175547307L;
+
+	final public int			cellIndex;
+	final public boolean		createUnlessRecon;
+	final public FreebaseType 	type;
+	
+	public CellNode(
+		int 			cellIndex,
+		boolean 		createUnlessRecon, 
+		FreebaseType 	type
+	) {
+		this.cellIndex = cellIndex;
+		this.createUnlessRecon = createUnlessRecon;
+		this.type = type;
+	}
+	
+	@Override
+	public void write(JSONWriter writer, Properties options)
+			throws JSONException {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/src/main/java/com/metaweb/gridworks/protograph/TopicNode.java b/src/main/java/com/metaweb/gridworks/protograph/ExistingTopicNode.java
similarity index 77%
rename from src/main/java/com/metaweb/gridworks/protograph/TopicNode.java
rename to src/main/java/com/metaweb/gridworks/protograph/ExistingTopicNode.java
index 84d436a18..1e96c9be5 100644
--- a/src/main/java/com/metaweb/gridworks/protograph/TopicNode.java
+++ b/src/main/java/com/metaweb/gridworks/protograph/ExistingTopicNode.java
@@ -5,12 +5,12 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-public class TopicNode extends Node {
+public class ExistingTopicNode extends Node {
 	private static final long serialVersionUID = 8418548867745587387L;
 
 	final protected FreebaseTopic _topic;
 	
-	public TopicNode(FreebaseTopic topic) {
+	public ExistingTopicNode(FreebaseTopic topic) {
 		_topic = topic;
 	}
 
diff --git a/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java b/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java
index f4b4ee051..cd379f03e 100644
--- a/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java
+++ b/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java
@@ -11,22 +11,14 @@ import com.metaweb.gridworks.Jsonizable;
 public class FreebaseTopic implements Serializable, Jsonizable {
 	private static final long serialVersionUID = -3427885694129112432L;
 	
-	final protected String _id;
-	final protected String _name;
+	final public String id;
+	final public String name;
 	
 	public FreebaseTopic(String id, String name) {
-		_id = id;
-		_name = name;
+		this.id = id;
+		this.name = name;
 	}
 	
-	public String getID() {
-		return _id;
-	}
-
-	public String getName() {
-		return _name;
-	}
-
 	@Override
 	public void write(JSONWriter writer, Properties options)
 			throws JSONException {
diff --git a/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java b/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java
index 4b6abd9ca..89329e8ca 100644
--- a/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java
+++ b/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java
@@ -2,9 +2,12 @@ package com.metaweb.gridworks.protograph;
 
 public class FreebaseType extends FreebaseTopic {
 	private static final long serialVersionUID = -3070300264980791404L;
+	
+	final public boolean compoundValueType;
 
-	public FreebaseType(String id, String name) {
+	public FreebaseType(String id, String name, boolean compoundValueType) {
 		super(id, name);
+		this.compoundValueType = compoundValueType;
 	}
 
 }
diff --git a/src/main/java/com/metaweb/gridworks/protograph/NewNode.java b/src/main/java/com/metaweb/gridworks/protograph/NewNode.java
deleted file mode 100644
index b0deca256..000000000
--- a/src/main/java/com/metaweb/gridworks/protograph/NewNode.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.metaweb.gridworks.protograph;
-
-import java.util.Properties;
-
-import org.json.JSONException;
-import org.json.JSONWriter;
-
-public class NewNode extends Node {
-	private static final long serialVersionUID = 5820786756175547307L;
-
-	@Override
-	public void write(JSONWriter writer, Properties options)
-			throws JSONException {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/src/main/webapp/images/large-spinner.gif b/src/main/webapp/images/large-spinner.gif
new file mode 100644
index 000000000..3288d1035
Binary files /dev/null and b/src/main/webapp/images/large-spinner.gif differ
diff --git a/src/main/webapp/images/small-spinner.gif b/src/main/webapp/images/small-spinner.gif
new file mode 100644
index 000000000..5b33f7e54
Binary files /dev/null and b/src/main/webapp/images/small-spinner.gif differ