diff --git a/src/App.vue b/src/App.vue
index f300d4b..2f408f7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,12 +2,29 @@
   <div id="app">
     <div id="nav">
       <router-link to="/">Home</router-link> |
-      <router-link to="/about">About</router-link>
+      <router-link to="/about">About</router-link> |
+      <router-link to="/login" v-if="!authenticated">Log in</router-link>
+      <a href="#" v-if="authenticated" @click="$store.dispatch('signOut')">Log out</a>
     </div>
     <router-view/>
   </div>
 </template>
 
+<script>
+
+export default {
+  name: 'app',
+  computed: {
+    authenticated(){
+      return this.$store.getters.isAuthenticated;
+    }
+  },
+  mounted() {
+    // console.log(this.authenticated);
+  }
+}
+</script>
+
 <style lang="scss">
 #app {
   font-family: 'Avenir', Helvetica, Arial, sans-serif;
diff --git a/src/main.js b/src/main.js
index 0747747..865458b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,5 +28,12 @@ Vue.use(ui);
 new Vue({
   router,
   store,
-  render: h => h(App)
+  render: h => h(App),
+  created () {
+    window.firebase.auth().onAuthStateChanged((user) => {
+      if(user){
+        store.commit('user', user);
+      } 
+    });
+  }
 }).$mount('#app')
diff --git a/src/router.js b/src/router.js
index e81ba35..961e9bc 100644
--- a/src/router.js
+++ b/src/router.js
@@ -17,16 +17,17 @@ const router = new Router({
   mode: 'history',
   base: process.env.BASE_URL,
   routes: [
+    {
+      path: '/login',
+      name: 'login',
+      component: Login
+    },    
     {
       path: '/',
       name: 'home',
       component: Home
     },    
-    {
-      path: '/login',
-      name: 'login',
-      component: Login
-    },
+
     {
       path: '/about',
       name: 'about',
diff --git a/src/store.js b/src/store.js
index 6849ce2..c463472 100644
--- a/src/store.js
+++ b/src/store.js
@@ -5,10 +5,7 @@ import { firebase } from '@/plugins/firebase-init'
 
 Vue.use(Vuex)
 
-
-
-const store = new Vuex.Store({
-  state: {
+const defaultState = {
     user: {
       uid: null,
       displayName: null,
@@ -16,7 +13,10 @@ const store = new Vuex.Store({
       email: null,
       phoneNumber: null,
     }
-  },
+  };
+
+const store = new Vuex.Store({
+  state: defaultState,
   getters: {
     isAuthenticated: state => {
       return state.user.uid !== null;
@@ -35,14 +35,12 @@ const store = new Vuex.Store({
 
   },
   actions: {
-
+    signOut: async ( { dispatch, commit } ) => {
+      await firebase.auth().signOut();
+      commit('user', defaultState);
+      window.location.reload();
+    }
   }
 })
 
-/** May not need..? */
-firebase.auth().onAuthStateChanged(user => {
-  console.log('auth change', user)
-  store.commit('user', user);
-});
-
 export default store;