diff --git a/17th Website/package-lock.json b/17th Website/package-lock.json
index c5bbcab..0371605 100644
--- a/17th Website/package-lock.json	
+++ b/17th Website/package-lock.json	
@@ -2591,9 +2591,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001486",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz",
-      "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "dev": true,
       "funding": [
         {
@@ -11644,9 +11644,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001486",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz",
-      "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
diff --git a/17th Website/src/views/users.vue b/17th Website/src/views/users.vue
index a9f9e90..5b902bd 100644
--- a/17th Website/src/views/users.vue	
+++ b/17th Website/src/views/users.vue	
@@ -1,7 +1,5 @@
 <script>
-import { Listbox, ListboxButton, ListboxOptions, ListboxOption } from '@headlessui/vue'
 import { Icon } from '@iconify/vue'
-import QueryApolloGraphQL from '../api/request'
 import Dropdown from '../components/dropdown/Dropdown.vue'
 
 export default {
@@ -13,8 +11,8 @@ export default {
 
             statusFilters: [
                 { id: 1, name: 'All Groups', filter: 'none', disabled: false },
-                { id: 2, name: 'Alpha', filter: 'Alpha Company', disabled: false },
-                { id: 3, name: 'Echo', filter: 'Echo Company', disabled: false },
+                { id: 2, name: 'Alpha', filter: 'Alpha', disabled: false },
+                { id: 3, name: 'Echo', filter: 'Echo', disabled: false },
                 { id: 4, name: 'HHC', filter: 'HHC', disabled: false },
                 { id: 5, name: 'Recruit', filter: 'Recruit', disabled: false },
             ],
@@ -40,35 +38,44 @@ export default {
         },
         filterByName(item) {
             if (this.search != '')
-                return item.member_name.toLowerCase().includes(this.search.toLowerCase());
+                return item.name.toLowerCase().includes(this.search.toLowerCase());
             else
                 return true;
         },
         filterByUnit(item) {
+            // console.log(item, this.statusFilters[this.currentStatusFilterIndex]);
+
             if (this.statusFilters[this.currentStatusFilterIndex].filter != 'none')
-                return item.status == this.unitFilter.filter;
+                //do the filter
+                return item.company.toLowerCase() == this.statusFilters[this.currentStatusFilterIndex].filter.toLowerCase();
             else
+                //no filter applied
                 return true;
         },
         filterByRole(item) {    //THIS IS NOT IMPLEMENTED YET
             return true;
-        }
+        },
     },
     components: {
-        Listbox,
-        ListboxButton,
-        ListboxOption,
-        ListboxOptions,
         Icon,
         Dropdown,
     },
     mounted() {
-    //    QueryApolloGraphQL("getPageViewMemberRankStatusAll", "query Query {getPageViewMemberRankStatusAll {items {member_name,rank,status}}}").then(value => { this.items = value }) //console.log(value); for debug reasons
+        //    QueryApolloGraphQL("getPageViewMemberRankStatusAll", "query Query {getPageViewMemberRankStatusAll {items {member_name,rank,status}}}").then(value => { this.items = value }) //console.log(value); for debug reasons
         // this.items = fetch("http://iceberg-gaming.com:1323/api/members");
 
         //make API request here
+
+        fetch('http://iceberg-gaming.com:1323/api/v1/member').then(res => {
+            console.log(res); 
+            res.json().then(list => {
+                this.items = list;
+                console.log(this.items);
+
+            });
+        });
     },
-    computed: {
+    computed: { 
         filteredTable() {
             var newTable = this.items;
             newTable = newTable.filter(this.filterByUnit);
@@ -91,12 +98,12 @@ export default {
                     class="mx-2 max-w-md" />
                 <div id="dropdownWrapper">
 
-                    <Dropdown :values="statusFilters" :currentIndex="currentStatusFilterIndex" display="name" 
-                    @changeSelection="(index) => currentStatusFilterIndex = index" class="w-36 mr-2">
+                    <Dropdown :values="statusFilters" :currentIndex="currentStatusFilterIndex" display="name"
+                        @changeSelection="(index) => currentStatusFilterIndex = index" class="w-36 mr-2">
                     </Dropdown>
 
                     <Dropdown :values="roleFilters" :currentIndex="currentRoleFilter" display="name"
-                    @changeSelection="(index) => currentRoleFilter = index" class="w-36">
+                        @changeSelection="(index) => currentRoleFilter = index" class="w-36">
                     </Dropdown>
 
                     <button @click="resetFilters()"
@@ -110,7 +117,7 @@ export default {
             <thead>
                 <tr>
                     <th>Member</th>
-                    <th>Unit</th>
+                    <th>Status</th>
                     <th>Rank</th>
                     <th>Join Date</th>
                     <th>LOA Until</th>
@@ -119,10 +126,13 @@ export default {
             </thead>
             <tbody id="tableBody">
                 <tr v-for="(item, index) in filteredTable"
-                    v-on:click="$router.push({ path: `/profile/${item.member_name}/home` })">
-                    <td>{{ item.member_name }}</td>
-                    <td>{{ item.status }}</td>
-                    <td>{{ item.rank }}</td>
+                    v-on:click="$router.push({ path: `/profile/${item.id}/home` })">
+                    <td>{{ item.name }}</td>
+                    <td>{{ item.company }}</td>
+                    <td>{{ item.rank.name }}</td>
+                    <td>{{ item.created_at.split('T')[0] }}</td>
+                    <td>hello</td>
+                    <td>hello</td>
                 </tr>
             </tbody>
         </table>