diff --git a/Stata.iws b/Stata.iws
index 6509b5d..3344fd8 100644
--- a/Stata.iws
+++ b/Stata.iws
@@ -2,6 +2,26 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4ae3bc83-55c2-4253-aa06-ce5af9dbdb87" name="Default" comment="Added debugger to main package body.  Need to initialize variables for all methods.">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/Address.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/Alternatives.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/ApiKey.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/ArrivalTime.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/Avoid.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/DepartureTime.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/FixedOptions.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/Language.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/Region.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/TrafficModel.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/TransitMode.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/TransitRoutingPreference.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/TravelMode.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/Units.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Google/DirectionComponents/WayPoints.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Ingest/InJSON.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Ingest/IndexedPeekIterator.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Ingest/JsonUtils.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Ingest/StataJson$1.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/target/classes/org/paces/Stata/Ingest/StataJson.class" />
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/InJSON.java" />
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/IndexedPeekIterator.java" />
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/JsonUtils.java" />
@@ -113,8 +133,8 @@
       <file leaf-file-name="InJSON.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/InJSON.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="377">
-              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+            <state relative-caret-position="18">
+              <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -125,7 +145,7 @@
       <file leaf-file-name="StataJson.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/StataJson.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
+            <state relative-caret-position="120">
               <caret line="14" column="72" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -137,8 +157,8 @@
       <file leaf-file-name="JsonUtils.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/JsonUtils.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="183">
-              <caret line="171" column="0" selection-start-line="171" selection-start-column="0" selection-end-line="171" selection-end-column="0" />
+            <state relative-caret-position="154">
+              <caret line="243" column="0" selection-start-line="180" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -146,62 +166,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="JsonNode.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.1/jackson-databind-2.6.1-sources.jar!/com/fasterxml/jackson/databind/JsonNode.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="123">
-              <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ArrayNode.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.1/jackson-databind-2.6.1-sources.jar!/com/fasterxml/jackson/databind/node/ArrayNode.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
-              <folding>
-                <element signature="e#1911#1912#0" expanded="true" />
-                <element signature="e#2123#2124#0" expanded="true" />
-                <element signature="e#2166#2167#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TextNode.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.1/jackson-databind-2.6.1-sources.jar!/com/fasterxml/jackson/databind/node/TextNode.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-              <folding>
-                <element signature="e#1278#1279#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ObjectNode.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.1/jackson-databind-2.6.1-sources.jar!/com/fasterxml/jackson/databind/node/ObjectNode.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="87" column="0" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IndexedPeekIterator.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/IndexedPeekIterator.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="527">
-              <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -383,15 +347,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.1" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jackson-databind-2.6.1.jar" />
+              <option name="myItemId" value="Stata" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -401,45 +357,23 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.1" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jackson-databind-2.6.1.jar" />
+              <option name="myItemId" value="Stata" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="databind" />
+              <option name="myItemId" value="src" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-          </PATH>
-          <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Stata" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.1" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jackson-databind-2.6.1.jar" />
+              <option name="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="databind" />
+              <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="node" />
+              <option name="myItemId" value="Stata" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -452,22 +386,24 @@
               <option name="myItemId" value="Stata" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-          </PATH>
