diff --git a/PLUG/JavaScript/JNodes/JNodeBase.php b/PLUG/JavaScript/JNodes/JNodeBase.php
index 6d0075f..57c6fc2 100644
--- a/PLUG/JavaScript/JNodes/JNodeBase.php
+++ b/PLUG/JavaScript/JNodes/JNodeBase.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JNodeBase.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.parsing.LR.LRParseNode');
+
 /**
  * Default JavaScript node class
  * @category PLUG
@@ -174,4 +175,4 @@ protected static function format_newline( $str, &$line, array &$lines ){
 	
 
 
-}
\ No newline at end of file
+}
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JAddExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JAddExprNode.php
index a0bb44d..6a016e9 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JAddExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JAddExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JAddExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ADD_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JArgListNode.php b/PLUG/JavaScript/JNodes/nonterminal/JArgListNode.php
index 65b72f0..2966ee3 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JArgListNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JArgListNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JArgListNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ARG_LIST symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JArgsNode.php b/PLUG/JavaScript/JNodes/nonterminal/JArgsNode.php
index d783653..37e53db 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JArgsNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JArgsNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JArgsNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ARGS symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JArrayLiteralNode.php b/PLUG/JavaScript/JNodes/nonterminal/JArrayLiteralNode.php
index 5ceb298..25d63c3 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JArrayLiteralNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JArrayLiteralNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JArrayLiteralNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ARRAY_LITERAL symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JAssignExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JAssignExprNode.php
index aa3ff79..ee306ba 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JAssignExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JAssignExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JAssignExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ASSIGN_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JAssignOpNode.php b/PLUG/JavaScript/JNodes/nonterminal/JAssignOpNode.php
index 888169c..b22a929 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JAssignOpNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JAssignOpNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JAssignOpNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ASSIGN_OP symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JBitAndExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JBitAndExprNode.php
index 229f859..ff2edd7 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JBitAndExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JBitAndExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JBitAndExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_BIT_AND_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JBitOrExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JBitOrExprNode.php
index 1d12afd..91fb0ad 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JBitOrExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JBitOrExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JBitOrExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_BIT_OR_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JBitXorExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JBitXorExprNode.php
index f5d6918..73bef39 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JBitXorExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JBitXorExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JBitXorExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_BIT_XOR_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JBlockNode.php b/PLUG/JavaScript/JNodes/nonterminal/JBlockNode.php
index f1c341a..eca583a 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JBlockNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JBlockNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JBlockNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_BLOCK symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JBreakStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JBreakStatementNode.php
index ee9852e..2c34683 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JBreakStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JBreakStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JBreakStatementNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_BREAK_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JCallExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JCallExprNode.php
index 6f8c53d..de07c8a 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JCallExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JCallExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JCallExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_CALL_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JCaseBlockNode.php b/PLUG/JavaScript/JNodes/nonterminal/JCaseBlockNode.php
index 7d4e70c..05760fb 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JCaseBlockNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JCaseBlockNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JCaseBlockNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_CASE_BLOCK symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JCaseClausesNode.php b/PLUG/JavaScript/JNodes/nonterminal/JCaseClausesNode.php
index 492b71e..b049369 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JCaseClausesNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JCaseClausesNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JCaseClausesNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_CASE_CLAUSES symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JCaseDefaultNode.php b/PLUG/JavaScript/JNodes/nonterminal/JCaseDefaultNode.php
index 176e3cd..1e57cff 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JCaseDefaultNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JCaseDefaultNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JCaseDefaultNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_CASE_DEFAULT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JCatchClauseNode.php b/PLUG/JavaScript/JNodes/nonterminal/JCatchClauseNode.php
index c6e376d..5b36830 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JCatchClauseNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JCatchClauseNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JCatchClauseNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_CATCH_CLAUSE symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JCondExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JCondExprNode.php
index 0c8f734..b37037c 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JCondExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JCondExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JCondExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_COND_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JContStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JContStatementNode.php
index ca20fc6..1b2d908 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JContStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JContStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JContStatementNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_CONT_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JElementListNode.php b/PLUG/JavaScript/JNodes/nonterminal/JElementListNode.php
index dc2edea..9077331 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JElementListNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JElementListNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JElementListNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ELEMENT_LIST symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JElementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JElementNode.php
index 3bc5121..e420495 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JElementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JElementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JElementNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ELEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JElementsNode.php b/PLUG/JavaScript/JNodes/nonterminal/JElementsNode.php
index 086cb09..b021df7 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JElementsNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JElementsNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JElementsNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ELEMENTS symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JElisionNode.php b/PLUG/JavaScript/JNodes/nonterminal/JElisionNode.php
index 22030ec..b8fa94f 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JElisionNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JElisionNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JElisionNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ELISION symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JEmptyStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JEmptyStatementNode.php
index 420f782..aebe527 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JEmptyStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JEmptyStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JEmptyStatementNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_EMPTY_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JEqExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JEqExprNode.php
index 6b3809e..e08652b 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JEqExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JEqExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JEqExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_EQ_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JExprNode.php
index f216b95..9eb3962 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JExprStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JExprStatementNode.php
index ee54be7..5c0391e 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JExprStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JExprStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JExprStatementNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_EXPR_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JFinallyClauseNode.php b/PLUG/JavaScript/JNodes/nonterminal/JFinallyClauseNode.php
index 938fa68..a6a2795 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JFinallyClauseNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JFinallyClauseNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JFinallyClauseNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_FINALLY_CLAUSE symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JFuncDeclNode.php b/PLUG/JavaScript/JNodes/nonterminal/JFuncDeclNode.php
index 223acf4..f0eedc9 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JFuncDeclNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JFuncDeclNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JFuncDeclNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_FUNC_DECL symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JFuncExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JFuncExprNode.php
index 7f151a9..e133c0d 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JFuncExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JFuncExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JFuncExprNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.nonterminal.JFuncDeclNode');
+
 /**
  * JavaScript node class for the J_FUNC_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JIfStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JIfStatementNode.php
index 91a4379..5a99551 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JIfStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JIfStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JIfStatementNode.php,v 1.1 2009/03/22 12:51:08 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_IF_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JInitializerNode.php b/PLUG/JavaScript/JNodes/nonterminal/JInitializerNode.php
index 2eefa79..9420296 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JInitializerNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JInitializerNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JInitializerNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_INITIALIZER symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JIterStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JIterStatementNode.php
index 1b08917..341f714 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JIterStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JIterStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JIterStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_ITER_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JLabelledStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JLabelledStatementNode.php
index 8094246..298e480 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JLabelledStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JLabelledStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JLabelledStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_LABELLED_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JLhsExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JLhsExprNode.php
index 7b0fa14..14b1eba 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JLhsExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JLhsExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JLhsExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_LHS_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JLogAndExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JLogAndExprNode.php
index 8fac4be..35d2a26 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JLogAndExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JLogAndExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JLogAndExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_LOG_AND_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JLogOrExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JLogOrExprNode.php
index 8aae9bc..484b101 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JLogOrExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JLogOrExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JLogOrExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_LOG_OR_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JMemberExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JMemberExprNode.php
index eadbfd0..4f18d29 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JMemberExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JMemberExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JMemberExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_MEMBER_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JMultExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JMultExprNode.php
index a8b8304..3f02259 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JMultExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JMultExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JMultExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_MULT_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JNewExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JNewExprNode.php
index 9da1d9b..52dcb72 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JNewExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JNewExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JNewExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_NEW_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JObjectLiteralNode.php b/PLUG/JavaScript/JNodes/nonterminal/JObjectLiteralNode.php
index c4b24b4..f1a58c2 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JObjectLiteralNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JObjectLiteralNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JObjectLiteralNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_OBJECT_LITERAL symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JParamListNode.php b/PLUG/JavaScript/JNodes/nonterminal/JParamListNode.php
index 78ad37c..d76361e 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JParamListNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JParamListNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JParamListNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_PARAM_LIST symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JPostfixExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JPostfixExprNode.php
index f38d302..36901fc 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JPostfixExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JPostfixExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JPostfixExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_POSTFIX_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JPrimaryExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JPrimaryExprNode.php
index 1d12534..0fa10d1 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JPrimaryExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JPrimaryExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JPrimaryExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_PRIMARY_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JProgramNode.php b/PLUG/JavaScript/JNodes/nonterminal/JProgramNode.php
index 07c92bf..e9887e6 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JProgramNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JProgramNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JProgramNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_PROGRAM start symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JPropListNode.php b/PLUG/JavaScript/JNodes/nonterminal/JPropListNode.php
index 4219287..4a5b4cc 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JPropListNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JPropListNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JPropListNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_PROP_LIST symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JPropNameNode.php b/PLUG/JavaScript/JNodes/nonterminal/JPropNameNode.php
index e20f327..dc072a9 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JPropNameNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JPropNameNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JPropNameNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_PROP_NAME symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JRelExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JRelExprNode.php
index 663008a..cf7af1a 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JRelExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JRelExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JRelExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_REL_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JReturnStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JReturnStatementNode.php
index ee0ffe2..90095cf 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JReturnStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JReturnStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JReturnStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_RETURN_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JShiftExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JShiftExprNode.php
index 5ae4eab..f7e06f6 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JShiftExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JShiftExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JShiftExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_SHIFT_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JStatementListNode.php b/PLUG/JavaScript/JNodes/nonterminal/JStatementListNode.php
index 26121b2..ec507b6 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JStatementListNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JStatementListNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JStatementListNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_STATEMENT_LIST symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JStatementNode.php
index c9ef2a5..6a45dcc 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JSwitchStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JSwitchStatementNode.php
index 10991f2..ccf7af3 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JSwitchStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JSwitchStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JSwitchStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_SWITCH_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JThrowStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JThrowStatementNode.php
index dd034d8..7ceff95 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JThrowStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JThrowStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JThrowStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_THROW_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JTryStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JTryStatementNode.php
index 0270054..cd17086 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JTryStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JTryStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JTryStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_TRY_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JUnaryExprNode.php b/PLUG/JavaScript/JNodes/nonterminal/JUnaryExprNode.php
index edd09fc..57179c4 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JUnaryExprNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JUnaryExprNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JUnaryExprNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_UNARY_EXPR symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JVarDeclListNode.php b/PLUG/JavaScript/JNodes/nonterminal/JVarDeclListNode.php
index 0ce2ec8..d03cf7a 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JVarDeclListNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JVarDeclListNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JVarDeclListNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_VAR_DECL_LIST symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JVarDeclNode.php b/PLUG/JavaScript/JNodes/nonterminal/JVarDeclNode.php
index b846a0d..31c60d5 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JVarDeclNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JVarDeclNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JVarDeclNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_VAR_DECL symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JVarStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JVarStatementNode.php
index cffb456..b8b7214 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JVarStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JVarStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JVarStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_VAR_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/nonterminal/JWithStatementNode.php b/PLUG/JavaScript/JNodes/nonterminal/JWithStatementNode.php
index 8c72b75..1979bee 100644
--- a/PLUG/JavaScript/JNodes/nonterminal/JWithStatementNode.php
+++ b/PLUG/JavaScript/JNodes/nonterminal/JWithStatementNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JWithStatementNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_WITH_STATEMENT symbol
  * @category PLUG
diff --git a/PLUG/JavaScript/JNodes/terminal/JIdentifierNode.php b/PLUG/JavaScript/JNodes/terminal/JIdentifierNode.php
index cb86c76..7e75fd9 100644
--- a/PLUG/JavaScript/JNodes/terminal/JIdentifierNode.php
+++ b/PLUG/JavaScript/JNodes/terminal/JIdentifierNode.php
@@ -7,8 +7,9 @@
  * @subpackage JNodes
  * @version $Id: JIdentifierNode.php,v 1.1 2009/03/22 12:51:09 twhitlock Exp $
  */
- 
- 
+
+import('PLUG.JavaScript.JNodes.JNodeBase');
+
 /**
  * JavaScript node class for the J_IDENTIFIER symbol
  * @category PLUG