diff --git a/_authors/dean.md b/_authors/dean.md
new file mode 100644
index 0000000..9c816a2
--- /dev/null
+++ b/_authors/dean.md
@@ -0,0 +1,7 @@
+---
+short_name: dean
+name: Dean Eigenmann
+position: Protocol Researcher
+twitter: DeanEigenmann
+website: https://dean.eigenmann.me
+---
\ No newline at end of file
diff --git a/_authors/oskarth.md b/_authors/oskarth.md
new file mode 100644
index 0000000..1a9d9cf
--- /dev/null
+++ b/_authors/oskarth.md
@@ -0,0 +1,6 @@
+---
+short_name: oskarth
+name: Oskar Thoren
+position: Protocol Researcher
+twitter: oskarth
+---
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 5914393..f0439d2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,8 +18,18 @@ sass:
   sass_dir: _sass
   style: compressed
 
+collections:
+  authors:
+    output: true
+
 defaults:
   - scope:
       path: "assets/img"
     values:
       image: true
+  - scope:
+      path: ""
+      type: "authors"
+    values:
+      layout: "author"
+
diff --git a/_layouts/author.html b/_layouts/author.html
new file mode 100644
index 0000000..73520f5
--- /dev/null
+++ b/_layouts/author.html
@@ -0,0 +1,26 @@
+---
+layout: default
+---
+<h1></h1>
+<div class="container post-content">
+    <div class="row">
+        <div class="col-lg-10 ml-auto mr-auto">
+            <h1>{{ page.name }}</h1>
+            <div class="meta">
+                <a href="https://twitter.com/{{ page.twitter }}">Twitter</a>
+                {% if page.website %}
+                • <a href="{{ page.website }}">Website</a>
+                {% endif %}
+            </div>
+            <div class="row">
+                {% assign filtered_posts = site.posts | where: 'author', page.short_name %}
+                {% for post in filtered_posts %}
+                <div class="col-md-12 mt-60">
+                    <time>{{ post.date | date: '%B %d, %Y' }}</time>
+                    <h3><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h3>
+                </div>
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index 50711da..ba15567 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -6,7 +6,7 @@ layout: default
     <div class="row">
         <div class="col-lg-10 ml-auto mr-auto">
             <h1>{{page.title}}</h1>
-            <div class="meta">{{ page.date | date_to_string }} • <a href="https://twitter.com/{{ page.author }}">{{ page.author }}</a></div>
+            <div class="meta">{{ page.date | date_to_string }} • <a href="/authors/{{ page.author }}">{{ page.author }}</a></div>
             <div class="editor-content">
                 {{ content }}
 
diff --git a/_posts/2020-02-7-dns-based-discovery.md b/_posts/2020-02-7-dns-based-discovery.md
index 74d6af1..0769a19 100644
--- a/_posts/2020-02-7-dns-based-discovery.md
+++ b/_posts/2020-02-7-dns-based-discovery.md
@@ -3,7 +3,7 @@ layout: post
 name:  "DNS Based Discovery"
 title:  "DNS Based Discovery"
 date:   2020-02-7 12:00:00 +0100
-author: DeanEigenmann
+author: dean
 published: true
 permalink: /dns-based-discovery
 categories: research