diff --git a/Parser.cc b/Parser.cc
index 304d2b2..a34697e 100644
--- a/Parser.cc
+++ b/Parser.cc
@@ -16,8 +16,11 @@
 
 using namespace std;
 
+#define DEBUG
+
 Parser::Parser()
-    : m_classname("Parser"), m_namespace(""), m_extension("cc")
+    : m_classname("Parser"), m_namespace(""), m_extension("cc"),
+    m_token_data(new string()), m_token_code(new string())
 {
 }
 
@@ -41,24 +44,29 @@ bool Parser::write(const string & fname)
     ofstream header(header_fname.c_str());
     ofstream body(body_fname.c_str());
 
+    /* set up replacements */
+    setReplacement("token_list", buildTokenList());
+    setReplacement("header_name",
+            new string(string("\"") + header_fname + "\""));
+    setReplacement("token_code", m_token_code);
+    setReplacement("token_data", m_token_data);
+
     /* write the header */
     if (m_namespace != "")
     {
         writeDefine(header, "I_NAMESPACE", m_namespace);
     }
     writeDefine(header, "I_CLASSNAME", m_classname);
-    setReplacement("token_list", buildTokenList());
     header << endl;
     writeTmpl(header, (char *) tmpl_parser_h, tmpl_parser_h_len);
 
     /* write the body */
-    setReplacement("header_name",
-            new string(string("\"") + header_fname + "\""));
     body << endl;
     writeTmpl(body, (char *) tmpl_parser_cc, tmpl_parser_cc_len);
 
     header.close();
     body.close();
+
     return true;
 }
 
@@ -103,6 +111,9 @@ refptr<std::string> Parser::getReplacement(const std::string & name)
     {
         return m_replacements[name];
     }
+#ifdef DEBUG
+    cerr << "No replacement found for \"" << name << "\"" << endl;
+#endif
     return new string("");
 }
 
@@ -119,7 +130,7 @@ refptr<string> Parser::buildTokenList()
             + (*t)->getCString() + "\", "
             + ((*t)->getProcessFlag() ? "true" : "false") + " }";
         if (({typeof(t) tmp = t; ++tmp;}) != m_tokens.end())
-            *tokenlist += ", \\\n";
+            *tokenlist += ",\n";
     }
     return tokenlist;
 }
@@ -265,9 +276,7 @@ bool Parser::parseInputFile(char * buff, int size)
                         continue_line = true;
                         if (current_token.isNull())
                         {
-                            cerr << "Data section with no corresponding "
-                                "token definition on line " << lineno << endl;
-                            return false;
+                            *m_token_data += gather;
                         }
                         else
                         {
@@ -291,9 +300,7 @@ bool Parser::parseInputFile(char * buff, int size)
                         continue_line = true;
                         if (current_token.isNull())
                         {
-                            cerr << "Code section with no corresponding "
-                                "token definition on line " << lineno << endl;
-                            return false;
+                            *m_token_code += gather;
                         }
                         else
                         {
diff --git a/Parser.h b/Parser.h
index d888213..6b0aa35 100644
--- a/Parser.h
+++ b/Parser.h
@@ -50,6 +50,8 @@ class Parser
         std::string m_namespace;
         std::string m_extension;
         std::map< std::string, refptr<std::string> > m_replacements;
+        refptr<std::string> m_token_data;
+        refptr<std::string> m_token_code;
 };
 
 #endif
diff --git a/tmpl/parser.cc b/tmpl/parser.cc
index 9d06744..53dfb83 100644
--- a/tmpl/parser.cc
+++ b/tmpl/parser.cc
@@ -23,7 +23,7 @@ static TokenRef buildToken(int typeindex)
     TokenRef token;
     switch (typeindex)
     {
-//%buildToken%
+        {%buildToken%}
     }
     return token;
 }
@@ -149,8 +149,9 @@ refptr<Node> Node::operator[](const std::string & index)
         : NULL;
 }
 
-void Token::process()
+void Token::process(MatchesRef matches)
 {
+    {%token_code%}
 }
 
 Matches::Matches(pcre * re, const char * data, int * ovector, int ovec_size)
diff --git a/tmpl/parser.h b/tmpl/parser.h
index 844a4a5..506510b 100644
--- a/tmpl/parser.h
+++ b/tmpl/parser.h
@@ -153,12 +153,15 @@ typedef refptr<Node> NodeRef;
 class Token : public Node
 {
     public:
-        virtual void process();
+        virtual void process(MatchesRef matches);
 
     protected:
+        {%token_data%}
 };
 typedef refptr<Token> TokenRef;
 
+{%token_classes%}
+
 #ifdef I_NAMESPACE
 };
 #endif