-          <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Stata" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="Stata" />
+              <option name="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
+              <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
+              <option name="myItemId" value="Stata" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Ingest" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1158,7 +1094,7 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3982906" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3982906" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295063" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="TypeScript Compiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903865" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1168,7 +1104,7 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903865" sideWeight="0.49112427" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32649574" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45811966" sideWeight="0.4868977" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.45811966" sideWeight="0.4868977" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28989667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -1573,16 +1509,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/StataJson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" column="72" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.6.1/jackson-databind-2.6.1-sources.jar!/com/fasterxml/jackson/databind/node/ObjectNode.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
@@ -1623,8 +1549,18 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/InJSON.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+        <state relative-caret-position="18">
+          <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/StataJson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="14" column="72" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1633,8 +1569,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/paces/Stata/Ingest/JsonUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="171" column="0" selection-start-line="171" selection-start-column="0" selection-end-line="171" selection-end-column="0" />
+        <state relative-caret-position="154">
+          <caret line="243" column="0" selection-start-line="180" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/main/java/org/paces/Stata/Ingest/JsonUtils.java b/src/main/java/org/paces/Stata/Ingest/JsonUtils.java
index bf934f4..97fd1e8 100644
--- a/src/main/java/org/paces/Stata/Ingest/JsonUtils.java
+++ b/src/main/java/org/paces/Stata/Ingest/JsonUtils.java
@@ -12,117 +12,84 @@
 public class JsonUtils {
 
 	public static Boolean isTerminal(ArrayNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = true;
-		while(elems.hasNext()) {
-			if (!elems.next().isValueNode()) returnValue = false;
-		}
-		return returnValue;
+		return isTerminal((JsonNode) an);
 	}
 
 	public static Boolean containsArray(ArrayNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			if (elems.next().isArray()) returnValue = true;
-		}
-		return returnValue;
+		return containsArray((JsonNode) an);
 	}
 
 	public static Boolean containsObject(ArrayNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			if (elems.next().isObject()) returnValue = true;
-		}
-		return returnValue;
+		return containsObject((JsonNode) an);
 	}
 
 	public static Boolean containsContainers(ArrayNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			JsonNode temp = elems.next();
-			if (temp.isArray() || temp.isObject()) returnValue = true;
-		}
-		return returnValue;
+		return containsContainers((JsonNode) an);
 	}
 
 	public static Boolean isTerminal(ObjectNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = true;
-		while(elems.hasNext()) {
-			if (!elems.next().isValueNode()) returnValue = false;
-		}
-		return returnValue;
+		return isTerminal((JsonNode) an);
 	}
 
 	public static Boolean containsArray(ObjectNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			if (elems.next().isArray()) returnValue = true;
-		}
-		return returnValue;
+		return containsArray((JsonNode) an);
 	}
 
 	public static Boolean containsObject(ObjectNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			if (elems.next().isObject()) returnValue = true;
-		}
-		return returnValue;
+		return containsObject((JsonNode) an);
 	}
 
+
 	public static Boolean containsContainers(ObjectNode an) {
-		Iterator<JsonNode> elems = an.elements();
-		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			JsonNode temp = elems.next();
-			if (temp.isArray() || temp.isObject()) returnValue = true;
-		}
-		return returnValue;
+		return containsContainers((JsonNode) an);
 	}
 
+	/**
+	 * Method used to indicate whether or not all elements of a given node
+	 * are terminal (e.g., some non-container node type)
+	 * @param an A JsonNode object to test
+	 * @return A boolean where true indicates that all elements are
+	 * value/terminal types, while false indicates that one or more elements
+	 * are container types (i.e., ObjectNode or ArrayNode types).
+	 */
 	public static Boolean isTerminal(JsonNode an) {
-		Iterator<JsonNode> elems = an.elements();
 		Boolean returnValue = true;
-		while(elems.hasNext()) {
-			if (!elems.next().isValueNode()) returnValue = false;
-		}
+		for(JsonNode i : nodeList(an)) if (i.isContainerNode()) returnValue = false;
 		return returnValue;
 	}
 
 	public static Boolean containsArray(JsonNode an) {
-		Iterator<JsonNode> elems = an.elements();
 		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			if (elems.next().isArray()) returnValue = true;
-		}
+		for(JsonNode i : nodeList(an)) if (i.isArray()) returnValue = true;
 		return returnValue;
 	}
 
 	public static Boolean containsObject(JsonNode an) {
-		Iterator<JsonNode> elems = an.elements();
 		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			if (elems.next().isObject()) returnValue = true;
-		}
+		for(JsonNode i : nodeList(an)) if (i.isObject()) returnValue = true;
 		return returnValue;
 	}
 
