diff --git a/README.md b/README.md
index 1f05e26..aa5fd95 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/CodeForBaltimore/Healthcare-Rollcall.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Healthcare-Rollcall)
+[![Build Status](https://travis-ci.org/CodeForBaltimore/Healthcare-Rollcall.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Healthcare-Rollcall) [![Netlify Status](https://api.netlify.com/api/v1/badges/83fb49cb-61e1-4c21-8893-03e17e75d972/deploy-status)](https://app.netlify.com/sites/healthcare-rollcall/deploys)
 
 # Healthcare Rollcall
 
@@ -7,20 +7,20 @@ In the event of a disaster, Baltimore City and the Baltimore City Health Departm
 <!-- TOC -->
 
 - [Healthcare Rollcall](#healthcare-rollcall)
-    - [What is this?](#what-is-this)
-    - [Documentation](#documentation)
+  - [What is this?](#what-is-this)
+  - [Documentation](#documentation)
 - [Project setup](#project-setup)
-    - [Docker and docker-compose](#docker-and-docker-compose)
-        - [Full .env example](#full-env-example)
-        - [Keeping your API up to date](#keeping-your-api-up-to-date)
-    - [Compiles and hot-reloads for development](#compiles-and-hot-reloads-for-development)
-    - [Compiles and minifies for production](#compiles-and-minifies-for-production)
-    - [Lints and fixes files](#lints-and-fixes-files)
-    - [Customize configuration](#customize-configuration)
+  - [Docker and docker-compose](#docker-and-docker-compose)
+    - [Full .env example](#full-env-example)
+    - [Keeping your API up to date](#keeping-your-api-up-to-date)
+  - [Compiles and hot-reloads for development](#compiles-and-hot-reloads-for-development)
+  - [Compiles and minifies for production](#compiles-and-minifies-for-production)
+  - [Lints and fixes files](#lints-and-fixes-files)
+  - [Customize configuration](#customize-configuration)
 - [Using this product](#using-this-product)
-    - [Testing](#testing)
+  - [Testing](#testing)
 - [Sources and Links](#sources-and-links)
-    - [Contributors ✨](#contributors-)
+  - [Contributors ✨](#contributors-)
 
 <!-- /TOC -->
 
diff --git a/package-lock.json b/package-lock.json
index 05d4785..ba6a0e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11728,6 +11728,14 @@
       "resolved": "https://registry.npmjs.org/vue-cookies/-/vue-cookies-1.7.0.tgz",
       "integrity": "sha512-vuEUm6wYMMrFAHFCrkzIUAy8+MgPAbBGmYXnk2M6X6O2KHbMT1wuDD2izacmsSUp6ZM02e23MJRtPRobl88VMg=="
     },
+    "vue-country-region-select": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/vue-country-region-select/-/vue-country-region-select-2.0.14.tgz",
+      "integrity": "sha512-8iQMnwPbkWVmGcBkX++pCHBrQsS7cvgxcfP3xIZY74she7N2Pi0xIPd2p/Ba6zoxA9F7qiU1ZjxzK8xhi6/aKA==",
+      "requires": {
+        "vue": "^2.5.17"
+      }
+    },
     "vue-eslint-parser": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz",
diff --git a/package.json b/package.json
index d3c1ed3..80210e9 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "helmet": "3.23.0",
     "vue": "^2.6.10",
     "vue-cookies": "1.7.0",
+    "vue-country-region-select": "2.0.14",
     "vue-helmet": "1.1.5",
     "vue-multiselect": "^2.1.6",
     "vuejs-jwt": "1.1.0",
diff --git a/src/components/quickForm.vue b/src/components/quickForm.vue
index e54b12b..60beac2 100644
--- a/src/components/quickForm.vue
+++ b/src/components/quickForm.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <h5>{{ formName }}</h5>
     <b-form @submit.prevent="addNewCheckin" v-if="showForm">
       <h5>Comments</h5>
       <b-form-group
diff --git a/src/main.js b/src/main.js
index 10dd2fb..2d5d253 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,118 +1,120 @@
-import Vue from 'vue';
-import App from './App.vue';
-import router from './router';
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
 import store from './store'
-import BootstrapVue from 'bootstrap-vue';
-import VueCookies from 'vue-cookies';
-import VueJWT from 'vuejs-jwt';
-import VueHelmet from 'vue-helmet';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import 'bootstrap-vue/dist/bootstrap-vue.css';
-import { mapState } from "vuex";
-import { mapActions } from "vuex";
-import axios from "axios";
-import Multiselect from 'vue-multiselect';
+import BootstrapVue from 'bootstrap-vue'
+import VueCookies from 'vue-cookies'
+import vueCountryRegionSelect from 'vue-country-region-select'
+import VueJWT from 'vuejs-jwt'
+import VueHelmet from 'vue-helmet'
+import 'bootstrap/dist/css/bootstrap.min.css'
+import 'bootstrap-vue/dist/bootstrap-vue.css'
+import { mapState } from "vuex"
+import { mapActions } from "vuex"
+import axios from "axios"
+import Multiselect from 'vue-multiselect'
 
-Vue.use(BootstrapVue);
-Vue.use(VueCookies);
-Vue.use(VueHelmet);
-Vue.use(VueJWT, { storage: 'cookie' });
+Vue.use(BootstrapVue)
+Vue.use(VueCookies)
+Vue.use(VueHelmet)
+Vue.use(vueCountryRegionSelect)
+Vue.use(VueJWT, { storage: 'cookie' })
 Vue.component("Search-select", Multiselect)
 
-Vue.config.productionTip = false;
+Vue.config.productionTip = false
 
 router.beforeEach((to, from, next) => {
   if (Vue.$cookies.get('Health_Auth')) {
-    next();
+    next()
   } else if (to.name === 'reset' && !store.state.authenticated) {
-    next();
+    next()
   } else if (to.name === 'checkin' && !store.state.authenticated) {
-    next();
+    next()
   } else if (to.name !== 'login' && !store.state.authenticated) {
-    next({ name: 'login' });
+    next({ name: 'login' })
   } else {
-    next();
+    next()
   }
-});
+})
 
 Vue.filter('phone', function (phone) {
-  let phoneClean = ('' + phone).replace(/\D/g, '');
+  let phoneClean = ('' + phone).replace(/\D/g, '')
   if (phoneClean.charAt(0) === "1") {
-    phoneClean = phoneClean.slice(1);
+    phoneClean = phoneClean.slice(1)
   }
-  let output = null;
+  let output = null
   if (phoneClean.length === 0) {
-    output = '';
+    output = ''
   } else if (phoneClean.length > 0 && phoneClean.length <= 3) {
-    output = '(' + phoneClean.substring(0, 3) + ')';
+    output = '(' + phoneClean.substring(0, 3) + ')'
   } else if (phoneClean.length >= 4 && phoneClean.length <= 6) {
-    output = '(' + phoneClean.substring(0, 3) + ') ' + phoneClean.substring(3, 6);
+    output = '(' + phoneClean.substring(0, 3) + ') ' + phoneClean.substring(3, 6)
   } else if (phoneClean.length >= 7 && phoneClean.length <= 10) {
-    output = '(' + phoneClean.substring(0, 3) + ') ' + phoneClean.substring(3, 6) + '-' + phoneClean.substring(6, 10);
+    output = '(' + phoneClean.substring(0, 3) + ') ' + phoneClean.substring(3, 6) + '-' + phoneClean.substring(6, 10)
   } else if (phoneClean.length > 10) {
-    output = '(' + phoneClean.substring(0, 3) + ') ' + phoneClean.substring(3, 6) + '-' + phoneClean.substring(6, 10) + ' ext: ' + phoneClean.substring(10);
+    output = '(' + phoneClean.substring(0, 3) + ') ' + phoneClean.substring(3, 6) + '-' + phoneClean.substring(6, 10) + ' ext: ' + phoneClean.substring(10)
   }
 
   return '+1 ' + output
-});
+})
 
 Vue.filter('numberToLetter', function (number) {
   switch (number) {
     case 0:
-      return "A";
+      return "A"
     case 1:
-      return "B";
+      return "B"
     case 2:
-      return "C";
+      return "C"
     case 3:
-      return "D";
+      return "D"
     case 4:
-      return "E";
+      return "E"
     case 5:
-      return "F";
+      return "F"
     case 6:
-      return "G";
+      return "G"
     case 7:
-      return "H";
+      return "H"
     case 8:
-      return "I";
+      return "I"
     case 9:
-      return "J";
+      return "J"
     case 10:
-      return "K";
+      return "K"
   }
 
-});
+})
 
 Vue.filter('timestamp', function (input) {
-  let now = new Date();
-  let date = new Date(input);
-  let ampm = date.getHours() >= 12 ? 'pm' : 'am';
-  let hours = date.getHours() % 12;
-  let formattedHours = hours ? hours : 12;
+  let now = new Date()
+  let date = new Date(input)
+  let ampm = date.getHours() >= 12 ? 'pm' : 'am'
+  let hours = date.getHours() % 12
+  let formattedHours = hours ? hours : 12
   let isToday = (now.getDate() === date.getDate() &&
     now.getMonth() === date.getMonth() &&
-    now.getFullYear() === date.getFullYear());
+    now.getFullYear() === date.getFullYear())
   let isYesterday = (now.getDate() === date.getDate() + 1 &&
     now.getMonth() === date.getMonth() &&
-    now.getFullYear() === date.getFullYear());
-  let dateOutput = (date.getMonth() + 1) + '/' + date.getDate() + '/' + date.getFullYear() + ' at ';
+    now.getFullYear() === date.getFullYear())
+  let dateOutput = (date.getMonth() + 1) + '/' + date.getDate() + '/' + date.getFullYear() + ' at '
   if (isToday) {
     dateOutput = "Today at "
   } else if (isYesterday) {
     dateOutput = "Yesterday at "
   }
   return dateOutput + formattedHours + ':' +
-    (date.getMinutes() < 10 ? '0' : '') + date.getMinutes() + ampm;
-});
+    (date.getMinutes() < 10 ? '0' : '') + date.getMinutes() + ampm
+})
 
 Vue.filter('nullToNone', function (value) {
   if (value == null) {
-    return "None";
+    return "None"
   } else {
-    return value;
+    return value
   }
-});
+})
 
 new Vue({
   store,
@@ -129,46 +131,47 @@ new Vue({
   },
   created: function () {
     if (!this.authenticated && this.getTokenFromCookie()) {
-      this.authenticateUser(this.getTokenFromCookie());
+      this.authenticateUser(this.getTokenFromCookie())
     }
   },
   methods: {
     ...mapActions(["unsetAuth", "authenticate"]),
     authenticateUser(response) {
-      this.setAuthCookie(response);
-      this.authenticate(response);
-      this.$emit("authenticated", true);
+      this.setAuthCookie(response)
+      this.authenticate(response)
+      this.$emit("authenticated", true)
     },
     setAuthCookie(response) {
       if (this.getTokenFromCookie() && this.getTokenFromCookie() !== response) {
         // Cookies are different - Replacing cookie
-        this.$cookies.remove('Health_Auth');
-        this.$cookies.set('Health_Auth', response, '1D', null);
+        this.$cookies.remove('Health_Auth')
+        this.$cookies.set('Health_Auth', response, '1D', null)
       } else if (!this.getTokenFromCookie()) {
         // No existing cookie - Adding cookie
-        this.$cookies.set('Health_Auth', response, '1D', null);
+        this.$cookies.set('Health_Auth', response, '1D', null)
       } else {
         // Cookies are the same - do nothing
       }
     },
     getNavBarStatus() {
-      return this.$root.auth_state && this.$jwt.decode(this.$root.auth_token).type === 'user';
+      const userTypes = ['user', 'admin']
+      return this.$root.auth_state &&  userTypes.indexOf(this.$jwt.decode(this.$root.auth_token).type) > -1
     },
     getAuthenticationStatus() {
-      return this.auth_state;
+      return this.auth_state
     },
     getSavedToken() {
-      return this.auth_token;
+      return this.auth_token
     },
     getTokenFromCookie() {
-      return this.$cookies.get('Health_Auth');
+      return this.$cookies.get('Health_Auth')
     },
     destroySession() {
-      this.unsetAuth();
-      this.$cookies.remove('Health_Auth');
+      this.unsetAuth()
+      this.$cookies.remove('Health_Auth')
     },
     apiGETRequest(endpoint, callback) {
-      let self = this;
+      let self = this
       axios
         .get(self.api + endpoint, {
           headers: {
@@ -176,14 +179,14 @@ new Vue({
           },
         })
         .then(function (response) {
-          callback(response.data);
+          callback(response.data)
         })
         .catch(function (err) {
-          console.log(err);
-        });
+          console.log(err)
+        })
     },
     apiPUTRequest(endpoint, payload, callback) {
-      let self = this;
+      let self = this
       axios
         .put(self.api + endpoint, payload, {
           headers: {
@@ -191,14 +194,14 @@ new Vue({
           },
         })
         .then(function (response) {
-          callback(response);
+          callback(response)
         })
         .catch(function (err) {
-          console.log(err);
-        });
+          console.log(err)
+        })
     },
     apiPOSTRequest(endpoint, payload, callback) {
-      let self = this;
+      let self = this
       axios
         .post(self.api + endpoint, payload, {
           headers: {
@@ -206,30 +209,29 @@ new Vue({
           },
         })
         .then(function (response) {
-          callback(response);
+          callback(response)
         })
         .catch(function (err) {
-          console.log(err);
-          callback(false);
-        });
+          console.log(err)
+          callback(false)
+        })
     },
-    apiDELRequest(endpoint, payload, callback) {
-      let self = this;
+    apiDELRequest(endpoint, callback) {
+      let self = this
       // requirement for axios
-      payload = { 'data': payload };
       axios
-        .delete(self.api + endpoint, payload, {
+        .delete(self.api + endpoint, {
           headers: {
             'token': self.getSavedToken()
           },
         })
         .then(function (response) {
-          callback(response);
+          callback(response)
         })
         .catch(function (err) {
-          console.log(err);
-          callback(false);
-        });
+          console.log(err)
+          callback(false)
+        })
     },
     getStatuses() {
       return [
@@ -241,8 +243,8 @@ new Vue({
         "Called. No Answer. Did not leave a message.",
         "Wrong number",
         "No Previous Check-in"
-      ];
+      ]
     }
   },
   router
-}).$mount('#app');
+}).$mount('#app')
diff --git a/src/router.js b/src/router.js
index b575257..132d810 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,12 +1,13 @@
-import Vue from 'vue'
-import Router from 'vue-router'
 import CheckInRedirect from "./templates/CheckInRedirect.vue"
-import LoginComponent from "./templates/Login.vue"
+import ContactComponent from "./templates/Contact.vue"
+import ContactListComponent from "./templates/ContactList.vue"
 import DashboardComponent from "./templates/Dashboard.vue"
 import FacilityComponent from "./templates/Facility.vue"
+import FacilityEditComponent from "./templates/FacilityEdit.vue"
+import LoginComponent from "./templates/Login.vue"
 import PasswordResetComponent from "./templates/PasswordReset.vue"
-import ContactComponent from "./templates/Contact.vue"
-import ContactListComponent from "./templates/ContactList.vue"
+import Router from 'vue-router'
+import Vue from 'vue'
 
 Vue.use(Router);
 
@@ -30,11 +31,20 @@ export default new Router({
             component: DashboardComponent
         },
         {
-            // Add new route with entity ID
             path: '/facility/:entityID',
             name: 'facility',
             component: FacilityComponent
         },
+        {
+            path: '/facility/edit/:entityID',
+            name: 'facility-edit',
+            component: FacilityEditComponent
+        },
+        {
+            path: '/facility/add',
+            name: 'facility-add',
+            component: FacilityEditComponent
+        },
         {
             path: "/reset/:token",
             name: 'reset',
diff --git a/src/templates/Dashboard.vue b/src/templates/Dashboard.vue
index c462499..0b1c5ff 100644
--- a/src/templates/Dashboard.vue
+++ b/src/templates/Dashboard.vue
@@ -35,12 +35,14 @@
               </b-input-group>
             </b-form-group>
           </b-col>
+          <div v-if="showAdmin" >
+            <b-button v-on:click="addFacility()">Create Facility</b-button>
+          </div>
         </b-row>
         <b-table
           id="dashboard-table"
           striped
           hover
-          
           :per-page="perPage"
           :current-page="currentPage"
           :sort-by.sync="sortBy"
@@ -80,9 +82,7 @@
               :to="{ name: 'facility', params: { entityID: data.item.id }}"
             >{{ data.item.name }}</router-link>
           </template>
-          <template v-slot:cell(type)="data">
-            {{ data.item.type }}
-          </template>
+          <template v-slot:cell(type)="data">{{ data.item.type }}</template>
           <template v-slot:cell(status)="data">
             <span>{{ data.item.status }}</span>
           </template>
@@ -97,6 +97,8 @@
 export default {
   name: "Dashboard",
   data() {
+    const showAdmin =
+      this.$jwt.decode(this.$root.auth_token).type === "admin" ? true : false
     return {
       rows: 0,
       perPage: 25,
@@ -107,6 +109,7 @@ export default {
       },
       filterOn: ["name"],
       statusOptions: [],
+      showAdmin,
       entities: null,
       sortBy: "updated",
       sortDesc: false,
@@ -116,12 +119,12 @@ export default {
         { key: "status", sortable: true },
         { key: "updatedAt", sortable: true }
       ]
-    };
+    }
   },
   methods: {
     updateEntities(obj) {
-      this.entities = obj.results;
-      this.rows = this.entities.length;
+      this.entities = obj.results
+      this.rows = this.entities.length
       for (let entity of this.entities) {
         if (
           entity.checkIn &&
@@ -129,18 +132,18 @@ export default {
           entity.checkIn.checkIns.length > 0
         ) {
           entity.status =
-            entity.checkIn.checkIns[entity.checkIn.checkIns.length - 1].status;
+            entity.checkIn.checkIns[entity.checkIn.checkIns.length - 1].status
         } else {
-          entity.status = "No Previous Check-in";
+          entity.status = "No Previous Check-in"
         }
       }
     },
     onFiltered(filteredItems) {
-      this.rows = filteredItems.length;
-      this.currentPage = 1;
+      this.rows = filteredItems.length
+      this.currentPage = 1
     },
     filterRow(row, filter) {
-      let match = !filter.status || row.status === this.filter.status;
+      let match = !filter.status || row.status === this.filter.status
       return match && filter.keyword
         ? this.filterOn.reduce(
             (match, field) =>
@@ -148,17 +151,22 @@ export default {
               row[field].toLowerCase().match(filter.keyword.toLowerCase()),
             false
           )
-        : match;
+        : match
+    },
+    addFacility() {
+      this.$router.push({
+        name: "facility-add"
+      })
     }
   },
   mounted() {
     let options = this.$root.getStatuses().map(status => {
-      return { value: status, text: status, disabled: false };
-    });
-    this.statusOptions = [{ value: null, text: "All" }, ...options];
-    this.$root.apiGETRequest("/entity", this.updateEntities);
+      return { value: status, text: status, disabled: false }
+    })
+    this.statusOptions = [{ value: null, text: "All" }, ...options]
+    this.$root.apiGETRequest("/entity", this.updateEntities)
   }
-};
+}
 </script>
 
 <style>
diff --git a/src/templates/Facility.vue b/src/templates/Facility.vue
index d0472b6..924bfe9 100644
--- a/src/templates/Facility.vue
+++ b/src/templates/Facility.vue
@@ -1,9 +1,12 @@
 <template>
   <b-container fluid="md" id="facility">
-    <h1>{{ entity.name }}</h1>
+    <div id="facility-header">
+      <h1>{{ entity.name }}</h1>
+      <sub>{{ entity.type }}</sub>
+    </div>
     <b-row>
       <b-col cols="12" md="4" v-if="showDetails">
-        <b-card title="Contact Information">
+        <b-card title="Facility Information">
           <!-- Show Address if available -->
           <div v-if="entity.address" class="mb-2">
             <h6 class="card-subtitle mb2">Address</h6>
@@ -19,42 +22,18 @@
               >{{ entity.address.city }}, {{ entity.address.state }} {{ entity.address.zip }}</span>
             </p>
           </div>
-          <!-- Show Email Address if available -->
-          <div v-if="entity.email" class="mb-2">
-            <h6 class="card-subtitle mb-2">Email Addresses</h6>
-            <p v-bind:class="{ primary: entity.email[0].isPrimary }">
-              <a v-bind:href="'mailto:' +  entity.email[0].address">{{ entity.email[0].address }}</a>
-            </p>
-            <ol v-if="entity.email">
-              <li
-                v-for="address in entity.email"
-                v-bind:key="address.address"
-                v-bind:class="{ primary: address.isPrimary }"
-              >
-                <a v-bind:href="'mailto:' +  address.address">{{ address.address }}</a>
-              </li>
-            </ol>
-          </div>
-
-          <!-- Show Phone Numbers if available -->
-          <div v-if="entity.phone" class="mb-2">
-            <h6 class="card-subtitle mb2">Phone Numbers</h6>
-            <p
-              v-if="entity.phone"
-              v-bind:class="{ primary: entity.phone[0].isPrimary }"
-            >{{ entity.phone[0].number | phone }}</p>
-            <ol v-if="entity.phone">
-              <li
-                v-for="number in entity.phone"
-                v-bind:key="number.number"
-                v-bind:class="{ primary: number.isPrimary }"
-              >{{ number.number | phone }}</li>
-            </ol>
+          <div v-if="entity.attributes" class="mb-2">
+            <div v-if="entity.attributes.notes">
+              <h6 class="card-subtitle mb2">Notes</h6>
+              <p>{{ entity.attributes.notes }}</p>
+            </div>
           </div>
-
+          <b-button v-on:click="editFacility()">Edit Facility</b-button>
+        </b-card>
+        <br />
+        <b-card title="Contact Information">
           <!-- Show Contacts if available -->
           <div v-if="entity.contacts && entity.contacts.length > 0" class="mb2">
-            <h6 class="card-subtitle mb-2" v-if="entity.contacts.length > 0">Contacts</h6>
             <div v-if="entity.contacts.length === 1" class="contact">
               <p>
                 <router-link
@@ -116,16 +95,17 @@
               </li>
             </ul>
           </div>
+          <br />
           <b-button v-on:click="addContact()">Add Contact</b-button>
         </b-card>
         <br />
         <b-card title="Quick Check-In">
-              <quick-form
-                v-if="formAvailability.covidForm.includes(entity.type)"
-                v-bind:entity.sync="entity"
-                v-bind:entity-check-in.sync="entityCheckIn"
-                @submitted="setLastCheckInData($event)"
-              />
+          <quick-form
+            v-if="formAvailability.covidForm.includes(entity.type)"
+            v-bind:entity.sync="entity"
+            v-bind:entity-check-in.sync="entityCheckIn"
+            @submitted="setLastCheckInData($event)"
+          />
         </b-card>
       </b-col>
       <b-col cols="12" md="8">
@@ -243,8 +223,11 @@ export default {
     quickForm
   },
   data() {
+    const validRoles = ["admin", "user"];
     const showDetails =
-      this.$jwt.decode(this.$root.auth_token).type === "user" ? true : false;
+      validRoles.indexOf(this.$jwt.decode(this.$root.auth_token).type) > -1
+        ? true
+        : false;
     return {
       historyFields: [
         {
@@ -282,10 +265,8 @@ export default {
   },
   methods: {
     setHistoricalData(data) {
-        this.lastCheckIn = this.duplicateData(
-          data
-        );
-        this.lastCheckInStatus.status = data.lastCheckIn.status;
+      this.lastCheckIn = this.duplicateData(data);
+      this.lastCheckInStatus.status = data.status;
 
       switch (data.status) {
         case "Spoke to owner. No follow-up needed.":
@@ -323,7 +304,7 @@ export default {
         timeZone: "America/New_York"
       };
       const formatted = new Intl.DateTimeFormat("en-US", options).format(date);
-      return formatted
+      return formatted;
     },
     updateFacilityData(obj) {
       if (obj.checkIn === null) {
@@ -383,7 +364,6 @@ export default {
       this.$router.push({ name: "login" });
     },
     setLastCheckInData(data = undefined, pos = undefined) {
-      console.log(this.entity.checkIn.checkIns);
       if (data) {
         this.entity.checkIn.checkIns.push(data);
       }
@@ -428,6 +408,12 @@ export default {
         name: "create-contact",
         params: { entityID: this.$route.params.entityID }
       });
+    },
+    editFacility() {
+      this.$router.push({
+        name: "facility-edit",
+        params: { entityID: this.$route.params.entityID }
+      });
     }
   },
   created() {
@@ -439,7 +425,7 @@ export default {
 <style scoped>
 h1 {
   text-align: left;
-  margin-bottom: 30px;
+  margin-bottom: 0px;
 }
 .card h6 {
   font-weight: bold;
@@ -482,4 +468,8 @@ button.btn-primary {
 .facility-check-in {
   margin-bottom: 24px;
 }
+
+.facility-header {
+  margin-bottom: 25px;
+}
 </style>
diff --git a/src/templates/FacilityEdit.vue b/src/templates/FacilityEdit.vue
new file mode 100644
index 0000000..a9ce2cb
--- /dev/null
+++ b/src/templates/FacilityEdit.vue
@@ -0,0 +1,221 @@
+<template>
+  <b-container fluid="md" id="entity">
+    <h1>Facility Information</h1>
+    <b-row>
+      <b-col cols="6">
+        <h4>{{ this.$route.params.entityID ? 'Update facility' : 'Create facility' }}</h4>
+        <b-form @submit.prevent="submitForm">
+          <b-form-group id="entity-name" label="Name">
+            <b-form-input type="text" required v-model="entity.name" />
+          </b-form-group>
+          <b-form-group id="entity-address" label="Address">
+            <b-form-input type="text" v-model="entity.address.street[0]" placeholder="Street" />
+            <b-form-input type="text" v-model="entity.address.city" placeholder="City" />
+            <b-form-select v-model="stateSelected" :options="stateOptions"></b-form-select>
+            <b-form-input type="text" v-model="entity.address.zip" placeholder="Zip" />
+          </b-form-group>
+          <b-form-group id="entity-type" label="Type">
+            <b-form-select v-model="typeSelected" required :options="typeOptions"></b-form-select>
+          </b-form-group>
+          <b-form-group id="entity-notes" label="Notes">
+            <b-form-input type="text" v-model="entity.attributes.notes" />
+          </b-form-group>
+          <b-button
+            type="submit"
+            variant="primary"
+          >{{ this.$route.params.entityID ? 'Update facility' : 'Create facility' }}</b-button>
+          <b-button
+            type="cancel"
+            variant="outline-secondary"
+            @click.prevent="returnToLastPage"
+          >Cancel</b-button>
+        </b-form>
+      </b-col>
+    </b-row>
+    <br />
+
+    <b-row v-if="$route.params.entityID">
+      <b-col cols="6">
+        <h4>Linked Contacts</h4>
+        <b-input-group v-if="entity.contacts.length > 0">
+          <b-form-select v-model="selectedContactID" :options="contactSelectList"></b-form-select>
+          <b-button
+            type="submit"
+            variant="primary"
+            @click.prevent="unlinkEntity"
+          >Unlink from Facility</b-button>
+        </b-input-group>
+        <p v-if="entity.contacts.length === 0">This facility has no linked contact.</p>
+        <br />
+        <div v-if="showAdmin">
+          <h4>Admin Options</h4>
+          <b-button type="submit" variant="primary" @click.prevent="deleteFacility">Delete Facility</b-button>
+        </div>
+      </b-col>
+    </b-row>
+  </b-container>
+</template>
+
+<script>
+export default {
+  name: "Entity",
+  data() {
+    const showAdmin =
+      this.$jwt.decode(this.$root.auth_token).type === "admin" ? true : false
+    return (
+      {
+        entity: {
+          id: null,
+          name: null,
+          address: {
+            street: [""],
+            city: "",
+            state: "",
+            zip: ""
+          },
+          attributes: {
+            notes: ""
+          },
+          contacts: []
+        },
+        showAdmin,
+        contactSelectList: [{ value: null, text: "Contacts Linked" }],
+        selectedContactID: null,
+        stateSelected: "MD",
+        stateOptions: [{ value: "MD", text: "Maryland" }],
+        typeSelected: null,
+        typeOptions: [
+          { value: null, text: "Select facility type" },
+          {
+            value: "Assisted Living Facility",
+            text: "Assisted Living Facility"
+          },
+          { value: "Mixed Housing", text: "Mixed Housing" },
+          { value: "Senior Housing", text: "Senior Housing" }
+        ]
+      }
+    )
+  },
+  methods: {
+    updateEntity(obj) {
+      this.entity = obj
+
+      this.stateSelected = this.entity.address.state
+      this.typeSelected = this.entity.type
+      if (this.entity.attributes === null) {
+        this.entity.attributes = { notes: "" }
+      }
+
+      this.populateContactsDropdown()
+    },
+    getEntity(id) {
+      this.$root.apiGETRequest("/entity/" + id, this.updateEntity)
+    },
+    populateContactsDropdown() {
+      for (let contact_ of this.entity.contacts) {
+        this.contactSelectList.push({
+          value: contact_.id,
+          text: contact_.name
+        })
+      }
+    },
+    returnToLastPage() {
+      if (this.$route.params.entityID) {
+        this.$router.push({
+          name: "facility",
+          params: { entityID: this.$route.params.entityID }
+        })
+      } else {
+        this.$router.push({
+          name: "dashboard"
+        })
+      }
+    },
+    submitForm() {
+      this.validationRun = true
+      if (this.typeSelected !== null) this.entity.type = this.typeSelected
+      this.entity.address.state = this.stateSelected
+      let newEntity = this.duplicateData(this.entity)
+
+      if (this.$route.params.entityID) {
+        this.$root.apiPUTRequest("/entity", newEntity, this.returnToLastPage)
+      } else {
+        this.$root.apiPOSTRequest("/entity", newEntity, this.returnToLastPage)
+      }
+    },
+    duplicateData(object) {
+      return JSON.parse(JSON.stringify(object))
+    },
+    unlinkEntity() {
+      let unlinkConfirm = confirm("Confirm unlink?")
+      if (!unlinkConfirm) {
+        return
+      }
+      let body = {
+        entities: [{ id: this.$route.params.entityID }]
+      }
+      this.$root.apiPOSTRequest(
+        "/contact/unlink/" + this.selectedContactID,
+        body,
+        this.returnToLastPage
+      )
+    },
+    deleteFacility() {
+      let deleteConfirm = confirm("Confirm delete of facility?")
+      if (!deleteConfirm) {
+        return
+      }
+      this.$root.apiDELRequest(
+        "/entity/" + this.$route.params.entityID,
+        this.$router.push({
+          name: "dashboard"
+        })
+      )
+    }
+  },
+  mounted() {
+    if (this.$route.params.entityID) {
+      this.getEntity(this.$route.params.entityID)
+    }
+  }
+}
+</script>
+
+<style scoped>
+h1 {
+  text-align: left;
+}
+form h5 {
+  border-bottom: 2px solid #42484f;
+  padding-bottom: 8px;
+  margin: 16px 0;
+}
+form h6 {
+  font-weight: bold;
+  background-color: #f1f1f1;
+  box-sizing: border-box;
+  padding: 8px;
+}
+.card-body {
+  text-align: left;
+}
+p.return-link {
+  text-align: left;
+}
+.facility-check-in {
+  margin-bottom: 24px;
+}
+.address-line {
+  display: block;
+}
+.alert {
+  margin-bottom: 0;
+}
+.alert h6 {
+  font-weight: bold;
+  margin-top: 4px;
+}
+p:last-child {
+  margin-bottom: 0;
+}
+</style>
\ No newline at end of file