diff --git a/handin/handin.md b/handin/handin.md
index d6468ff..48b75d9 100644
--- a/handin/handin.md
+++ b/handin/handin.md
@@ -1,18 +1,19 @@
 ---
-course: dConc16
-handinnumber: 1
+course: Concurrency
+title: Threaded Prime Number Counting
 author_name: Christoffer Müller Madsen
 author_group: DA3
 author_id: 201506991
 
 # Settings
 # mainfont: Linux Libertine
+# mainfont: Iowan Old Style
 mainfont: Times New Roman
 altfont: Helvetica Neue
 monofont: Courier
 lang: english
 fontsize: 10pt
-geometry: a4paper, left=20mm, right=20mm, top=40mm, bottom=40mm
+geometry: a4paper, left=25mm, right=25mm, top=30mm, bottom=30mm
 parskip: 0.8em
 parindent: 0em
 secspacingdiff: 0em
@@ -22,61 +23,4 @@ columnsep: 0.8cm
 # customdate: YYYY-MM-DD
 ---
 
-# FIRST
-
-Dear Friend,
-
-I am a bombardier in the second mounted division of the Fourth Horse Artillery.
-
-You may well imagine how astonished I was by this revolution in my affairs, and what a violent upheaval it has made in my everyday humdrum existence. Nevertheless I have borne the change with determination and courage, and even derive a certain pleasure from this turn of fortune. Now that I have an opportunity of doing a little athletic training I am more than ever thankful to our Schopenhauer. For the first five weeks I had to be in the stables. At 5:30 in the morning I had to be among the horses, removing the manure and grooming the animals down with the currycomb and horse brush. For the present my work lasts on an average from 7 a.m. to 10 a.m. and from 11.30 a.m. to 6 p.m., the greater part of which I spend in parade drill. Four times a week we two soldiers who are to serve for a year have to attend a lecture given by a lieutenant, to prepare us for the reserve officers examination. You must know that in the horse artillery there is a tremendous amount to learn. We get most fun out of the riding lessons. My horse is a very fine animal, and I am supposed to have some talent for riding. When I and my steed gallop round the large parade ground, I feel very contented with my lot. On the whole, too, I am very well treated. Above all, we have a very nice captain.
-
-I have now told you all about my life as a soldier. This is the reason why I have kept you waiting so long for news and for an answer to your last letter. Meanwhile, if I am not mistaken, you will probably have been freed from your military fetters; that is why I thought it would be best to address this letter to Spandau.
-
-But my time is already up; a business letter to Volkmann and another to Ritschl have robbed me of much of it. So I must stop in order to get ready for the parade in full kit.
-
-Well, old man, forgive my long neglect, and hold the god of War responsible for most of it.
-
-Your devoted friend,
-
-# SECOND?
-
-lol
-
-# Third
-
-Dear Friend,
-
-I am a bombardier in the second mounted division of the Fourth Horse Artillery.
-
-You may well imagine how astonished I was by this revolution in my affairs, and what a violent upheaval it has made in my everyday humdrum existence. Nevertheless I have borne the change with determination and courage, and even derive a certain pleasure from this turn of fortune. Now that I have an opportunity of doing a little athletic training I am more than ever thankful to our Schopenhauer. For the first five weeks I had to be in the stables. At 5:30 in the morning I had to be among the horses, removing the manure and grooming the animals down with the currycomb and horse brush. For the present my work lasts on an average from 7 a.m. to 10 a.m. and from 11.30 a.m. to 6 p.m., the greater part of which I spend in parade drill. Four times a week we two soldiers who are to serve for a year have to attend a lecture given by a lieutenant, to prepare us for the reserve officers examination. You must know that in the horse artillery there is a tremendous amount to learn. We get most fun out of the riding lessons. My horse is a very fine animal, and I am supposed to have some talent for riding. When I and my steed gallop round the large parade ground, I feel very contented with my lot. On the whole, too, I am very well treated. Above all, we have a very nice captain.
-
-I have now told you all about my life as a soldier. This is the reason why I have kept you waiting so long for news and for an answer to your last letter. Meanwhile, if I am not mistaken, you will probably have been freed from your military fetters; that is why I thought it would be best to address this letter to Spandau.
-
-But my time is already up; a business letter to Volkmann and another to Ritschl have robbed me of much of it. So I must stop in order to get ready for the parade in full kit.
-
-Well, old man, forgive my long neglect, and hold the god of War responsible for most of it.
-
-Your devoted friend, 
-
-Dear Friend,
-
-I am a bombardier in the second mounted division of the Fourth Horse Artillery.
-
-You may well imagine how astonished I was by this revolution in my affairs, and what a violent upheaval it has made in my everyday humdrum existence. Nevertheless I have borne the change with determination and courage, and even derive a certain pleasure from this turn of fortune. Now that I have an opportunity of doing a little athletic training I am more than ever thankful to our Schopenhauer. For the first five weeks I had to be in the stables. At 5:30 in the morning I had to be among the horses, removing the manure and grooming the animals down with the currycomb and horse brush. For the present my work lasts on an average from 7 a.m. to 10 a.m. and from 11.30 a.m. to 6 p.m., the greater part of which I spend in parade drill. Four times a week we two soldiers who are to serve for a year have to attend a lecture given by a lieutenant, to prepare us for the reserve officers examination. You must know that in the horse artillery there is a tremendous amount to learn. We get most fun out of the riding lessons. My horse is a very fine animal, and I am supposed to have some talent for riding. When I and my steed gallop round the large parade ground, I feel very contented with my lot. On the whole, too, I am very well treated. Above all, we have a very nice captain.
-
-I have now told you all about my life as a soldier. This is the reason why I have kept you waiting so long for news and for an answer to your last letter. Meanwhile, if I am not mistaken, you will probably have been freed from your military fetters; that is why I thought it would be best to address this letter to Spandau.
-
-But my time is already up; a business letter to Volkmann and another to Ritschl have robbed me of much of it. So I must stop in order to get ready for the parade in full kit.
-
-Well, old man, forgive my long neglect, and hold the god of War responsible for most of it.
-
-Your devoted friend, 
-
-You may well imagine how astonished I was by this revolution in my affairs, and what a violent upheaval it has made in my everyday humdrum existence. Nevertheless I have borne the change with determination and courage, and even derive a certain pleasure from this turn of fortune. Now that I have an opportunity of doing a little athletic training I am more than ever thankful to our Schopenhauer. For the first five weeks I had to be in the stables. At 5:30 in the morning I had to be among the horses, removing the manure and grooming the animals down with the currycomb and horse brush. For the present my work lasts on an average from 7 a.m. to 10 a.m. and from 11.30 a.m. to 6 p.m., the greater part of which I spend in parade drill. Four times a week we two soldiers who are to serve for a year have to attend a lecture given by a lieutenant, to prepare us for the reserve officers examination. You must know that in the horse artillery there is a tremendous amount to learn. We get most fun out of the riding lessons. My horse is a very fine animal, and I am supposed to have some talent for riding. When I and my steed gallop round the large parade ground, I feel very contented with my lot. On the whole, too, I am very well treated. Above all, we have a very nice captain.
-
-I have now told you all about my life as a soldier. This is the reason why I have kept you waiting so long for news and for an answer to your last letter. Meanwhile, if I am not mistaken, you will probably have been freed from your military fetters; that is why I thought it would be best to address this letter to Spandau.
-
-You may well imagine how astonished I was by this revolution in my affairs, and what a violent upheaval it has made in my everyday humdrum existence. Nevertheless I have borne the change with determination and courage, and even derive a certain pleasure from this turn of fortune. Now that I have an opportunity of doing a little athletic training I am more than ever thankful to our Schopenhauer. For the first five weeks I had to be in the stables. At 5:30 in the morning I had to be among the horses, removing the manure and grooming the animals down with the currycomb and horse brush. For the present my work lasts on an average from 7 a.m. to 10 a.m. and from 11.30 a.m. to 6 p.m., the greater part of which I spend in parade drill. Four times a week we two soldiers who are to serve for a year have to attend a lecture given by a lieutenant, to prepare us for the reserve officers examination. You must know that in the horse artillery there is a tremendous amount to learn. We get most fun out of the riding lessons. My horse is a very fine animal, and I am supposed to have some talent for riding. When I and my steed gallop round the large parade ground, I feel very contented with my lot. On the whole, too, I am very well treated. Above all, we have a very nice captain.
-
-I have now told you all about my life as a soldier. This is the reason why I have kept you waiting so long for news and for an answer to your last letter. Meanwhile, if I am not mistaken, you will probably have been freed from your military fetters; that is why I thought it would be best to address this letter to Spandau.
-whateven
\ No newline at end of file
+Text goes here
\ No newline at end of file
diff --git a/handin/template.tex b/handin/template.tex
index fc3eec8..e10a67f 100644
--- a/handin/template.tex
+++ b/handin/template.tex
@@ -1,9 +1,23 @@
 %!TEX TS-program = xelatex
 %!TEX encoding = UTF-8 Unicode
 
