diff --git a/gatsby-node.js b/gatsby-node.js
index e8fdcea9..568b68d6 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -13,8 +13,8 @@ const html = require('remark-html')
 const { paginate } = require('gatsby-awesome-pagination')
 
 const { postsPerPage } = require('./src/constants/blog.ts')
-const MemberTemplate = path.resolve(`./src/templates/Member.tsx`)
-const AlumnusTemplate = path.resolve(`./src/templates/Alumnus.tsx`)
+const MemberTemplate = path.resolve(`./src/templates/members/Member.tsx`)
+const AlumnusTemplate = path.resolve(`./src/templates/members/Alumnus.tsx`)
 const ProductTemplate = path.resolve(`src/templates/Product.tsx`)
 const TagTemplate = path.resolve(`./src/templates/Tag.tsx`)
 const BlogPostTemplate = path.resolve(`./src/templates/BlogPost.tsx`)
@@ -109,7 +109,8 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
   // Retrieve ID's of all team members
   const {
     data: {
-      allMembersJson: { edges },
+      allMembersJson: { edges: memberEdges },
+      allAlumniJson: { edges: alumniEdges },
     },
   } = await graphql(`
     query {
@@ -118,44 +119,26 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
           node {
             id
             pennkey
+            alumnus
           }
         }
       }
-    }
-  `)
-  await edges.map(({ node: { id, pennkey } }) =>
-    createPage({
-      path: `/team/${pennkey}`,
-      component: MemberTemplate,
-      context: {
-        // Data passed to context is available in page queries as GraphQL vars
-        id,
-        pennkey,
-      },
-    }),
-  )
-
-  // Retrieve ID's of all alumni
-  const {
-    data: {
-      allAlumniJson: { edges: alumniEdges },
-    },
-  } = await graphql(`
-    query {
       allAlumniJson {
         edges {
           node {
             id
             pennkey
+            alumnus
           }
         }
       }
     }
   `)
