diff --git a/addon/components/labs-search.hbs b/addon/components/labs-search.hbs
index 7150164..a0d085b 100644
--- a/addon/components/labs-search.hbs
+++ b/addon/components/labs-search.hbs
@@ -5,6 +5,7 @@
   @value={{this.searchTerms}}
   {{on 'focus' (action 'handleFocusIn')}}
   {{on 'blur' (action 'handleFocusOut')}}
+  autocomplete="off"
 />
 <label class="show-for-sr" for="map-search-input">Search the map</label>
 
@@ -24,18 +25,37 @@
   onmouseleave={{action 'handleHoverOut'}}>
   {{#each-in (group-by "typeTitle" this.currResults) as |type rows|}}
     <li>
-      <h4 class="header-small results-header">{{type}}</h4>
+      
+      {{#if (eq type "Search History")}}
+        <div  style="display: flex; flex-direction: row; justify-content: space-between;">
+          <h4 class="header-small results-header">{{type}}</h4>
+          <span {{action 'clearSearchHistory'}} style="color: #ae561f; cursor: pointer;">
+            Clear History
+          </span>
+        </div>
+
+      {{else}}
+        <h4 class="header-small results-header">{{type}}</h4>
+      {{/if}}
     </li>
     {{#each rows key='label' as |result|}}
-      <li class="result {{if (eq this.selected result.id) 'highlighted-result'}}" {{action 'goTo' result}}
+      <li class="result {{if (eq this.selected result.id) 'highlighted-result'}}" 
         onmouseover={{action 'handleHoverResult' result}}
-        role="button">
-        {{#if this.hasBlock}}
-          {{yield (hash result=result)}}
-        {{else}}
-          {{result.label}}
+        role="button" style="display: flex; flex-direction: row; justify-content: space-between;">
+        <div {{action 'goTo' result}} style="flex-grow: 1;">
+          {{#if this.hasBlock}}
+            {{yield (hash result=result)}}
+          {{else}}
+            {{result.label}}
+          {{/if}}
+        </div>
+        {{#if (eq type "Search History")}}
+          <span {{action 'removeSearchFromSearchHistory' result}} style="width: 12px;">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z" fill="red" /></svg>  
+          </span>
         {{/if}}
       </li>
+      
     {{/each}}
   {{/each-in}}
 </ul>
diff --git a/addon/components/labs-search.js b/addon/components/labs-search.js
index eccc8c2..a5ce95c 100644
--- a/addon/components/labs-search.js
+++ b/addon/components/labs-search.js
@@ -65,6 +65,10 @@ export default Component.extend({
   host: 'https://search-api-production.herokuapp.com',
   route: 'search',
 
+  useSearchHistory: false,
+
+  searchHistory: window.localStorage["search-history"] ? JSON.parse(window.localStorage["search-history"]) : [],
+
   searchPlaceholder: 'Search...',
   searchTerms: '',
   selected: 0,
@@ -72,8 +76,14 @@ export default Component.extend({
 
   loading: null,
 
+  filteredSearchHistory: [],
+
   debouncedResults: task(function* (searchTerms) {
-    if (searchTerms.length < 2) return;
+    this.send('filterSearchHistory', searchTerms)
+    if (searchTerms.length < 2) {
+      this.set('currResults', this.filteredSearchHistory);
+      return;
+    }
     yield timeout(DEBOUNCE_MS);
     const URL = this.endpoint;
 
@@ -94,7 +104,7 @@ export default Component.extend({
       return mutatedResult;
     });
 
-    this.set('currResults', mergedWithTitles);
+    this.set('currResults', this.filteredSearchHistory.concat(mergedWithTitles));
     this.set('loading', null);
 
     return mergedWithTitles;
@@ -158,6 +168,7 @@ export default Component.extend({
     },
 
     goTo(result) {
+      this.send('addSearchToSearchHistory', result)
       const el = document.querySelector('.map-search-input');
       const event = document.createEvent('HTMLEvents');
       event.initEvent('blur', true, false);
@@ -190,5 +201,36 @@ export default Component.extend({
     handleHoverOut() {
       this.onHoverOut();
     },
+
+    saveSearchHistory() {
+      window.localStorage["search-history"] = JSON.stringify(this.searchHistory.slice(0, 100))
+    },
+
+    addSearchToSearchHistory(result) {
+      if(this.useSearchHistory) {
+        const h = [...this.searchHistory].filter((search) => search.label !== result.label);
+        this.set('searchHistory', [{...result, typeTitle: "Search History"}, ...h]);
+        this.send('saveSearchHistory');
+      }
+    },
+
+    removeSearchFromSearchHistory(result) {
+      this.set('searchHistory', [...this.searchHistory].filter((search) => search.label !== result.label));
+      this.send('saveSearchHistory');
+      this.set('currResults', [...this.currResults].filter((curr) => curr.label !== result.label));
+    },
+
+    clearSearchHistory() {
+      this.set('searchHistory', []);
+      this.send('saveSearchHistory');
+      this.set('currResults', [...this.currResults].filter((search) => search.typeTitle !== "Search History"))
+    },
+
+    filterSearchHistory(query) {
+      if(this.useSearchHistory) {
+        const h = [...this.searchHistory].filter((search) => search.label.toUpperCase().includes(query.toUpperCase())).slice(0, 5);
+        this.set('filteredSearchHistory', h)
+      }
+    },   
   },
 });