diff --git a/content/site/navigation.json b/content/site/navigation.json
index 8a376eb4b..b80df76b3 100644
--- a/content/site/navigation.json
+++ b/content/site/navigation.json
@@ -5,15 +5,21 @@
       "link": "/",
       "external": false
     },
-    {
-      "name": "Values",
-      "link": "/about",
-      "external": false
-    },
+    
     {
       "name": "Projects",
       "link": "/projects",
       "external": false
+    },
+    {
+      "name": "People",
+      "link": "/people",
+      "external": false
+    },
+    {
+      "name": "Values",
+      "link": "/about",
+      "external": false
     }
   ],
   "footerNavigation": [{
diff --git a/gridsome.config.js b/gridsome.config.js
index 59e049b5b..18b2ef133 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -96,7 +96,7 @@ module.exports = {
       path: '/blog/:id'
     }],
     Person: [{
-      path: '/author/:id',
+      path: '/people/:id',
       component: '~/templates/Person.vue'
     }],
     Tag: [{
diff --git a/gridsome.server.js b/gridsome.server.js
index a70dfad48..f14ef4f8d 100644
--- a/gridsome.server.js
+++ b/gridsome.server.js
@@ -38,6 +38,15 @@ module.exports = function (api) {
         ...options
       };
     }
+
+
+    if (options.internal.typeName === 'Person') {
+      options.countries = (typeof options.countries === 'string') ? options.countries.split(',').map(string => string.trim()) : options.countries;
+      options.cities = (typeof options.cities === 'string') ? options.cities.split(',').map(string => string.trim()) : options.cities;
+      return {
+        ...options
+      };
+    }
   })
 
     api.createPages(async ({
diff --git a/src/pages/People.vue b/src/pages/People.vue
new file mode 100644
index 000000000..a3b2c942d
--- /dev/null
+++ b/src/pages/People.vue
@@ -0,0 +1,54 @@
+<template>
+  <Layout>
+    <div class="container sm:pxi-0 mx-auto overflow-x-hidden">
+      <div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
+        <PostListItem v-for="edge in $page.entries.edges" :key="edge.node.id" :record="edge.node" />
+      </div>
+    </div>
+  </Layout>
+</template>
+
+<page-query>
+
+query($page:Int) {
+  entries: allPerson(perPage: 40, page: $page) @paginate {
+    totalCount
+    pageInfo {
+      totalPages
+      currentPage
+    }
+    edges {
+      node {
+        path
+        content
+        name
+        rank
+        memberships
+        bio
+        linkedin
+        websites
+        project_ids
+        countries
+        cities
+        image(width:800)
+        private
+      }
+    }
+  }
+}
+
+</page-query>
+
+<script>
+
+import PostListItem from '~/components/PostListItem.vue';
+
+export default {
+  metaInfo: {
+    title: "Hello, world!"
+  },
+  components: {
+    PostListItem
+  }
+};
+</script>
diff --git a/src/templates/Person.vue b/src/templates/Person.vue
index 26bc5d828..c913ad6ac 100644
--- a/src/templates/Person.vue
+++ b/src/templates/Person.vue
@@ -77,13 +77,20 @@
 <page-query>
   query($id: ID!, $page:Int) {
     person(id: $id) {
-      name
-      path
-      bio
-      image(width:150, height:150)
-      linkedin
-      content
-      belongsTo(perPage: 5, page: $page) @paginate {
+       path
+        content
+        name
+        rank
+        memberships
+        bio
+        linkedin
+        websites
+        project_ids
+        countries
+        cities
+        private
+        image(width:150, height:150)
+        belongsTo(perPage: 5, page: $page) @paginate {
         totalCount
         pageInfo {
           totalPages
diff --git a/src/templates/User.vue b/src/templates/User.vue
deleted file mode 100644
index b90afb273..000000000
--- a/src/templates/User.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <Layout :hideHeader="true" :disableScroll="true">
-    <div class="container sm:pxi-0 mx-auto overflow-x-hidden pt-24">
-      <div class="flex flex-row flex-wrap items-center mx-4 sm:mx-0">
-        <div class="w-full md:w-1/6 mx-auto sm:mx-0">
-          <g-image
-            :src="$page.user.image"
-            class="rounded-full bg-gray-200 w-32 h-32 border-4 border-gray-400 mx-auto md:mx-0"
-          ></g-image>
-        </div>
-        <div class="w-full md:w-5/6 text-center md:text-left md:pl-8 lg:pl-0">
-          <h1 class="pb-0 mb-0 mt-0 text-4xl font-medium">{{ $page.user.name }}</h1>
-          <p class="text-gray-700 text-xl" v-if="$page.user.bio">{{ $page.user.bio }}</p>
-          <div class="author-social">
-            {{ $page.user.belongsTo.totalCount }} Projects
-            &nbsp;&middot;&nbsp;
-            <!-- <a
-              :href="$page.user.facebook"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'facebook']" />
-            </a>
-            &nbsp;
-            <a
-              :href="$page.user.twitter"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'twitter']" />
-            </a>
-            &nbsp; -->
-            <a
-              :href="$page.user.linkedin"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'linkedin']" />
-            </a>
-          </div>
-        </div>
-      </div>
-
-      <div class="pt-8 border-b mx-4 sm:-mx-4"></div>
-
-        <section class="post-content container mx-auto relative font-serif text-gray-700">
-          <div class="post-content-text text-xl" v-html="$page.user.content"></div>
-        </section>
-
-
-      <div class="pt-8 border-b mx-4 sm:-mx-4"></div>
-
-      <div class="flex flex-wrap pt-8 pb-8 mx-4 sm:-mx-4">
-        <PostListItem
-          v-for="edge in $page.user.belongsTo.edges"
-          :key="edge.node.id"
-          :record="edge.node"
-        />
-      </div>
-
-      <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="$page.user.path"
-          :currentPage="$page.user.belongsTo.pageInfo.currentPage"
-          :totalPages="$page.user.belongsTo.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="$page.user.belongsTo.pageInfo.totalPages > 1"
-        />
-      </div>
-    </div>
-  </Layout>
-</template>
-
-<page-query>
-  query($id: ID!, $page:Int) {
-    user(id: $id) {
-      name
-      path
-      bio
-      image(width:150, height:150)
-      facebook
-      twitter
-      linkedin
-      content
-      belongsTo(perPage: 5, page: $page) @paginate {
-        totalCount
-        pageInfo {
-          totalPages
-          currentPage
-        }
-        edges {
-          node {
-            ... on Blog {
-              title
-              excerpt
-              image(width:800)
-              path
-              timeToRead
-              humanTime : created(format:"DD MMM YYYY")
-              datetime : created
-              user {
-                id
-                name
-                image(width:64, height:64, fit:inside)
-                path
-              }
-            }
-          }
-        }
-      }
-    }  
-  }
-</page-query>
-
-<script>
-import PostListItem from "~/components/PostListItem.vue";
-import Pagination from "~/components/Pagination.vue";
-
-export default {
-  components: {
-    Pagination,
-    PostListItem
-  },
-  computed: {
-    postLabel: function() {
-      var pluralize = require("pluralize");
-      return pluralize("post", this.$page.user.belongsTo.totalCount);
-    }
-  },
-  metaInfo() {
-    return {
-      title: this.$page.user.name
-    };
-  }
-};
-</script>