-  await alumniEdges.map(({ node: { id, pennkey } }) =>
+  edges = memberEdges.concat(alumniEdges)
+  await edges.map(({ node: { id, pennkey, alumnus } }) =>
     createPage({
-      path: `/alumni/${pennkey}`,
-      component: AlumnusTemplate,
+      path: alumnus ? `/alumni/${pennkey}` : `/team/${pennkey}`,
+      component: alumnus ? AlumnusTemplate : MemberTemplate,
       context: {
         // Data passed to context is available in page queries as GraphQL vars
         id,
@@ -164,7 +147,6 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
     }),
   )
 
-
   /**
    * Create pages for products
    */
diff --git a/src/templates/Member.tsx b/src/templates/Member.tsx
deleted file mode 100644
index 3d236c91..00000000
--- a/src/templates/Member.tsx
+++ /dev/null
@@ -1,318 +0,0 @@
-import { graphql } from 'gatsby'
-import BackgroundImage from 'gatsby-background-image'
-import React from 'react'
-import { useState } from 'react'
-import styled from 'styled-components'
-import remark from 'remark'
-import html from 'remark-html'
-
-import Posts from '../components/Blog/Posts'
-import Layout from '../components/Layout'
-import SEO from '../components/SEO'
-import { DARK_GRAY } from '../constants/colors'
-import {
-  BORDER_RADIUS,
-  DESKTOP,
-  M1,
-  M2,
-  M3,
-  M4,
-  maxWidth,
-  minWidth,
-  PHONE,
-} from '../constants/measurements'
-import {
-  BookOpenIcon,
-  CalendarIcon,
-  Card,
-  Col,
-  Fade,
-  GitHubIcon,
-  H1,
-  H3,
-  HomeIcon,
-  HR,
-  LinkedInIcon,
-  LinkIcon,
-  LogOutIcon,
-  MediumContainer,
-  P,
-  Row,
-  Tags,
-} from '../shared'
-import { IGhostPost, IMember, Subset } from '../types'
-import { semesterToString } from '../helpers'
-
-const markdownProcessor = remark().use(html)
-
-type ILinks = Subset<
-  IMember,
-  {
-    github?: string
-    linkedin?: string
-    website?: string
-  }
->
-
-const LinksTag = styled.div<{}>`
-  a {
-    color: ${DARK_GRAY} !important;
-    opacity: 0.5;
-    margin-right: ${M2};
-    transform: scale(0.8);
-
-    svg {
-      stroke-width: 1.8px;
-    }
-
-    :hover,
-    :focus,
-    :active {
-      opacity: 0.75;
-    }
-  }
-`
-
-const StyledCard = styled(Card) <{}>`
-  padding: ${M4};
-  margin-top: ${M2};
-
-  ${minWidth(DESKTOP)} {
-    margin-top: 7.5vh;
-  }
-
-  ${maxWidth(PHONE)} {
-    padding: ${M2};
-  }
-`
-
-const Links = ({ github, linkedin, website }: ILinks) => (
-  <LinksTag>
-    {github && (
-      <a href={github} target="_BLANK">
-        <GitHubIcon />
-      </a>
-    )}
-    {linkedin && (
-      <a href={linkedin} target="_BLANK">
-        <LinkedInIcon />
-      </a>
-    )}
-    {website && (
-      <a href={website} target="_BLANK">
-        <LinkIcon />
-      </a>
-    )}
-  </LinksTag>
-)
-
-const ProfilePictureWrapper = styled.div`
-  border-radius: ${BORDER_RADIUS};
-  overflow: hidden;
-  margin-right: ${M2};
-  margin-bottom: 0;
-
-  ${maxWidth(DESKTOP)} {
-    margin-bottom: ${M3};
-  }
-
-  ${maxWidth(PHONE)} {
-    margin-right: 0;
-  }
-
-  ${minWidth(DESKTOP)} {
-    margin-right: ${M4};
-  }
-`
-
-const ProfilePicture = styled(BackgroundImage)`
-  height: 10.4rem;
-  width: 10.4rem;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: cover;
-  margin-bottom: 0;
-
-  ${maxWidth(PHONE)} {
-    width: 100%;
-    height: auto;
-    padding-top: 100%;
-  }
-`
-
-interface IMemberTemplateProps {
-  data: {
-    membersJson: IMember,
-  }
-}
-
-const Detail = ({ text, Icon }) => {
-  if (!text) return null
-  return (
-    <Col sm={12} margin={M1}>
-      <Icon
-        style={{
-          transform: 'scale(0.8)',
-          position: 'absolute',
-          color: DARK_GRAY,
-          opacity: 0.8,
-          marginTop: '-2px',
-        }}
-      />
-      <P sm style={{ marginLeft: M4 }} mb2>
-        {text}
-      </P>
-    </Col>
-  )
-}
-
-const Studies = ({ major, school }: { major?: string; school?: string }) => {
-  const getStudiesText = (): string | null => {
-    if (!major && !school) return null
-    if (!major) return `Studies in ${school}`
-    if (!school) return `Studies ${major}`
-    return `Studies ${major} in ${school}`
-  }
-
-  return <Detail text={getStudiesText()} Icon={BookOpenIcon} />
-}
-
-const MemberTemplate = ({ data }: IMemberTemplateProps) => {
-  const {
-    membersJson: {
-      bio,
-      github,
-      graduation_year: gradYear,
-      linkedin,
-      hometown: location,
-      photo,
-      localImage,
-      roles,
-      name,
-      major,
-      school,
-      team,
-      website,
-      semester_joined: semesterJoined,
-      alumnus,
-      posts,
-    }
-  } = data
-
-  // Bios may contain markdown. Make sure to parse these into HTML!
-  const [bioAsHtml, updateBioAsHtml] = useState(bio)
-  markdownProcessor
-    .process(bio || '')
-    .then(({ contents: b }) => updateBioAsHtml(b as any))
-
-  return (
-    <Layout>
-      <SEO title={name} description={bio} image={photo} />
-      <MediumContainer>
-        <Fade distance={M1}>
-          <StyledCard shaded>
-            <Row>
-              {localImage?.childImageSharp.fluid && (
-                <ProfilePictureWrapper>
-                  <ProfilePicture fluid={localImage.childImageSharp.fluid} />
-                </ProfilePictureWrapper>
-              )}
-              <Col flex>
-                <div style={{ width: '100%', alignSelf: 'center' }}>
-                  <H1 mb2>{name}</H1>
-                  <div style={{ marginBottom: M1 }}>
-                    <Tags tags={roles} />
-                  </div>
-                  <P mb2>Part of {team}</P>
-                  <Links
-                    github={github}
-                    linkedin={linkedin}
-                    website={website}
-                  />
-                </div>
-              </Col>
-            </Row>
-          </StyledCard>
-        </Fade>
-
-        {bio && (
-          <Fade distance={M1} delay={450}>
-            <div dangerouslySetInnerHTML={{ __html: bioAsHtml ?? "" }} />
-          </Fade>
-        )}
-
-        <Fade>
-          <HR />
-        </Fade>
-
-        <Fade delay={500} distance={M1}>
-          <Row margin={M1}>
-            <Studies major={major} school={school} />
-            {location && <Detail text={`From ${location}`} Icon={HomeIcon} />}
-            {semesterJoined && (
-              <Detail
-                text={`Member since ${semesterToString(semesterJoined)}`}
-                Icon={CalendarIcon}
-              />
-            )}
-            {gradYear && (
-              <Detail text={`${parseInt(gradYear) < new Date().getFullYear() ? "Graduated" : "Graduates"} in ${gradYear}`} Icon={LogOutIcon} />
-            )}
-          </Row>
-        </Fade>
-        {posts && posts.length > 0 ? (
-          <>
-            <Fade>
-              <HR />
-            </Fade>
-            <Fade>
-              <H3>Posts</H3>
-            </Fade>
-            <Row margin={M1}>
-              <Posts posts={posts.filter(p => !p.frontmatter.draft)} />
-            </Row>
-          </>
-        ) : null}
-      </MediumContainer>
-    </Layout>
-  )
-}
-
-export const pageQuery = graphql`
-  query($pennkey: String!) {
-    membersJson(pennkey: { eq: $pennkey }) {
-      bio
-      github
-      graduation_year
-      linkedin
-      hometown
-      photo
-      roles
-      name
-      major
-      school
-      team
-      website
-      semester_joined
-      alumnus
-      posts {
-        excerpt
-        frontmatter {
-          title
-          slug
-          customExcerpt
-          draft
-          coverPhoto {
-            childImageSharp {
-              fluid(maxWidth: 484) {
-                ...GatsbyImageSharpFluid
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`
-
-export default MemberTemplate
diff --git a/src/templates/members/Alumnus.tsx b/src/templates/members/Alumnus.tsx
new file mode 100644
index 00000000..0878655c
--- /dev/null
+++ b/src/templates/members/Alumnus.tsx
@@ -0,0 +1,29 @@
+import { graphql } from 'gatsby'
+import { GenericMemberTemplate, IAlumniTemplateProps } from './utils'
+
+const AlumniTemplate = ({ data }: IAlumniTemplateProps) => {
+  return GenericMemberTemplate({ data })
+}
+
+export const pageQuery = graphql`
+  query($pennkey: String!) {
+    alumniJson(pennkey: { eq: $pennkey }) {
+      bio
+      github
+      graduation_year
+      linkedin
+      hometown
+      photo
+      roles
+      name
+      major
+      school
+      team
+      website
+      semester_joined
+      alumnus
+    }
+  }
+`
+
+export default AlumniTemplate
diff --git a/src/templates/members/Member.tsx b/src/templates/members/Member.tsx
new file mode 100644
index 00000000..0ae2a072
--- /dev/null
+++ b/src/templates/members/Member.tsx
@@ -0,0 +1,45 @@
+import { graphql } from 'gatsby'
+import { GenericMemberTemplate, IMemberTemplateProps } from './utils'
+
+const MemberTemplate = ({ data }: IMemberTemplateProps) => {
+  return GenericMemberTemplate({ data })
+}
+
+export const pageQuery = graphql`
+  query($pennkey: String!) {
+    membersJson(pennkey: { eq: $pennkey }) {
+      bio
+      github
+      graduation_year
+      linkedin
+      hometown
+      photo
+      roles
+      name
+      major
+      school
+      team
+      website
+      semester_joined
+      alumnus
+      posts {
+        excerpt
+        frontmatter {
+          title
+          slug
+          customExcerpt
+          draft
+          coverPhoto {
+            childImageSharp {
+              fluid(maxWidth: 484) {
+                ...GatsbyImageSharpFluid
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`
+
+export default MemberTemplate
diff --git a/src/templates/Alumnus.tsx b/src/templates/members/utils.tsx
similarity index 82%
rename from src/templates/Alumnus.tsx
rename to src/templates/members/utils.tsx
index 3396ec4a..3cd343f3 100644
--- a/src/templates/Alumnus.tsx
+++ b/src/templates/members/utils.tsx
@@ -6,10 +6,10 @@ import styled from 'styled-components'
 import remark from 'remark'
 import html from 'remark-html'
 
-import Posts from '../components/Blog/Posts'
-import Layout from '../components/Layout'
-import SEO from '../components/SEO'
-import { DARK_GRAY } from '../constants/colors'
+import Posts from '../../components/Blog/Posts'
+import Layout from '../../components/Layout'
+import SEO from '../../components/SEO'
+import { DARK_GRAY } from '../../constants/colors'
 import {
   BORDER_RADIUS,
   DESKTOP,
@@ -20,7 +20,7 @@ import {
   maxWidth,
   minWidth,
   PHONE,
-} from '../constants/measurements'
+} from '../../constants/measurements'
 import {
   BookOpenIcon,
   CalendarIcon,
@@ -39,9 +39,9 @@ import {
   P,
   Row,
   Tags,
-} from '../shared'
-import { IGhostPost, IMember, Subset } from '../types'
-import { semesterToString } from '../helpers'
+} from '../../shared'
+import { IGhostPost, IMember, Subset } from '../../types'
+import { semesterToString } from '../../helpers'
 
 const markdownProcessor = remark().use(html)
 
@@ -140,12 +140,6 @@ const ProfilePicture = styled(BackgroundImage)`
   }
 `
 
-interface IMemberTemplateProps {
-  data: {
-    alumniJson: IMember,
-  }
-}
-
 const Detail = ({ text, Icon }) => {
   if (!text) return null
   return (
@@ -177,9 +171,27 @@ const Studies = ({ major, school }: { major?: string; school?: string }) => {
   return <Detail text={getStudiesText()} Icon={BookOpenIcon} />
 }
 
-const MemberTemplate = ({ data }: IMemberTemplateProps) => {
-  const {
-    alumniJson: {
+
+export interface IMemberTemplateProps {
+  data: {
+    membersJson: IMember,
+  }
+}
+
+export interface IAlumniTemplateProps {
+  data: {
+    alumniJson: IMember,
+  }
+}
+
+export type IGenericMemberTemplateProps = IMemberTemplateProps | IAlumniTemplateProps
+
+export const GenericMemberTemplate = ({ data }: IGenericMemberTemplateProps) => {
+  // if data is alumniJson, then we are rendering an alumni page
+  const isAlumni = 'alumniJson' in data
+
+  const
+    {
       bio,
       github,
       graduation_year: gradYear,
@@ -196,8 +208,7 @@ const MemberTemplate = ({ data }: IMemberTemplateProps) => {
       semester_joined: semesterJoined,
       alumnus,
       posts,
-    }
-  } = data
+    } = isAlumni ? data.alumniJson : data.membersJson
 
   // Bios may contain markdown. Make sure to parse these into HTML!
   const [bioAsHtml, updateBioAsHtml] = useState(bio)
@@ -237,7 +248,7 @@ const MemberTemplate = ({ data }: IMemberTemplateProps) => {
 
         {bio && (
           <Fade distance={M1} delay={450}>
-            <div dangerouslySetInnerHTML={{ __html: bioAsHtml ?? "" }} />
+            <div dangerouslySetInnerHTML={{ __html: bioAsHtml ?? '' }} />
           </Fade>
         )}
 
@@ -256,7 +267,13 @@ const MemberTemplate = ({ data }: IMemberTemplateProps) => {
               />
             )}
             {gradYear && (
-              <Detail text={`${parseInt(gradYear) < new Date().getFullYear() ? "Graduated" : "Graduates"} in ${gradYear}`} Icon={LogOutIcon} />
+              <Detail
+                text={`${parseInt(gradYear) < new Date().getFullYear()
+                  ? 'Graduated'
+                  : 'Graduates'
+                  } in ${gradYear}`}
+                Icon={LogOutIcon}
+              />
             )}
           </Row>
         </Fade>
@@ -269,7 +286,7 @@ const MemberTemplate = ({ data }: IMemberTemplateProps) => {
               <H3>Posts</H3>
             </Fade>
             <Row margin={M1}>
-              <Posts posts={posts.filter(p => !p.frontmatter.draft)} />
+              <Posts posts={posts.filter((p) => !p.frontmatter.draft)} />
             </Row>
           </>
         ) : null}
@@ -277,26 +294,3 @@ const MemberTemplate = ({ data }: IMemberTemplateProps) => {
     </Layout>
   )
 }
-
-export const pageQuery = graphql`
-  query($pennkey: String!) {
-    alumniJson(pennkey: { eq: $pennkey }) {
-      bio
-      github
-      graduation_year
-      linkedin
-      hometown
-      photo
-      roles
-      name
-      major
-      school
-      team
-      website
-      semester_joined
-      alumnus
-    }
-  }
-`
-
-export default MemberTemplate