diff --git a/src/components/TableSection.vue b/src/components/TableSection.vue
index b640d3e..7df0f86 100644
--- a/src/components/TableSection.vue
+++ b/src/components/TableSection.vue
@@ -33,41 +33,49 @@ export default {
 			fields: [
 				{
 					key: 'id',
-					label: 'Monster name',
+					label: 'Monster ID',
 					sortable: true,
-					isActive: false,
+					class: 'd-none',
 				},
 				{
 					key: 'monster',
 					label: 'Monster name',
 					sortable: true,
-					isActive: true,
 				},
 				{
 					key: 'combat_req',
 					label: 'Combat Requirement',
 					sortable: true,
-					isActive: false,
+					class: 'd-none',
 				},
 				{
 					key: 'slayer_req',
 					label: 'Slayer Requirement',
 					sortable: true,
-					isActive: false,
+					class: 'd-none',
 				},
 				{
 					key: 'defence_req',
 					label: 'Defence Requirement',
 					sortable: true,
-					isActive: false,
+					class: 'd-none',
+				},
+				{
+					key: 'defence_req',
+					label: 'Defence Requirement',
+					sortable: true,
+					class: 'd-none',
 				},
 			],
 			config: {
-				combat_level: 100,
-				slayer_level: 75,
-				defence_level: 60,
+				combat_level: 126,
+				slayer_level: 99,
+				defence_level: 99,
 			},
-			filters: {
+			masterFilter: {
+			    id: id => id === this.currentMaster.assignments[0],
+			},
+			accountFilters: {
 				combat_req: combat_req => combat_req < this.config.combat_level,
 				slayer_req: slayer_req => slayer_req < this.config.slayer_level,
 				defence_req: defence_req => defence_req < this.config.defence_level,
@@ -79,11 +87,14 @@ export default {
 		reload() {
 		    this.currentMaster = this.mastersData.masters[this.$route.params.id];
 		    this.filterData();
+		    this.generateTaskWeights();
 		},
 	    filterData() {
+			//filter based on current Slayer Master
+			this.filtered_items = this.filterArray(this.monstersData, this.masterFilter);
 
-			//filter based on account
-			this.filtered_items = this.filterArray(this.monstersData, this.filters)
+			//filter based on Account Settings
+			this.filtered_items = this.filterArray(this.filtered_items, this.accountFilters);
 		},
 		filterArray(array, filters) {
 			const filterKeys = Object.keys(filters);
@@ -95,9 +106,12 @@ export default {
 					return filters[key](item[key]);
 				});
 			});
-		}
+		},
+		generateTaskWeights() {
+
+		},
 	},
-	mounted() {
+	created() {
 		this.reload();
 	},
 	watch: {
diff --git a/src/data/masters.json b/src/data/masters.json
index a53bf6e..055ef4d 100644
--- a/src/data/masters.json
+++ b/src/data/masters.json
@@ -3,33 +3,42 @@
     "0": {
       "id": 0,
       "name": "Turael",
-      "image": "Turael.png"
+      "image": "Turael.png",
+      "assignments": [1, 2, 3, 4]
     },
     "1": {
       "id": 1,
       "name": "Krystilia",
-      "image": "Krystilia.png"
+      "image": "Krystilia.png",
+      "assignments": [5, 3, 6]
     },
   "2":{
       "id": 2,
       "name": "Mazchna",
-      "image": "Mazchna.png"
-    },
+      "image": "Mazchna.png",
+      "assignments": [5, 3, 6]
+  },
   "3":{
       "id": 3,
       "name": "Vannaka",
-      "image": "Vannaka.png"
-    },
+      "image": "Vannaka.png",
+    "assignments": [5, 3, 6]
+
+  },
   "4":{
       "id": 4,
       "name": "Chaeldar",
-      "image": "Chaeldar.png"
-    },
+      "image": "Chaeldar.png",
+    "assignments": [5, 3, 6]
+
+  },
   "5":{
       "id": 5,
       "name": "Konar quo Maten",
-      "image": "Konar quo Maten.png"
-    },
+      "image": "Konar quo Maten.png",
+    "assignments": [5, 3, 6]
+
+  },
   "6":{
       "id": 6,
       "name": "Nieve",
@@ -38,7 +47,9 @@
   "7":{
       "id": 7,
       "name": "Duradel",
-      "image": "Duradel.png"
-    }
+      "image": "Duradel.png",
+    "assignments": [5, 3, 6]
+
+  }
 }
 }