diff --git a/README.md b/README.md
index 4f0453e..1c199d0 100755
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Wikipedia
 ## About 
 Query [Wikipedia](https://www.wikipedia.org) for answers to all your questions.  Get just a summary, or ask for more to get in-depth information.
  
- This Skill uses the [Wikimedia API](https://en.wikipedia.org/w/api.php). 
+ This Skill uses the [Wikipedia for humans](https://github.com/HelloChatterbox/wikipedia_for_humans). 
 
 
 ## Examples 
@@ -17,8 +17,6 @@ Query [Wikipedia](https://www.wikipedia.org) for answers to all your questions.
 * "More information" (followup after an initial summary)
 * "Tell me More" (followup after an initial summary)
 
-## Credits 
-Mycroft AI (@MycroftAI)
 
 ## Category
 **Information**
diff --git a/__init__.py b/__init__.py
index 0fb2664..566d042 100755
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,3 @@
-# Copyright 2017, Mycroft AI Inc.
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,42 +9,30 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-import re
-import wikipedia as wiki
+import wikipedia_for_humans
+from requests.exceptions import ConnectionError
 from adapt.intent import IntentBuilder
-
-
 from mycroft.skills.core import (MycroftSkill, intent_handler,
                                  intent_file_handler)
 
 
-EXCLUDED_IMAGES = [
-    'https://upload.wikimedia.org/wikipedia/commons/7/73/Blue_pencil.svg'
-]
-
-
-def wiki_image(pagetext):
-    """ Fetch first best image from results.
-
-        Arguments:
-            pagetext: wikipedia result page
-
-        Returns:
-            (str) image url or empty string if no image available
-    """
-    images = [i for i in pagetext.images if i not in EXCLUDED_IMAGES]
-    if len(images) > 0:
-        return images[0]
-    else:
-        return ''
-
-
 class WikipediaSkill(MycroftSkill):
     def __init__(self):
         super(WikipediaSkill, self).__init__(name="WikipediaSkill")
+        self.idx = 0
+        self.results = []
 
-    @intent_handler(IntentBuilder("").require("Wikipedia").
+    def speak_result(self):
+        if self.idx + 1 > len(self.results):
+            self.speak_dialog("thats all")
+            self.remove_context("wiki_article")
+            self.idx = 0
+        else:
+            self.speak(self.results[self.idx])
+            self.idx += 1
+        self.set_context("Wikipedia", "wikipedia")
+
+    @intent_handler(IntentBuilder("WikiSearch").require("Wikipedia").
                     require("ArticleTitle"))
     def handle_wiki_query(self, message):
         """ Extract what the user asked about and reply with info
@@ -55,129 +41,37 @@ def handle_wiki_query(self, message):
         # Talk to the user, as this can take a little time...
         search = message.data.get("ArticleTitle")
         self.speak_dialog("searching", {"query": search})
-
+        if "lang" in self.settings:
+            lang = self.settings["lang"]
+        else:
+            lang = self.lang.split("-")[0]
         try:
-            self._lookup(search)
-        except wiki.PageError:
-            self._lookup(search, auto_suggest=False)
-        except Exception as e:
-            self.log.error("Error: {0}".format(e))
-
-    @intent_handler(IntentBuilder("").require("More").
-                    require("wiki_article").require("spoken_lines"))
+            answer = wikipedia_for_humans.summary(search, lang=lang)
+            if not answer.strip():
+                self.speak_dialog("no entry found")
+                return
+            self.log.debug("Wiki summary: " + answer)
+            self.idx = 0
+            self.results = answer.split(". ")
+            self.speak_result()
+            self.set_context("wiki_article", search)
+        except ConnectionError as e:
+            self.log.error("It seems like lang is invalid!!!")
+            self.log.error(lang + ".wikipedia.org does not seem to exist")
+            self.log.info("Override this in skill settings")
+            # TODO dialog
+            # TODO Settings meta
+            raise e  # just speak regular error
+
+    @intent_handler(IntentBuilder("WikiMore").require("More").
+                    require("wiki_article"))
     def handle_tell_more(self, message):
         """ Follow up query handler, "tell me more".
 
             If a "spoken_lines" entry exists in the active contexts
             this can be triggered.
         """
-        # Read more of the last article queried
-        results = self.results
-        article = message.data.get("wiki_article")
-        lines_spoken_already = int(message.data.get("spoken_lines"))
-
-        summary_read = wiki.summary(article, lines_spoken_already)
-        try:
-            summary = wiki.summary(article, lines_spoken_already + 5)
-        except wiki.PageError:
-            summary = wiki.summary(article, lines_spoken_already + 5,
-                                   auto_suggest=False)
-
-        # Remove already-spoken parts and section titles
-        summary = summary[len(summary_read):]
-        summary = re.sub(r'\([^)]*\)|/[^/]*/|== [^=]+ ==', '', summary)
-
-        if not summary:
-            self.speak_dialog("thats all")
-        else:
-            self.gui.clear()
-
-            try:
-                pagetext = wiki.page(results[0])
-            except wiki.PageError:
-                pagetext = wiki.page(results[0], auto_suggest=False)
-
-            self.gui['summary'] = summary
-            self.gui['imgLink'] = wiki_image(pagetext)
-            self.gui.show_page("WikipediaDelegate.qml", override_idle=60)
-            self.speak(summary)
-            self.set_context("wiki_article", article)
-            self.set_context("spoken_lines", str(lines_spoken_already+5))
-
-    @intent_file_handler("Random.intent")
-    def handle_random_intent(self, message):
-        """ Get a random wiki page.
-
-            Uses the Special:Random page of wikipedia
-        """
-        # Talk to the user, as this can take a little time...
-        search = wiki.random(pages=1)
-        self.speak_dialog("searching", {"query": search})
-        self._lookup(search)
-
-    def _lookup(self, search, auto_suggest=True):
-        """ Performs a wikipedia lookup and replies to the user.
-
-            Arguments:
-                search: phrase to search for
-        """
-        try:
-            # Use the version of Wikipedia appropriate to the request language
-            dict = self.translate_namedvalues("wikipedia_lang")
-            wiki.set_lang(dict["code"])
-
-            # First step is to get wiki article titles.  This comes back
-            # as a list.  I.e. "beans" returns ['beans',
-            #     'Beans, Beans the Music Fruit', 'Phaseolus vulgaris',
-            #     'Baked beans', 'Navy beans']
-            results = wiki.search(search, 5)
-            if len(results) == 0:
-                self.speak_dialog("no entry found")
-                return
-
-            # Now request the summary for the first (best) match.  Wikipedia
-            # writes in inverted-pyramid style, so the first sentence is the
-            # most important, the second less important, etc.  Two sentences
-            # is all we ever need.
-            lines = 2
-            summary = wiki.summary(results[0], lines,
-                                   auto_suggest=auto_suggest)
-
-            if "==" in summary or len(summary) > 250:
-                # We hit the end of the article summary or hit a really long
-                # one.  Reduce to first line.
-                lines = 1
-                summary = wiki.summary(results[0], lines,
-                                       auto_suggest=auto_suggest)
-
-            # Now clean up the text and for speaking.  Remove words between
-            # parenthesis and brackets.  Wikipedia often includes birthdates
-            # in the article title, which breaks up the text badly.
-            summary = re.sub(r'\([^)]*\)|/[^/]*/', '', summary)
-
-            # Send to generate displays
-            self.gui.clear()
-            pagetext = wiki.page(results[0], auto_suggest=auto_suggest)
-            self.gui['summary'] = summary
-            self.gui['imgLink'] = wiki_image(pagetext)
-            self.gui.show_page("WikipediaDelegate.qml", override_idle=60)
-
-            # Remember context and speak results
-            self.set_context("wiki_article", results[0])
-            self.set_context("spoken_lines", str(lines))
-            self.speak(summary)
-            self.results = results
-
-        except wiki.exceptions.DisambiguationError as e:
-            # Test:  "tell me about john"
-            options = e.options[:5]
-
-            option_list = (", ".join(options[:-1]) + " " +
-                           self.translate("or") + " " + options[-1])
-            choice = self.get_response('disambiguate',
-                                       data={"options": option_list})
-            if choice:
-                self._lookup(choice, auto_suggest=auto_suggest)
+        self.speak_result()
 
 
 def create_skill():
diff --git a/dialog/ca-es/disambiguate.dialog b/dialog/ca-es/disambiguate.dialog
new file mode 100644
index 0000000..266558d
--- /dev/null
+++ b/dialog/ca-es/disambiguate.dialog
@@ -0,0 +1,2 @@
+volíeu dir {{options}}
+us agradaria sentir alguna cosa sobre {{options}}
diff --git a/dialog/ca-es/no entry found.dialog b/dialog/ca-es/no entry found.dialog
new file mode 100644
index 0000000..a00d884
--- /dev/null
+++ b/dialog/ca-es/no entry found.dialog	
@@ -0,0 +1,2 @@
+No puc trobar cap article relacionat en la Viquipèdia
+Em temo que no hi ha cap article sobre això
diff --git a/dialog/ca-es/or.dialog b/dialog/ca-es/or.dialog
new file mode 100644
index 0000000..13e7564
--- /dev/null
+++ b/dialog/ca-es/or.dialog
@@ -0,0 +1 @@
+o
diff --git a/dialog/ca-es/searching.dialog b/dialog/ca-es/searching.dialog
new file mode 100644
index 0000000..6abda75
--- /dev/null
+++ b/dialog/ca-es/searching.dialog
@@ -0,0 +1,3 @@
+Espereu un moment mentre cerco {{query}}
+Permeteu-me cercar sobre {{query}}
+Estic cercant a la Viquipèdia sobre {{query}}
diff --git a/dialog/ca-es/thats all.dialog b/dialog/ca-es/thats all.dialog
new file mode 100644
index 0000000..08e3a79
--- /dev/null
+++ b/dialog/ca-es/thats all.dialog	
@@ -0,0 +1,2 @@
+Això és tot el que en sé
+Això és tot el que n'he trobat
diff --git a/dialog/ca-es/wikipedia_lang.value b/dialog/ca-es/wikipedia_lang.value
new file mode 100644
index 0000000..63e42b8
--- /dev/null
+++ b/dialog/ca-es/wikipedia_lang.value
@@ -0,0 +1,2 @@
+# Codi de llengua de Viquipèdia usat per a fer consultes en la llengua activa
+code,ca
diff --git a/dialog/gl-es/disambiguate.dialog b/dialog/gl-es/disambiguate.dialog
new file mode 100644
index 0000000..af15d4a
--- /dev/null
+++ b/dialog/gl-es/disambiguate.dialog
@@ -0,0 +1,2 @@
+quixeches dicir {{options}}
+gustaríache oír sobre {{options}}
diff --git a/dialog/gl-es/no entry found.dialog b/dialog/gl-es/no entry found.dialog
new file mode 100644
index 0000000..9ab621c
--- /dev/null
+++ b/dialog/gl-es/no entry found.dialog	
@@ -0,0 +1,2 @@
+Non consigo atopar un artigo de Wikipedia relacionado
+Temo que non vai haber ningún artigo sobre isto
diff --git a/dialog/gl-es/or.dialog b/dialog/gl-es/or.dialog
new file mode 100644
index 0000000..d96c19d
--- /dev/null
+++ b/dialog/gl-es/or.dialog
@@ -0,0 +1 @@
+ou
diff --git a/dialog/gl-es/searching.dialog b/dialog/gl-es/searching.dialog
new file mode 100644
index 0000000..8f6183f
--- /dev/null
+++ b/dialog/gl-es/searching.dialog
@@ -0,0 +1,3 @@
+Espero un momento mentres procuro {{query}}
+Déixame procurar {{query}}
+Estou buscando na Wikipedia {{query}}
diff --git a/dialog/gl-es/thats all.dialog b/dialog/gl-es/thats all.dialog
new file mode 100644
index 0000000..e6ab3ee
--- /dev/null
+++ b/dialog/gl-es/thats all.dialog	
@@ -0,0 +1,2 @@
+Isto é todo o que sei
+Isto é todo o que conseguín atopar
diff --git a/dialog/gl-es/wikipedia_lang.value b/dialog/gl-es/wikipedia_lang.value
new file mode 100644
index 0000000..1f16154
--- /dev/null
+++ b/dialog/gl-es/wikipedia_lang.value
@@ -0,0 +1,2 @@
+# Código da linguaxe de Wikipedia usado para atender consultas no idioma activo
+code,gl
diff --git a/dialog/pl-pl/disambiguate.dialog b/dialog/pl-pl/disambiguate.dialog
new file mode 100644
index 0000000..46b67a6
--- /dev/null
+++ b/dialog/pl-pl/disambiguate.dialog
@@ -0,0 +1,2 @@
+czy chodziło Ci o {{options}}
+czy chciałbyś usłyszeć o {{options}}
diff --git a/dialog/pl-pl/no entry found.dialog b/dialog/pl-pl/no entry found.dialog
new file mode 100644
index 0000000..ffd4925
--- /dev/null
+++ b/dialog/pl-pl/no entry found.dialog	
@@ -0,0 +1,2 @@
+Nie mogę znaleźć powiązanego artykułu na Wikipedii
+Boję się, że nie ma żadnego artykułu na ten temat
diff --git a/dialog/pl-pl/or.dialog b/dialog/pl-pl/or.dialog
new file mode 100644
index 0000000..5f914e5
--- /dev/null
+++ b/dialog/pl-pl/or.dialog
@@ -0,0 +1 @@
+albo
diff --git a/dialog/pl-pl/searching.dialog b/dialog/pl-pl/searching.dialog
new file mode 100644
index 0000000..3befad9
--- /dev/null
+++ b/dialog/pl-pl/searching.dialog
@@ -0,0 +1,3 @@
+Daj mi chwilę kiedy będę szukał {{query}}
+Pozwól mi sprawdzić {{query}}
+Szukam w Wikipedii o {{query}}
diff --git a/dialog/pl-pl/thats all.dialog b/dialog/pl-pl/thats all.dialog
new file mode 100644
index 0000000..398207f
--- /dev/null
+++ b/dialog/pl-pl/thats all.dialog	
@@ -0,0 +1,2 @@
+To wszystko co wiem
+To wszystko co znalazłem
diff --git a/dialog/pl-pl/wikipedia_lang.value b/dialog/pl-pl/wikipedia_lang.value
new file mode 100644
index 0000000..4d7a073
--- /dev/null
+++ b/dialog/pl-pl/wikipedia_lang.value
@@ -0,0 +1,2 @@
+# Kod językowy, który Wikipedia stosuje do obsługi zapytań w wybranym języku
+code,pl
diff --git a/dialog/pt-pt/disambiguate.dialog b/dialog/pt-pt/disambiguate.dialog
new file mode 100644
index 0000000..066736b
--- /dev/null
+++ b/dialog/pt-pt/disambiguate.dialog
@@ -0,0 +1,2 @@
+você quis dizer {{options}}
+você gostaria de ouvir sobre {{options}}
diff --git a/dialog/pt-pt/no entry found.dialog b/dialog/pt-pt/no entry found.dialog
new file mode 100644
index 0000000..12149c2
--- /dev/null
+++ b/dialog/pt-pt/no entry found.dialog	
@@ -0,0 +1,2 @@
+Não consigo encontrar um artigo da Wikipedia relacionado
+Não encontro nenhum artigo sobre isso
diff --git a/dialog/pt-pt/or.dialog b/dialog/pt-pt/or.dialog
new file mode 100644
index 0000000..d96c19d
--- /dev/null
+++ b/dialog/pt-pt/or.dialog
@@ -0,0 +1 @@
+ou
diff --git a/dialog/pt-pt/searching.dialog b/dialog/pt-pt/searching.dialog
new file mode 100644
index 0000000..66c46a5
--- /dev/null
+++ b/dialog/pt-pt/searching.dialog
@@ -0,0 +1,3 @@
+Só um momento enquanto eu procuro {{query}}
+Deixe-me procurar {{query}}
+Estou checando a Wikipedia por {{query}} 
diff --git a/dialog/pt-pt/thats all.dialog b/dialog/pt-pt/thats all.dialog
new file mode 100644
index 0000000..9cc64e9
--- /dev/null
+++ b/dialog/pt-pt/thats all.dialog	
@@ -0,0 +1,2 @@
+Isto é tudo que sei
+Isto é tudo que consegui encontrar
diff --git a/dialog/pt-pt/wikipedia_lang.value b/dialog/pt-pt/wikipedia_lang.value
new file mode 100644
index 0000000..aa6512d
--- /dev/null
+++ b/dialog/pt-pt/wikipedia_lang.value
@@ -0,0 +1,2 @@
+# Código da linguagem do Wikipedia usado para atender consultas no idioma ativo
+code,pt-pt
diff --git a/regex/da-dk/article.title.rx b/regex/da-dk/article.title.rx
deleted file mode 100644
index 66659a5..0000000
--- a/regex/da-dk/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|om|wikipedia)(?! (om)) (?P<ArticleTitle>.+)
diff --git a/regex/de-de/article.title.rx b/regex/de-de/article.title.rx
deleted file mode 100644
index dcd1677..0000000
--- a/regex/de-de/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|zu|über|wikipedia)(?! (zu|über)) (?P<ArticleTitle>.+)
diff --git a/regex/el-gr/article.title.rx b/regex/el-gr/article.title.rx
deleted file mode 100644
index 4b56b1e..0000000
--- a/regex/el-gr/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(ψάξε|για|περί|wikipedia)(?! (για|περί)) (?P<ArticleTitle>.+)
diff --git a/regex/en-us/article.title.rx b/regex/en-us/article.title.rx
deleted file mode 100755
index 68f3792..0000000
--- a/regex/en-us/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|for|about|wikipedia)(?! (for|about)) (?P<ArticleTitle>.+)
diff --git a/regex/es-es/article.title.rx b/regex/es-es/article.title.rx
deleted file mode 100644
index 2a0580e..0000000
--- a/regex/es-es/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|de|sobre|wikipedia)(?! (de|sobre)) (?P<ArticleTitle>.+)
diff --git a/regex/es-lm/article.title.rx b/regex/es-lm/article.title.rx
deleted file mode 100644
index 2a0580e..0000000
--- a/regex/es-lm/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|de|sobre|wikipedia)(?! (de|sobre)) (?P<ArticleTitle>.+)
diff --git a/regex/fr-fr/article.title.rx b/regex/fr-fr/article.title.rx
deleted file mode 100644
index 96c6549..0000000
--- a/regex/fr-fr/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|sur|au sujet de|wikipedia)(?! (sur|au sujet)) (?P<ArticleTitle>.+)
diff --git a/regex/it-it/article.title.rx b/regex/it-it/article.title.rx
deleted file mode 100644
index d7415f6..0000000
--- a/regex/it-it/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|per|a proposito di|wikipedia)(?! (per|a proposito di)) (?P<ArticleTitle>.+)
diff --git a/regex/nl-nl/article.title.rx b/regex/nl-nl/article.title.rx
deleted file mode 100644
index 090151e..0000000
--- a/regex/nl-nl/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|voor|over|wikipedia)(?! (over)) (?P<ArticleTitle>.+)
diff --git a/regex/pt-br/article.title.rx b/regex/pt-br/article.title.rx
deleted file mode 100644
index c3440c8..0000000
--- a/regex/pt-br/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|para|sobre|wikipedia)(?! (para|sobre)) (?P<ArticleTitle>.+)
diff --git a/regex/ro-ro/article.title.rx b/regex/ro-ro/article.title.rx
deleted file mode 100644
index b241092..0000000
--- a/regex/ro-ro/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|pentru|despre|wikipedia)(?! (pentru|despre)) (?P<ArticleTitle>.+)
diff --git a/regex/ru-ru/article.title.rx b/regex/ru-ru/article.title.rx
deleted file mode 100644
index 0df900e..0000000
--- a/regex/ru-ru/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(вики|про|для|википедию)(?! (про|для)) (?P<ArticleTitle>.+)
diff --git a/regex/sv-se/article.title.rx b/regex/sv-se/article.title.rx
deleted file mode 100644
index 66659a5..0000000
--- a/regex/sv-se/article.title.rx
+++ /dev/null
@@ -1 +0,0 @@
-.*(wiki|om|wikipedia)(?! (om)) (?P<ArticleTitle>.+)
diff --git a/requirements.txt b/requirements.txt
index 071df88..7f23d4d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-wikipedia==1.4.0
+wikipedia_for_humans
diff --git a/test/behave/steps/wiki.py b/test/behave/steps/wiki.py
deleted file mode 100644
index d43f193..0000000
--- a/test/behave/steps/wiki.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import time 
-
-from behave import then
-
-from mycroft.audio import wait_while_speaking
-
-@then('wait while speaking')
-def handle_wait(context):
-    # add sleep to ensure there is a delay when using a dummy TTS eg CI
-    time.sleep(3)
-    wait_while_speaking()
\ No newline at end of file
diff --git a/test/behave/wiki.feature b/test/behave/wiki.feature
deleted file mode 100644
index 04596ea..0000000
--- a/test/behave/wiki.feature
+++ /dev/null
@@ -1,78 +0,0 @@
-Feature: Wikipedia Skill
-
-  Scenario Outline: user asks a question about a person
-    Given an english speaking user
-     When the user says "<tell me about a person>"
-     Then "skill-wiki" should reply with dialog from "searching.dialog"
-     And wait while speaking
-     And mycroft reply should contain "<person>"
-
-  Examples: user asks a question about a person
-    | tell me about a person | person |
-    | tell me about abraham lincoln | lincoln |
-    | tell me about nelson mandela | mandela |
-    | tell me about queen elizabeth | elizabeth |
-    | tell me about Mahatma Gandhi | gandhi |
-    | tell me about the president of the united states | president |
-    | tell me about the secretary general of the united nations | secretary |
-
-  @xfail
-  Scenario Outline: Failing user asks a question about a person
-    Given an english speaking user
-     When the user says "<tell me about a person>"
-     Then "skill-wiki" should reply with dialog from "searching.dialog"
-     And mycroft reply should contain "<person>"
-
-  Examples: user asks a question about a person
-    | tell me about a person | person |
-    | tell me about George Church | church |
-
-  Scenario Outline: user asks a question about a place
-    Given an english speaking user
-     When the user says "<tell me about a place>"
-     Then "mycroft-wiki" should reply with dialog from "searching.dialog"
-     And wait while speaking
-     And mycroft reply should contain "<place>"
-
-  Examples: user asks a question about a place
-    | tell me about a place | place |
-    | tell me about amsterdam | netherlands |
-    | tell me about tokyo | japan |
-    | tell me about antarctica | pole |
-
-  Scenario Outline: user asks a question about something
-    Given an english speaking user
-     When the user says "<tell me about a thing>"
-     Then "mycroft-wiki" should reply with dialog from "searching.dialog"
-     And wait while speaking
-     And mycroft reply should contain "<thing>"
-
-  Examples: user asks a question about a thing
-    | tell me about a thing | thing |
-    | tell me about sandwiches | sandwich |
-    | tell me about hammers | hammer |
-
-  @xfail
-  # Jira MS-79 https://mycroft.atlassian.net/browse/MS-79
-  Scenario Outline: failing queries
-    Given an english speaking user
-     When the user says "<tell me about failures>"
-     Then "mycroft-wiki" should reply with dialog from "searching.dialog"
-     And mycroft reply should contain "<failure>"
-
-  Examples: failing things
-    | tell me about failures | failure |
-    | tell me about automobiles | automobile |
-
-  Scenario Outline: user asks a question about an idea
-    Given an english speaking user
-     When the user says "<tell me about an idea>"
-     Then "mycroft-wiki" should reply with dialog from "searching.dialog"
-     And wait while speaking
-     And mycroft reply should contain "<idea>"
-
-  Examples: user asks a question about an idea
-    | tell me about an idea | idea |
-    | tell me about philosophy | philosophy |
-    | tell me about politics | politics |
-    | tell me about science | knowledge |
diff --git a/test/intent/01-first_world_war.json b/test/intent/01-first_world_war.json
deleted file mode 100644
index d797a60..0000000
--- a/test/intent/01-first_world_war.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "utterance": "tell me about the first world war",
-  "intent_type": "handle_wiki_query",
-  "intent": {
-    "Wikipedia": "tell me about",
-    "ArticleTitle": "the first world war"
-  }
-}
diff --git a/test/intent/02-random-article.json b/test/intent/02-random-article.json
deleted file mode 100644
index c2cccc8..0000000
--- a/test/intent/02-random-article.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "intent_type": "Random.intent",
-    "utterance": "tell me a random fact"
-}
\ No newline at end of file
diff --git a/ui/WikipediaDelegate.qml b/ui/WikipediaDelegate.qml
deleted file mode 100644
index e12bd25..0000000
--- a/ui/WikipediaDelegate.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.4
-import org.kde.kirigami 2.4 as Kirigami
-import Mycroft 1.0 as Mycroft
-
-Mycroft.Delegate {
-    skillBackgroundSource: sessionData.imgLink
-    
-    Mycroft.PaginatedText {
-         anchors.fill: parent
-         text: sessionData.summary
-         currentIndex: 0
-         horizontalAlignment: Text.AlignHCenter
-         //font.pointSize: Kirigami.Units.gridUnit
-         // HACK TO SET BETTER SIZE ON RESPEAKER IMAGE
-         font.pointSize: Kirigami.Units.smallSpacing * 3
-    }
-}
diff --git a/vocab/ca-es/More.voc b/vocab/ca-es/More.voc
new file mode 100644
index 0000000..72a868f
--- /dev/null
+++ b/vocab/ca-es/More.voc
@@ -0,0 +1,2 @@
+més
+continua|segueix|endavant
diff --git a/vocab/ca-es/Wikipedia.voc b/vocab/ca-es/Wikipedia.voc
new file mode 100644
index 0000000..bc42f64
--- /dev/null
+++ b/vocab/ca-es/Wikipedia.voc
@@ -0,0 +1,6 @@
+wiki|viqui
+wikipèdia|viquipèdia
+(digue|diga|parla|explica|conta)(|'m) (sobre|en quant|en referència)
+(digue|diga|parla|explica|conta)(|'ns) (sobre|en quant|en referència)
+què (diu|explica|hi ha a) la (viquipèdia|wikipedia) (sobre|en quant|en quant a|en referència a|de|del|dels|de la)
+(cerca|busca)(|-ho)
diff --git a/vocab/da-dk/Random.intent b/vocab/da-dk/Random.intent
deleted file mode 100644
index 5f91c33..0000000
--- a/vocab/da-dk/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-fortæl mig noget tilfældigt
-fortæl mig et tilfældigt faktum
-lær mig et tilfældigt faktum
-lær mig noget
-lær mig noget tilfældigt
-lær mig en tilfældig ting
diff --git a/vocab/de-de/Random.intent b/vocab/de-de/Random.intent
deleted file mode 100644
index e090d11..0000000
--- a/vocab/de-de/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-Erzähle mir irgendwas
-Erzähle mir einen zufälligen Fakt
-Bringe mir einen zufälligen Fakt bei
-bringe mir irgendwas bei
-Bringe mir etwas Zufälliges bei
-Erzähle mir eine zufällige Sache
diff --git a/vocab/el-gr/Random.intent b/vocab/el-gr/Random.intent
deleted file mode 100644
index 3217c80..0000000
--- a/vocab/el-gr/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-πες μου κάτι τυχαίο
-πες μου ένα τυχαίο γεγονός
-μάθε μου ένα τυχαίο γεγονός
-μάθε μου κάτι
-μάθε μου κάτι τυχαίο
-πες μου κάτι τυχαίο
diff --git a/vocab/en-us/Random.intent b/vocab/en-us/Random.intent
deleted file mode 100644
index bf1836c..0000000
--- a/vocab/en-us/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-tell me something random
-tell me a random fact
-teach me a random fact
-teach me something
-teach me something random
-tell me a random thing
diff --git a/vocab/es-es/Random.intent b/vocab/es-es/Random.intent
deleted file mode 100644
index daf620b..0000000
--- a/vocab/es-es/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-dime algo al azar
-dime un hecho aleatorio
-enséñame un hecho aleatorio
-enséñame algo
-enséñame algo al azar
-dime algo al azar
diff --git a/vocab/es-lm/Random.intent b/vocab/es-lm/Random.intent
deleted file mode 100644
index daf620b..0000000
--- a/vocab/es-lm/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-dime algo al azar
-dime un hecho aleatorio
-enséñame un hecho aleatorio
-enséñame algo
-enséñame algo al azar
-dime algo al azar
diff --git a/vocab/fr-fr/Random.intent b/vocab/fr-fr/Random.intent
deleted file mode 100644
index ec5baa1..0000000
--- a/vocab/fr-fr/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-apprend moi quelque chose au hasard
-apprends-moi un fait au hasard
-apprends-moi un fait au hasard
-apprend moi quelque chose
-apprend moi quelque chose au hasard
-dis moi quelque chose au hasard
diff --git a/vocab/gl-es/More.voc b/vocab/gl-es/More.voc
new file mode 100644
index 0000000..9737086
--- /dev/null
+++ b/vocab/gl-es/More.voc
@@ -0,0 +1,2 @@
+máis
+continuar
diff --git a/vocab/gl-es/Wikipedia.voc b/vocab/gl-es/Wikipedia.voc
new file mode 100644
index 0000000..28c3fb1
--- /dev/null
+++ b/vocab/gl-es/Wikipedia.voc
@@ -0,0 +1,6 @@
+wiki
+wikipedia
+fálame sobre
+fálanos sobre
+que di a wikipedia sobre
+busca
diff --git a/vocab/it-it/Random.intent b/vocab/it-it/Random.intent
deleted file mode 100644
index eb90a32..0000000
--- a/vocab/it-it/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-dimmi qualcosa di casuale
-dimmi un fatto casuale
-insegnami un fatto casuale
-insegnami qualcosa
-insegnami qualcosa di casuale
-dimmi una cosa a caso
diff --git a/vocab/nl-nl/Random.intent b/vocab/nl-nl/Random.intent
deleted file mode 100644
index 66077c5..0000000
--- a/vocab/nl-nl/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-vertel me iets willekeurigs
-vertel me een willekeurig feit
-leer me een willekeurig feit
-leer me iets
-leer me iets willekeurigs
-vertel me iets willekeurigs
diff --git a/vocab/pl-pl/More.voc b/vocab/pl-pl/More.voc
new file mode 100644
index 0000000..e9f5af7
--- /dev/null
+++ b/vocab/pl-pl/More.voc
@@ -0,0 +1,2 @@
+więcej
+kontynuuj 
diff --git a/vocab/pl-pl/Wikipedia.voc b/vocab/pl-pl/Wikipedia.voc
new file mode 100644
index 0000000..3c20296
--- /dev/null
+++ b/vocab/pl-pl/Wikipedia.voc
@@ -0,0 +1,6 @@
+wiki
+Wikipedia
+powiedz mi o
+powiedz nam o
+co wikipedia mówi o
+znajdź
diff --git a/vocab/pt-br/Random.intent b/vocab/pt-br/Random.intent
deleted file mode 100644
index 1582dda..0000000
--- a/vocab/pt-br/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-me diga alguma coisa aleatória
-me diga um fato aleatório
-me ensine um fato aleatório
-me ensine alguma coisa
-me ensine algo aleatório
-me diga uma coisa aleatória
diff --git a/vocab/pt-pt/More.voc b/vocab/pt-pt/More.voc
new file mode 100644
index 0000000..94db7c8
--- /dev/null
+++ b/vocab/pt-pt/More.voc
@@ -0,0 +1,2 @@
+mais
+continue
diff --git a/vocab/pt-pt/Wikipedia.voc b/vocab/pt-pt/Wikipedia.voc
new file mode 100644
index 0000000..0ef9cba
--- /dev/null
+++ b/vocab/pt-pt/Wikipedia.voc
@@ -0,0 +1,8 @@
+wiki
+wikipedia
+fale-me sobre
+fale-nos sobre
+o que a wikipedia diz sobre
+pesquise
+fala sobre
+diz me sobre
\ No newline at end of file
diff --git a/vocab/ro-ro/Random.intent b/vocab/ro-ro/Random.intent
deleted file mode 100644
index cdb2873..0000000
--- a/vocab/ro-ro/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-spune-mi ceva la întâmplare
-spune-mi un fapt aleatoriu
-învață-mă un fapt aleatoriu
-învață-mă ceva
-învață-mă ceva la întâmplare
-spune-mi un lucru aleatoriu
diff --git a/vocab/ru-ru/Random.intent b/vocab/ru-ru/Random.intent
deleted file mode 100644
index 7d83240..0000000
--- a/vocab/ru-ru/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-расскажи мне что-нибудь
-расскажи мне какой нибудь факт
-научи меня какому нибудь факту
-научи меня чему нибудь
-научи меня чему нибудь случайному
-назови мне случайную вещь
diff --git a/vocab/sv-se/Random.intent b/vocab/sv-se/Random.intent
deleted file mode 100644
index 4317a79..0000000
--- a/vocab/sv-se/Random.intent
+++ /dev/null
@@ -1,6 +0,0 @@
-berätta något slumpmässigt
-berätta en slumpmässig fakta
-lär mig något slumpmässigt
-lär mig något
-lär mig något slumpmässigt
-berätta en slumpmässig sak