diff --git a/doc/grammar.rst b/doc/grammar.rst
index bbf532e..1e99e0d 100644
--- a/doc/grammar.rst
+++ b/doc/grammar.rst
@@ -1,7 +1,7 @@
-CodePage -> CodeBlock | DocBlock | CodePage
+CodePage -> (CodeBlock | DocBlock)*
 
 // lookahead 2 needed here
-DocBlock -> DirectiveBlock | MarkdownBlock | DocBlock
+DocBlock -> (DirectiveBlock | MarkdownBlock)+
 
 DirectiveBlock ->
     <DOC_START> <DIRECTIVE_START> "author" RemainingLine EOL MarkdownBlock? |
@@ -15,11 +15,17 @@ MarkdownLine ->
     <DOC_START> NOT_DIRECTIVE_START RemainingLine <EOL>
 
 RemainingLine -> NOT_EOL*
+
+OrgString ->
+    (<ORG_ID> <SLASH>)* <ORG_ID> <SLASH>?
+
 Tokens
 ------
 
-DOC_START -> "%%"
-EOL       -> "\n"
-NOT_EOL   -> ~"\n"
-DIRECTIVE_START -> "@"
+DOC_START           -> "%% "
+EOL                 -> "\n"
+NOT_EOL             -> ~"\n"
+DIRECTIVE_START     -> "@"
 NOT_DIRECTIVE_START -> ~"@"
+SLASH               -> "/"
+ORG_ID              -> ~"[/\n]"
diff --git a/src/com/jdblabs/jlp/JLPPegParser.groovy b/src/com/jdblabs/jlp/JLPPegParser.groovy
new file mode 100644
index 0000000..1169f19
--- /dev/null
+++ b/src/com/jdblabs/jlp/JLPPegParser.groovy
@@ -0,0 +1,19 @@
+package com.jdblabs.jlp
+
+@BuildParseTree
+public class JLPPegParser extends BaseParser<Object> {
+
+    Rule CodePage() {
+        return ZeroOrMore(FirstOf(
+            DocBlock(),
+            CodeBlock())) }
+
+    Rule DocBlock() {
+        return OneOrMore(FirstOf(
+            DirectiveBlock(),
+            MarkdownBlock())) }
+
+    Rule DirectiveBlock() {
+        return FirstOf(
+            Sequence("%% "
+}