diff --git a/Global.h b/Global.h
index 020e62d..8f8e7a3 100644
--- a/Global.h
+++ b/Global.h
@@ -27,8 +27,8 @@ namespace  jet {
       char *errorCursor = NULL;
 	
       coreutils::CGIFormattedData cookies;
+      coreutils::CGIFormData *formdata;
       std::map<coreutils::MString, coreutils::MString> variables;
-      std::map<coreutils::MString, coreutils::MString> cgiVariables;
       std::map<coreutils::MString, __mysql *> sessions;
       std::map<coreutils::MString, coreutils::MString> headers;
       std::map<coreutils::MString, coreutils::MString> tags;
diff --git a/__jet.cpp b/__jet.cpp
index 4affc6b..31bf5c4 100644
--- a/__jet.cpp
+++ b/__jet.cpp
@@ -36,11 +36,7 @@ namespace jet {
 	    coreutils::ZString contentLength(getenv("CONTENT_LENGTH"));
 	    coreutils::ZString contentType(getenv("CONTENT_TYPE"));
 	    
-	    if(contentType == "multipart/form-data") 	 
-	       coreutils::IMFMultipart postdata(0, "");	      
-	    
-//	    else if(contentType == "application/x-www-form-urlencoded") 
-//	      global.setupFormURLEncoded(postdata);
+	    formdata = new coreutils::CGIFormData(0, contentType, contentLength, boundary);	      
 	 }	
       }
       processContainer(container, NULL, true);