diff --git a/templates/base.html b/templates/base.html
index ba52e06..76aa293 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,18 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <title>{% block title %}{{ title }} - Witch Watch{% endblock %}</title>
-    {% block head %}{% endblock %}
-  </head>
-  <body>
-    <div id="header">
-      {% block header %}{% endblock %}
-    </div>
-    <div id="content">
-      {% block content %}{% endblock %}
-    </div>
-    <div id="footer">
-      {% block footer %}{% endblock %}
-    </div>
-  </body>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>{% block title %}{{ title }} - Witch Watch{% endblock %}</title>
+        {% block head %}{% endblock %}
+    </head>
+    <body>
+        <div id="header">
+            {% block header %}{% include "header_with_user.html" %}{% endblock %}
+        </div>
+        <div id="content">
+            {% block content %}{% endblock %}
+        </div>
+        <div id="footer">
+            {% block footer %}{% endblock %}
+        </div>
+    </body>
 </html>
diff --git a/templates/header_with_user.html b/templates/header_with_user.html
new file mode 100644
index 0000000..38b61dc
--- /dev/null
+++ b/templates/header_with_user.html
@@ -0,0 +1,20 @@
+{% match user %}
+{% when Some with (usr) %}
+
+<div class="header_logged_in">
+    Hello, {{ usr.username }}!
+</div>
+<div class="header_signout">
+    <input type="submit" value="sign out?">
+    </form>
+</div>
+
+{% else %}
+
+<div class="header_logged_out">
+    Heya, why don't you <a href="/login">log in</a> or <a href="/signup">sign up</a>?
+</div>
+
+{% endmatch %}
+
+<hr/>
diff --git a/templates/login_get.html b/templates/login_get.html
index ea7a1a7..40ee3e3 100644
--- a/templates/login_get.html
+++ b/templates/login_get.html
@@ -2,6 +2,8 @@
 
 {% block title %}Login to Witch Watch, Bish{% endblock %}
 
+{% block header %}{% endblock %}
+
 {% block content %}
 
 <p>
diff --git a/templates/logout_get.html b/templates/logout_get.html
index 4ed382a..d54ca87 100644
--- a/templates/logout_get.html
+++ b/templates/logout_get.html
@@ -2,6 +2,8 @@
 
 {% block title %}Logout of Witch Watch, Bish{% endblock %}
 
+{% block header %}{% endblock %}
+
 {% block content %}
 
 <p>
diff --git a/templates/logout_post.html b/templates/logout_post.html
index 69dffba..2e176bd 100644
--- a/templates/logout_post.html
+++ b/templates/logout_post.html
@@ -2,6 +2,8 @@
 
 {% block title %}Thanks for Signing Up for Witch Watch, Bish{% endblock %}
 
+{% block header %}{% endblock %}
+
 {% block content %}
 
 <h1>Goodbye</h1>
diff --git a/templates/signup.html b/templates/signup.html
index 61b5b44..e4aeb0f 100644
--- a/templates/signup.html
+++ b/templates/signup.html
@@ -2,6 +2,8 @@
 
 {% block title %}Sign Up for Witch Watch, Bish{% endblock %}
 
+{% block header %} {% endblock %}
+
 {% block content %}
 
 <p>
diff --git a/templates/signup_success.html b/templates/signup_success.html
index f8e9efc..6d6bd39 100644
--- a/templates/signup_success.html
+++ b/templates/signup_success.html
@@ -3,6 +3,7 @@
 {% block title %}Thanks for Signing Up for Witch Watch, Bish{% endblock %}
 
 {% block content %}
+{% block header %}{% endblock %}
 
 <h1>You did it!</h1>
 
