diff --git a/IncludeFilter.hs b/IncludeFilter.hs
new file mode 100644
index 0000000..6aa3387
--- /dev/null
+++ b/IncludeFilter.hs
@@ -0,0 +1,97 @@
+#!/usr/bin/env runhaskell
+
+{-
+The MIT License (MIT)
+
+Copyright (c) 2015 Dániel Stein <daniel@stein.hu>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-}
+
+{-|
+A Pandoc filter that replaces include labeled Code Blocks with the contents of
+the referenced files. Even nested, recursive includes.
+
+Based on the scripting tutorial for Pandoc:
+http://pandoc.org/scripting.html#include-files
+
+The Code Blocks like the following will include every file in a new line. The
+reference paths should be either absolute or relative to the folder where the
+pandoc command will be executed.
+
+> ```include
+> /absolute/file/path.md
+> relative/to/the/command/root.md
+> #do/not/include/this.md
+> ```
+
+If the file does not exist, it will be skipped completely. No warnings, no
+residue, nothing. Putting an # as the first character in the line will make the
+filter skip that file.
+
+For now the nested includes only work for two levels, after that the source
+will be inserted and not parsed.
+
+Note: the metadata from the included source files are discarded.
+
+-}
+
+import           Control.Monad
+import           Data.List
+import           System.Directory
+
+import           Text.Pandoc
+import           Text.Pandoc.Error
+import           Text.Pandoc.JSON
+
+stripPandoc :: Either PandocError Pandoc -> [Block]
+stripPandoc p =
+  case p of
+    Left _ -> [Null]
+    Right (Pandoc _ blocks) -> blocks
+
+ioReadMarkdown :: String -> IO(Either PandocError Pandoc)
+ioReadMarkdown content = return $! readMarkdown def content
+
+getContent :: String -> IO [Block]
+getContent file = do
+  c <- readFile file
+  p <- ioReadMarkdown c
+  return $! stripPandoc p
+
+getProcessableFileList :: String -> IO [String]
+getProcessableFileList list = do
+  let f = lines list
+  let files = filter (\x -> not $ "#" `isPrefixOf` x) f
+  filterM doesFileExist files
+
+processFiles :: [String] -> IO [Block]
+processFiles toProcess =
+  fmap concat (mapM getContent toProcess)
+
+doInclude :: Block -> IO [Block]
+doInclude (CodeBlock (_, classes, _) list)
+  | "include" `elem` classes = do
+    let toProcess = getProcessableFileList list
+    processFiles =<< toProcess
+doInclude x = return [x]
+
+main :: IO ()
+main = toJSONFilter doInclude
diff --git a/build.sh b/build.sh
index 789eccd..c307faa 100755
--- a/build.sh
+++ b/build.sh
@@ -3,10 +3,7 @@
 pandoc Supporting/Originallity_Statement.md -o Supporting/OriginallityStatement.tex
 
 
-pandoc --template=Template/disso.latex --top-level-division=chapter --filter=pandoc-citeproc \
-       Frontpage.md \
-       EG-Intro.md \
-       Lorum.md \
-       References.md \
+./caps.py < layout.md | pandoc --template=Template/disso.latex --chapters \
+	--filter=pandoc-citeproc \
        -o Dissertation.pdf
 
diff --git a/include.py b/include.py
new file mode 100755
index 0000000..77c282c
--- /dev/null
+++ b/include.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import sys
+import re
+
+includereg = re.compile( r"(?s)(```include)(.*?)(```)" )
+filenamereg = re.compile( r"([\S]{1,})" )
+
+def includeblocks( instream ):
+    outstream = ""
+
+    prev = 0
+    for i in includereg.finditer( instream ):
+        outstream += instream[prev:i.start()]   
+
+        for f in filenamereg.finditer( i.group(2) ):
+            with open( f.group(1), "r" ) as file:
+                outstream += includeblocks( file.read() )
+
+        prev = i.end()
+
+    outstream += instream[prev:]
+
+    outstream += "\n\n"
+
+    return outstream
+
+
+if __name__ == "__main__":
+    print( includeblocks( sys.stdin.read() ), file=sys.stdout, end="" )