diff --git a/Operand.cpp b/Operand.cpp
index 0523861..95e89d5 100644
--- a/Operand.cpp
+++ b/Operand.cpp
@@ -64,7 +64,20 @@ namespace jet {
 	 } else
 	   throw coreutils::Exception("Expecting ) at end of EXPR expression.");	 	 
       } else if(in.ifNextIgnoreCase("RIGHT")) {
-	 
+	 if(!in.ifNext("("))
+	   throw coreutils::Exception("Expecting ( for RIGHT parameters.");
+	 Operand parm1(in, tag);
+	 if(!in.ifNext(","))
+	   throw coreutils::Exception("Expecting , in RIGHT expression.");
+	 Operand parm2(in, tag);
+	 if(in.ifNext(")")) {
+	    int len = parm1.string.getLength();
+	    int start = len - parm2.string.asInteger();
+	    std::cout << "len: " << len << "; start: " << start << ";" << std::endl;
+	    string = parm1.string.substring(0, parm2.string.asInteger());
+	    std::cout << "string: " << string << std::endl;
+	 } else
+	   throw coreutils::Exception("Expecting ) at end of RIGHT expression.");	 	 
       } else if(in.ifNextIgnoreCase("TRIM")) {
 	 
       } else if(in.ifNextIgnoreCase("TOUPPER")) {
diff --git a/TODO.txt b/TODO.txt
index 7dec809..9014ad7 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,3 +4,10 @@
 3) Create a method to upload a file directly to a file name to bypass
 buffering on large files.
 4) Allow the cookie tag only if CGI mode selected.
+5) Call tag is acting wierd. Look at testcall.jet.
+6) Create a tag for uploading of URL data to a specific file instead
+of buffering in an internal variable. Use <upload />. See testcgi.jet
+7) For CGI image and other mime type fields you should be able to get
+file name and content length from variable. $[data(filename)] and
+$[data(length)] possibly.
+8) 
diff --git a/tests/testcall.jet b/tests/testcall.jet
index 1cd8fb0..3ef97fc 100755
--- a/tests/testcall.jet
+++ b/tests/testcall.jet
@@ -5,4 +5,7 @@
 test1=$[test1]
 name1=$[%name1]
 error=$[error]
+<call error="rc" pgm="/usr/bin/ls" arg1="-al" />
+$[rc]
+
 </jet>
diff --git a/tests/testexpr.jet b/tests/testexpr.jet
index 879b35d..3ef780f 100755
--- a/tests/testexpr.jet
+++ b/tests/testexpr.jet
@@ -6,4 +6,6 @@ $[test2]=10
 <set name="numbers">0123456789</set>
 <set name="lefty" expr="left($[numbers],5)" />
 $[lefty]=01234
+<set name="righty" expr="right($[numbers],5)" />
+$[righty]=56789
 </jet>
diff --git a/tests/testjet.jet b/tests/testjet.jet
index 96c6e86..30ed941 100755
--- a/tests/testjet.jet
+++ b/tests/testjet.jet
@@ -40,9 +40,9 @@
  <set name="noeval" eval="no">this is the value store in $[%name1].</set>
  <set name="thename" eval="yes">this is the value store in $[%name1].</set>
  <set name="newname" scope="global">another container value</set>
- <comment><include file="./testinclude.jet" />
+ <include file="./testinclude.jet" />
  include: $[include]
- localvar='#[localvar]'</comment>
+ localvar='#[localvar]'
  >>>$[noeval]<<<
  >>>$[thename]<<<
  <set name="iz" value="data" />
diff --git a/tests/testpost.jet b/tests/testpost.jet
index a659d2b..b18ca64 100755
--- a/tests/testpost.jet
+++ b/tests/testpost.jet
@@ -1,4 +1,5 @@
 #!../jet-2.0
+<upload name="imagefiledata" path="images/%name" />
 <jet cgi="true">
 $[:name]
 $[:name:1]