+	/**
+	 * Method that tests whether the object contains any container type nodes
+	 * @param an A JsonNode object which may/may not contain nested container
+	 *              type nodes
+	 * @return A Boolean : false indicates that no elements are container
+	 * object types; true indicates that one or more elements are container
+	 * type objects.
+	 */
 	public static Boolean containsContainers(JsonNode an) {
-		Iterator<JsonNode> elems = an.elements();
 		Boolean returnValue = false;
-		while(elems.hasNext()) {
-			JsonNode temp = elems.next();
-			if (temp.isArray() || temp.isObject()) returnValue = true;
-		}
+		for(JsonNode i : nodeList(an)) if (i.isContainerNode()) returnValue = true;
 		return returnValue;
 	}
 
-
+	/**
+	 * Convenience wrapper that returns a List of JsonNodes using the
+	 * JsonNode.elements() method to add successive elements to the list object
+	 * @param jn A JsonNode with elements that will be returned in a list object
+	 * @return A List of descendant JsonNode objects
+	 */
 	public static List<JsonNode> nodeList(JsonNode jn) {
 		List<JsonNode> nodes = new ArrayList<>();
 		Iterator<JsonNode> iter = jn.elements();
@@ -130,6 +97,16 @@ public static List<JsonNode> nodeList(JsonNode jn) {
 		return nodes;
 	}
 
+	/**
+	 * A method used to retrieve the maximum depth of each of the descendants
+	 * of a given JsonNode object.  This method returns a list of integers
+	 * containing the maximum depth for each child element in this node.
+	 * @param root The JsonNode object which may/may not contain nested elements
+	 * @param startIndex The value to use to indicate the starting value used
+	 *                      for indexing (e.g., count from 0, 1, etc...)
+	 * @return A list of integer values containing the maximum depth of all
+	 * children of this node
+	 */
 	public static List<Integer> nodeDepths(JsonNode root, Integer startIndex) {
 		List<Integer> nodeDepths = new ArrayList<>();
 		List<JsonNode> nodes = JsonUtils.nodeList(root);
@@ -138,26 +115,83 @@ public static List<Integer> nodeDepths(JsonNode root, Integer startIndex) {
 		return nodeDepths;
 	}
 
+	/**
+	 * A method used to retrieve the maximum depth of each of the descendants
+	 * of a given ObjectNode object.  This method returns a list of integers
+	 * containing the maximum depth for each child element in this node.
+	 * @param root The ObjectNode type which may/may not contain nested elements
+	 * @param startIndex The value to use to indicate the starting value used
+	 *                      for indexing (e.g., count from 0, 1, etc...)
+	 * @return A list of integer values containing the maximum depth of all
+	 * children of this node
+	 */
 	public static List<Integer> nodeDepths(ObjectNode root, Integer startIndex) {
 		return nodeDepths((JsonNode) root, startIndex);
 	}
 
+	/**
+	 * A method used to retrieve the maximum depth of each of the descendants
+	 * of a given ArrayNode object.  This method returns a list of integers
+	 * containing the maximum depth for each child element in this node.
+	 * @param root The ArrayNode type which contain nested elements
+	 * @param startIndex The value to use to indicate the starting value used
+	 *                      for indexing (e.g., count from 0, 1, etc...)
+	 * @return A list of integer values containing the maximum depth of all
+	 * children of this node
+	 */
 	public static List<Integer> nodeDepths(ArrayNode root, Integer startIndex) {
 		return nodeDepths((JsonNode) root, startIndex);
 	}
 
+	/**
+	 * A method used to retrieve the maximum depth of each of the descendants
+	 * of a given JsonNode object.  This method returns a list of integers
+	 * containing the maximum depth for each child element in this node.
+	 * <em>This is a wrapper around JsonUtils.nodeDepths(JsonNode, Integer)
+	 * that specifies a value of 0 for the second parameter. </em>
+	 * @param root The JsonNode object which may/may not contain nested elements
+	 * @return A list of integer values containing the maximum depth of all
+	 * children of this node
+	 */
 	public static List<Integer> nodeDepths(JsonNode root) {
 		return nodeDepths(root, 0);
 	}
 
+	/**
+	 * A method used to retrieve the maximum depth of each of the descendants
+	 * of a given ObjectNode object.  This method returns a list of integers
+	 * containing the maximum depth for each child element in this node.
+	 * <em>This is a wrapper around JsonUtils.nodeDepths(JsonNode, Integer)
+	 * that specifies a value of 0 for the second parameter. </em>
+	 * @param root The ObjectNode object which contains nested elements
+	 * @return A list of integer values containing the maximum depth of all
+	 * children of this node
+	 */
 	public static List<Integer> nodeDepths(ObjectNode root) {
 		return nodeDepths((JsonNode) root, 0);
 	}
 
+	/**
+	 * A method used to retrieve the maximum depth of each of the descendants
+	 * of a given ArrayNode object.  This method returns a list of integers
+	 * containing the maximum depth for each child element in this node.
+	 * <em>This is a wrapper around JsonUtils.nodeDepths(ArrayNode, Integer)
+	 * that specifies a value of 0 for the second parameter. </em>
+	 * @param root The ArrayNode object which contains nested elements
+	 * @return A list of integer values containing the maximum depth of all
+	 * children of this node
+	 */
 	public static List<Integer> nodeDepths(ArrayNode root) {
 		return nodeDepths((JsonNode) root, 0);
 	}
 
+	/**
+	 * Public method used handle recasting ObjectNode types to JsonNode types
+	 * to overload the descent method
+	 * @param node An JsonNode which will be descended into to determine
+	 *                the depth of nested objects
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
 	public static Integer descent(JsonNode node, Integer currentLevel) {
 		List<JsonNode> children = nodeList(node);
 		List<Integer> depths = new ArrayList<>();
@@ -170,77 +204,186 @@ public static Integer descent(JsonNode node, Integer currentLevel) {
 		return Collections.max(depths);
 	}
 
+	/**
+	 * Public method used handle recasting ObjectNode types to JsonNode types
+	 * to overload the descent method
+	 * @param node An ArrayNode which will be descended into to determine
+	 *                the depth of nested objects
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
 	public static Integer descent(ArrayNode node, Integer currentLevel) {
 		return descent((JsonNode)node, currentLevel);
 	}
 
+	/**
+	 * Public method used handle recasting ObjectNode types to JsonNode types
+	 * to overload the descent method
+	 * @param node An ObjectNode which will be descended into to determine
+	 *                the depth of nested objects
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
 	public static Integer descent(ObjectNode node, Integer currentLevel) {
 		return descent((JsonNode)node, currentLevel);
 	}
 
-	public static Integer descent(BaseJsonNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Base64 type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(BaseJsonNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(BigIntegerNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A BigInteger type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(BigIntegerNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(BinaryNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Binary type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(BinaryNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(BooleanNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Boolean type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(BooleanNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(DecimalNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Decimal valued type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(DecimalNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(DoubleNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Double type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(DoubleNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(FloatNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Float type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(FloatNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(IntNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Integer type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(IntNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(LongNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Long type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(LongNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(MissingNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Missing type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(MissingNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(NullNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Null type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(NullNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(NumericNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Number type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(NumericNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(POJONode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A POJO (Plain Old Java Object) type JsonNode which contains
+	 *                some type of non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(POJONode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(ShortNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Short type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(ShortNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(TextNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Text type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(TextNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-	public static Integer descent(ValueNode node, Integer currentLevel) {
+	/**
+	 * Private method used to prevent type errors when calling descent method on objects
+	 * @param node A Value type JsonNode which contains some type of
+	 *                non-container value
+	 * @param currentLevel The level of the descent where this node occurs
+	 */
+	private static Integer descent(ValueNode node, Integer currentLevel) {
 		return currentLevel;
 	}
 
-
 }