-\documentclass[$fontsize$, a4paper]{article}
+%\documentclass[$fontsize$, a4paper]{article}
+\documentclass[$fontsize$, a4paper, headings=small, markcase=upper]{scrartcl}
 \usepackage{fontspec}
 
+% KOMASCRIPT
+%--------------------------------
+\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
+\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
+\makeatletter
+
 % LAYOUT
 %--------------------------------
 \usepackage{geometry}
@@ -13,6 +27,37 @@
 \usepackage{enumitem}
 \setlist{nolistsep}
 
+% Spacing after section headers
+\RedeclareSectionCommand[
+  beforeskip=-\baselineskip,
+  afterskip=.1\baselineskip]{section}
+\RedeclareSectionCommand[
+  beforeskip=-.75\baselineskip,
+  afterskip=.1\baselineskip]{subsection}
+\RedeclareSectionCommand[
+  beforeskip=-.5\baselineskip,
+  afterskip=.1\baselineskip]{subsubsection}
+\RedeclareSectionCommand[
+  beforeskip=.5\baselineskip,
+  afterskip=-1em]{paragraph}
+\RedeclareSectionCommand[
+  beforeskip=-.5\baselineskip,
+  afterskip=-1em]{subparagraph}
+
+% Multi-column support
+$if(multicol)$
+\usepackage{multicol}
+\setlength{\columnsep}{$columnsep$}
+$endif$
+
+% Header and footer
+\usepackage[headsepline,automark]{scrlayer-scrpage}
+\pagestyle{scrheadings}
+\ihead{$course$ - $title$}
+\ohead[]{\headmark}
+\chead{}
+%\renewcommand*{\titlepagestyle}{scrheadings}
+
 % LANGUAGE
 %--------------------------------
 $if(lang)$
