diff --git a/src/components/Index.vue b/src/components/Index.vue
index e355fb5..2b5ea72 100644
--- a/src/components/Index.vue
+++ b/src/components/Index.vue
@@ -3,11 +3,17 @@
     <div slot="header" class="toolbar">
       <q-toolbar-title :padding="0">
         My Spells v2.0 
+
+          <q-search
+            v-model="search"
+          ></q-search>
       </q-toolbar-title>
     </div>
 
     <div class="layout-view">
-      <spell-list :spells="state.spells.data"></spell-list>
+      <spell-list
+        :spells="spells"
+      ></spell-list>
     </div>
   </q-layout>
 </template>
@@ -15,16 +21,32 @@
 <script>
 import { Loading, Dialog } from 'quasar'
 import Vue from 'vue'
+import 'whatwg-fetch'
+import Query from '../query'
 import { state, dispatch } from '../store'
 import SpellList from './Spelllist'
-import 'whatwg-fetch'
 
 Vue.component('spell-list', SpellList)
 
 export default {
+  computed: {
+    spells () {
+      if (this.state.spells.data.length === 0) {
+        return []
+      }
+
+      let sortBy = this.search.length >= 3 ? 'sortScore' : 'name'
+
+      return new Query(this.state.spells.data)
+      .search('name', this.search, 5)
+      .sort(sortBy)
+      .results
+    }
+  },
   data () {
     return {
-      state
+      state,
+      search: ''
     }
   },
   mounted () {
diff --git a/src/query.js b/src/query.js
new file mode 100644
index 0000000..3ab8cae
--- /dev/null
+++ b/src/query.js
@@ -0,0 +1,33 @@
+export default class Query {
+  constructor (data) {
+    this.data = data.map(item => {
+      item.sortScore = 0
+      return item
+    })
+  }
+
+  get results () {
+    return this.data
+  }
+
+  search (key, term = '', score = 0) {
+    if (term.length >= 3) {
+      this.data = this.data.filter(item => {
+        let regFind = new RegExp(term, 'gi')
+        let termMatches = (item[key].match(regFind) || []).length
+        item.sortScore += termMatches
+        return termMatches
+      })
+    }
+    return this
+  }
+
+  sort (key = 'sortScore') {
+    this.data = this.data.sort((a, b) => {
+      if (a[key] < b[key]) return -1
+      if (a[key] > b[key]) return 1
+      return 0
+    })
+    return this
+  }
+}