diff --git a/client/server/src/server.js b/client/server/src/server.js
index 8a2abc3..af2be85 100644
--- a/client/server/src/server.js
+++ b/client/server/src/server.js
@@ -111,7 +111,7 @@ function getRange(error) {
 }
 /**
  * Converts an error (exception) to a VSCode Diagnostic and
- * pushes it onto the global diagnosticMap
+ * pushes it onto the diagnosticMap
  * @param textDocument the text document associated (the doc that has been modified)
  * @param error the exception
  * @param type the type of the exception
@@ -163,6 +163,14 @@ function pushError(textDocument, error, type, diagnosticMap) {
     }
     diagnosticMap[fileName].add(diagnostic);
 }
+/**
+ * Declares that a file has no errors in the diagnostic map.
+ * We need to call this on all files that DO NOT have errors
+ * to ensure that error markers are removed.
+ *
+ * @param fileName the uri of the file
+ * @param diagnosticMap the diagnostic map
+ */
 function validFile(fileName, diagnosticMap) {
     diagnosticMap[fileName] = new Set();
 }
@@ -209,22 +217,16 @@ function validateTextDocument(textDocument) {
         try {
             connection.console.log(`*** Document modified: ${textDocument.uri}`);
             /**
-             * A cache of TemplateLogic instances. The keys are
-             * the root folder names. The values are the TemplateLogic instances.
-             * Note that we will leak instances if people rename the root folders...
+             * A cache of TemplateLogic instances. The keys are the root folder names.
              */
             const templateCache = {};
             /**
              * Map of diagnostics, with the key being the document URI
-             * and the value being the array of Diagnostic instances
+             * and the value being a Set of Diagnostic instances
              */
             const diagnosticMap = {};
             const pathStr = path.resolve(fileUriToPath_1.default(textDocument.uri));
             const fileExtension = path.extname(pathStr);
-            // clear the diagnosticMap
-            Object.keys(diagnosticMap).forEach(function (key) {
-                diagnosticMap[key] = [];
-            });
             // this will assemble all the models into a ModelManager
             // and validate - so it needs to always run before we do anything else
             const modelValid = yield validateModels(textDocument, diagnosticMap, templateCache);
@@ -236,7 +238,7 @@ function validateTextDocument(textDocument) {
                         const ergoValid = yield compileErgoFiles(textDocument, diagnosticMap, templateCache);
                         // if ergo is valid we proceed to check the template
                         if (ergoValid) {
-                            // await validateTemplateFile(textDocument, diagnosticMap);
+                            yield validateTemplateFile(textDocument, diagnosticMap);
                         }
                         break;
                     case '.ergo':
@@ -245,7 +247,7 @@ function validateTextDocument(textDocument) {
                         break;
                     case '.tem':
                         // if a template file has changed, we check we can build the template
-                        // await validateTemplateFile(textDocument);
+                        yield validateTemplateFile(textDocument, diagnosticMap);
                         break;
                 }
             }
@@ -393,7 +395,7 @@ function validateTemplateFile(textDocument, diagnosticMap) {
                 template.validate();
                 try {
                     connection.console.log(`Built template: ${template.getIdentifier()}`);
-                    validFile(parentDir + '/grammar/sample.txt', diagnosticMap);
+                    validFile(parentDir + '/sample.txt', diagnosticMap);
                     const sample = fs.readFileSync(parentDir + '/sample.txt', 'utf8');
                     const clause = new cicero_core_1.Clause(template);
                     clause.parse(sample);
diff --git a/client/server/src/server.js.map b/client/server/src/server.js.map
index 9fe9857..3652875 100644
--- a/client/server/src/server.js.map
+++ b/client/server/src/server.js.map
@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../server/src/server.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../server/src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;;;;;;;;;;AAEb,iEAG+B;AAE/B,+BAA4B;AAC5B,yBAAyB;AACzB,6BAA6B;AAC7B,mDAA4C;AAE5C,4DAA8D;AAC9D,gEAA6D;AAC7D,yDAA8C;AAE9C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,6BAA6B;AAC7B,IAAI,UAAU,GAAG,wCAAgB,CAAC,wCAAgB,CAAC,GAAG,CAAC,CAAC;AAExD,2CAA2C;AAC3C,IAAI,SAAS,GAAG,IAAI,qCAAa,EAAE,CAAC;AAEpC,mDAAmD;AACnD,IAAI,eAAuB,CAAC;AAE5B,sEAAsE;AACtE,MAAM,UAAU,GAAG;IACf,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;IAChC,GAAG,EAAG,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;CAClC,CAAC;AAEF;;;;;;;;GAQG;AACH,SAAS,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa;IAEzD,IAAI,WAAW,GAAG,OAAO,CAAC;IAE1B,OAAM,WAAW,KAAK,GAAG,EAAE;QACvB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAE,KAAK,WAAW,EAAE,CAAC,CAAC;QAE5C,IAAI;YACA,MAAM,mBAAmB,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,GAAG,eAAe,EAAE,MAAM,CAAC,CAAC;YACnF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACpD,IAAG,WAAW,CAAC,aAAa,EAAE;gBAC1B,OAAO,WAAW,CAAC;aACtB;SACJ;QACD,OAAM,GAAG,EAAE;YACP,UAAU,CAAC,OAAO,CAAC,GAAG,CAAE,eAAe,GAAG,EAAE,CAAC,CAAC;YAC9C,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;SAC9D;KACJ;IAED,UAAU,CAAC,OAAO,CAAC,GAAG,CAAE,oCAAoC,OAAO,EAAE,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,EAAC,OAAO,EAAE,GAAG,OAAO,2GAA2G,EAAC,CAAC;IAC/I,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAS,QAAQ,CAAC,KAAU;IACxB,IAAG,KAAK,CAAC,YAAY,EAAE;QACnB,OAAO;YACH,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,GAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE;YAC5F,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,GAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE;SACzF,CAAC;KACL;SACI,IAAG,KAAK,CAAC,UAAU,EAAE;QACtB,IAAG,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE;YACtF,IAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE;gBACnC,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC9G,OAAO;oBACH,KAAK,EAAE,UAAU;oBACjB,GAAG,EAAE,UAAU;iBAClB,CAAA;aACJ;YACD,IAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE;gBACjC,OAAO;oBACH,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;oBAChC,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,GAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE;iBAC9F,CAAA;aACJ;SACJ;aACI;YACD,OAAO;gBACH,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE;gBACjG,GAAG,EAAG,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,GAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE;aAC/F,CAAA;SACJ;KACJ;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,SAAS,CAAC,YAA0B,EAAE,KAAW,EAAE,IAAa,EAAE,aAAa;IAEpF,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAExD,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAE9B,wDAAwD;IACxD,IAAG,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE;QAC1D,MAAM,KAAK,GAAG,0BAA0B,CAAC;QACzC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACnD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;QAC1C,IAAG,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;SACnD;KACJ;IAED,mDAAmD;IACnD,IAAG,CAAC,QAAQ,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,EAAE,EAAE;QACxD,QAAQ,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC;KAC7C;IAED,IAAI,UAAU,GAAe;QACzB,QAAQ,EAAE,0CAAkB,CAAC,KAAK;QAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,IAAI;KACf,CAAC;IAEF,8CAA8C;IAC9C,wCAAwC;IACxC,IAAG,CAAC,QAAQ,EAAE;QACV,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC;KAC/B;IAED,oDAAoD;IACpD,iEAAiE;IACjE,kDAAkD;IAClD,wCAAwC;IACxC,YAAY;IACZ,wBAAwB;IACxB,6BAA6B;IAC7B,wDAAwD;IACxD,eAAe;IACf,mCAAmC;IACnC,aAAa;IACb,eAAe;IACf,IAAI;IAEJ,qBAAqB;IACrB,IAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACzB,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;KACvC;IAED,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,SAAS,CAAC,QAAQ,EAAE,aAAa;IACtC,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;AACxC,CAAC;AAED;;GAEG;AACH,SAAS,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;IAC7B,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,GAAG,KAAK,eAAe,sBAAsB,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;AAC9G,CAAC,CAAC,CAAA;AAEF;;GAEG;AACH,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAE7B;;GAEG;AACH,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;IAClC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;IACjC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,GAAG,KAAK,eAAe,mCAAmC,CAAC,CAAC;IACtG,OAAO;QACN,YAAY,EAAE;YACb,gBAAgB,EAAE;gBACjB,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE,4CAAoB,CAAC,IAAI;aACjC;SACD;KACD,CAAA;AACF,CAAC,CAAC,CAAC;AAEH;;;GAGG;AACH,SAAS,CAAC,kBAAkB,CAAC,CAAO,MAAM,EAAE,EAAE;IAC3C,qCAAqC;IACpC,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAClD,CAAC,CAAA,CAAC,CAAC;AAEH;;;;GAIG;AACH,SAAe,oBAAoB,CAAC,YAA0B;;QAE1D,IAAI;YACA,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;YAErE;;eAEG;YACH,MAAM,aAAa,GAAG,EAAE,CAAC;YAEzB;;;eAGG;YACH,MAAM,aAAa,GAAG,EACrB,CAAA;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAE5C,wDAAwD;YACxD,sEAAsE;YACtE,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;YAEpF,yCAAyC;YACzC,IAAG,UAAU,EAAE;gBACX,QAAO,aAAa,EAAE;oBAClB,KAAK,MAAM;wBACH,gFAAgF;wBAChF,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;wBAErF,oDAAoD;wBACpD,IAAG,SAAS,EAAE;4BACV,MAAM,oBAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;yBAC3D;wBACL,MAAM;oBACV,KAAK,OAAO;wBACR,kDAAkD;wBAClD,MAAM,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;wBACnE,MAAM;oBACV,KAAK,MAAM;wBACP,qEAAqE;wBACrE,MAAM,oBAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;wBACxD,MAAM;iBACb;aACJ;YAED,kEAAkE;YAClE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,UAAS,GAAG;gBAC3C,MAAM,eAAe,GAAqB,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC7D,UAAU,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAG,CAAC,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;YAC/E,CAAC,CAAC,CAAC;SACR;QACD,OAAM,KAAK,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACzC;IACL,CAAC;CAAA;AAED;;;;;GAKG;AACH,SAAe,gBAAgB,CAAC,YAA0B,EAAE,aAAa,EAAE,aAAa;;QAEpF,IAAI;YACA,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC,CAAC;YAC/D,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;YAExE,IAAG,CAAC,SAAS,EAAE;gBACX,OAAO,KAAK,CAAC;aAChB;YAED,IAAI;gBACA,oCAAoC;gBACpC,IAAI,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;gBAC7C,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;gBAEnE,kDAAkD;gBAClD,MAAM,SAAS,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,MAAM,IAAI,SAAS,iBAAiB,CAAC,CAAC;gBACtE,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;oBAC1B,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;oBAC/B,IAAI,IAAI,KAAK,OAAO,EAAE;wBAClB,uCAAuC;wBACvC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;wBACvE,aAAa,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;qBAC9D;yBAAM;wBACH,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBAC7B,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wBAC/C,aAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;qBAC7C;iBACJ;gBACD,MAAM,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBACvC,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACZ,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;aAC1D;SACJ;QACD,OAAM,KAAK,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACzC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CAAA;AAED;;;;;GAKG;AACH,SAAe,cAAc,CAAC,YAA0B,EAAE,aAAa,EAAE,aAAa;;QAClF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC,CAAC;QAE/D,IAAI;YACA,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;YACxE,IAAG,CAAC,SAAS,EAAE;gBACX,OAAO,KAAK,CAAC;aAChB;YACD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;YAErE,oCAAoC;YACpC,IAAI,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;YAE7C,IAAG,CAAC,aAAa,EAAE;gBACf,aAAa,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;gBAC5C,aAAa,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC;aAC5C;YAED,MAAM,YAAY,GAAG,aAAa,CAAC,eAAe,EAAE,CAAC;YACrD,YAAY,CAAC,eAAe,EAAE,CAAC;YAE/B,0GAA0G;YAC1G,MAAM,UAAU,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,MAAM,IAAI,SAAS,mBAAmB,CAAC,CAAC;YAEzE,2BAA2B;YAC3B,IAAI;gBACA,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;oBAC3B,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;oBAC/B,IAAI,QAAQ,GAAG,IAAI,CAAC;oBACpB,IAAI,IAAI,KAAK,OAAO,EAAE;wBAClB,uCAAuC;wBACvC,QAAQ,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;wBAClC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;qBAC1E;yBAAM;wBACH,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;qBAC5C;oBAED,MAAM,SAAS,GAAQ,IAAI,6BAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;oBACnE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,EAAE;wBACtD,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBACnD;yBAAM;wBACH,YAAY,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBACtD;iBACJ;gBAED,8CAA8C;gBAC9C,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC;aACf;YACD,OAAM,KAAK,EAAE;gBACT,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;aAC1D;SACJ;QACD,OAAM,KAAK,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACzC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CAAA;AAED;;;;;GAKG;AACH,SAAe,oBAAoB,CAAC,YAA0B,EAAE,aAAa;;QAEzE,IAAI;YACA,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;YACxE,IAAG,CAAC,SAAS,EAAE;gBACX,OAAO,KAAK,CAAC;aAChB;YAED,IAAI;gBACA,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAC;gBAClE,SAAS,CAAC,SAAS,GAAG,uBAAuB,EAAE,aAAa,CAAC,CAAC;gBAC9D,MAAM,QAAQ,GAAG,MAAM,sBAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;gBACzD,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5D,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAEpB,IAAI;oBACA,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBACtE,SAAS,CAAC,SAAS,GAAG,aAAa,EAAE,aAAa,CAAC,CAAC;oBACpD,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,aAAa,EAAE,MAAM,CAAC,CAAC;oBAClE,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,QAAQ,CAAC,CAAC;oBACpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBACrB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC3F,OAAO,IAAI,CAAC;iBACf;gBACD,OAAM,KAAK,EAAE;oBACT,KAAK,CAAC,QAAQ,GAAG,SAAS,GAAG,aAAa,CAAC;oBAC3C,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;iBAC3D;aACJ;YACD,OAAM,KAAK,EAAE;gBACT,KAAK,CAAC,QAAQ,GAAG,SAAS,GAAG,uBAAuB,CAAC;gBACrD,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;aAC7D;SACJ;QACD,OAAM,KAAK,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACzC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CAAA;AAED,UAAU,CAAC,MAAM,EAAE,CAAC"}
\ No newline at end of file
diff --git a/server/src/server.ts b/server/src/server.ts
index e42200e..3dea773 100755
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -122,7 +122,7 @@ function getRange(error: any) {
 
 /**
  * Converts an error (exception) to a VSCode Diagnostic and
- * pushes it onto the global diagnosticMap
+ * pushes it onto the diagnosticMap
  * @param textDocument the text document associated (the doc that has been modified)
  * @param error the exception
  * @param type the type of the exception
@@ -184,6 +184,14 @@ function pushError(textDocument: TextDocument, error : any, type : string, diagn
     diagnosticMap[fileName].add(diagnostic);
 }
 
+/**
+ * Declares that a file has no errors in the diagnostic map.
+ * We need to call this on all files that DO NOT have errors
+ * to ensure that error markers are removed.
+ * 
+ * @param fileName the uri of the file
+ * @param diagnosticMap the diagnostic map
+ */
 function validFile(fileName, diagnosticMap) {
     diagnosticMap[fileName] = new Set();
 }
@@ -236,27 +244,20 @@ async function validateTextDocument(textDocument: TextDocument): Promise<void> {
         connection.console.log(`*** Document modified: ${textDocument.uri}`);
 
         /**
-         * A cache of TemplateLogic instances. The keys are
-         * the root folder names. The values are the TemplateLogic instances.
-         * Note that we will leak instances if people rename the root folders...
+         * A cache of TemplateLogic instances. The keys are the root folder names.
          */
         const templateCache = {};
 
         /**
          * Map of diagnostics, with the key being the document URI
-         * and the value being the array of Diagnostic instances
+         * and the value being a Set of Diagnostic instances
          */
         const diagnosticMap = {
         }
 
         const pathStr = path.resolve(fileUriToPath(textDocument.uri));
         const fileExtension = path.extname(pathStr);
-    
-        // clear the diagnosticMap
-        Object.keys(diagnosticMap).forEach(function(key) {
-            diagnosticMap[key] = [];
-        });
-    
+        
         // this will assemble all the models into a ModelManager
         // and validate - so it needs to always run before we do anything else
         const modelValid = await validateModels(textDocument, diagnosticMap, templateCache);
@@ -270,7 +271,7 @@ async function validateTextDocument(textDocument: TextDocument): Promise<void> {
     
                         // if ergo is valid we proceed to check the template
                         if(ergoValid) {
-                            // await validateTemplateFile(textDocument, diagnosticMap);
+                            await validateTemplateFile(textDocument, diagnosticMap);
                         }
                     break;
                 case '.ergo':
@@ -279,7 +280,7 @@ async function validateTextDocument(textDocument: TextDocument): Promise<void> {
                     break;
                 case '.tem':
                     // if a template file has changed, we check we can build the template
-                    // await validateTemplateFile(textDocument);
+                    await validateTemplateFile(textDocument, diagnosticMap);
                     break;
             }    
         }
@@ -438,7 +439,7 @@ async function validateTemplateFile(textDocument: TextDocument, diagnosticMap):
             
             try {
                 connection.console.log(`Built template: ${template.getIdentifier()}`);
-                validFile(parentDir + '/grammar/sample.txt', diagnosticMap);
+                validFile(parentDir + '/sample.txt', diagnosticMap);
                 const sample = fs.readFileSync(parentDir + '/sample.txt', 'utf8');
                 const clause = new Clause(template);
                 clause.parse(sample);