@@ -39,6 +84,11 @@ $endif$
 % Custom ampersand
 \newcommand{\amper}{{\fontspec[Scale=.95]{$mainfont$}\selectfont\itshape\&}}
 
+% Upper-case section headings
+\renewcommand\sectionlinesformat[4]{%
+  \@hangfrom{\hskip#2 #3}{\MakeUppercase{#4}}%
+}
+
 $if(mainfont)$
     \setmainfont{$mainfont$}
 $endif$
@@ -46,34 +96,10 @@ $if(altfont)$
     \setsansfont{$altfont$}
 $endif$
 
-% Spacing after section headers
-\usepackage{titlesec}
-\titlespacing{\section}{0pt}{\parskip}{$secspacingdiff$}
-
-% Multi-column support
-$if(multicol)$
-\usepackage{multicol}
-\setlength{\columnsep}{$columnsep$}
-$endif$
-
-% Header and footer
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-\lhead{$author_name$, $author_id$}
-
-% Move up title block
-\usepackage{titling}
-\setlength{\droptitle}{-6ex}
-
 % Command required by how Pandoc handles the list conversion
 \providecommand{\tightlist}{
   \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
 
-% Section headings
-% \addtokomafont{section}{\rmfamily\centering\scshape}
-\titlelabel{\thetitle.\enskip}
-
-
 % PDF SETUP
 %--------------------------------
 \usepackage[xetex, bookmarks, colorlinks, breaklinks]{hyperref}
@@ -81,7 +107,7 @@ $endif$
 {
   pdfauthor={$author$},
   pdfsubject={$course$},
-  pdftitle={$course$ - Handin $handinnumber$},
+  pdftitle={$course$ - $title$},
   colorlinks,breaklinks,
   filecolor=black,
   urlcolor=[rgb]{0.117,0.682,0.858},
@@ -100,12 +126,13 @@ $endif$
 %--------------------------------
 \begin{document}
 
-\title{$course$\\
-Hand-in $handinnumber$\vspace{-2ex}
-}
+\subject{\vspace{-6ex}$course$\vspace{-1.5ex}}
+\title{$title$\vspace{-1ex}}
 \author{$author_name$, $author_group$, $author_id$}
-\date{\vspace{-2ex}
+\date{\vspace{-1ex}
 \today}
+%\begin{spacing}{1}
+%\maketitle \end{spacing}
 \maketitle
 
 $if(multicol)$