diff --git a/data/tools/campaign2wiki.py b/data/tools/campaign2wiki.py
index 590f7de9105..bdac68003ed 100755
--- a/data/tools/campaign2wiki.py
+++ b/data/tools/campaign2wiki.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#-*- coding:utf-8 -*-
+#-*- coding: utf-8 -*-
 
 """
 A script that autogenerates some information about campaigns for the
@@ -24,58 +24,62 @@ class Campaign:
     """
     A class for a specific campaign.
     """
-    def __init__(self, path, wesnoth):
-        """
-        We need wesnoth executable link to parse files.
-        """
-        self.wesnoth = wesnoth
-        self.parser = wmlparser2.Parser(wesnoth, None, None, True)
-        self.parser.parse_file(os.path.join(path, '_main.cfg'))
-        for campaign in self.parser.get_all(tag = 'campaign'):
-            self.name = campaign.get_text_val("name")
-            self.id = campaign.get_text_val("id")
-            self.description = campaign.get_text_val("description")
-            # Difficulty levels are separated by commas, so there are
-            # count(',')+1 difficulty levels.
-            self.levels = campaign.get_text_val("difficulties").count(',') + 1
+    def __init__(self, parser):
+        self.parser = parser
+        self.name = self.parser.get_text_val("name")
+        self.id = self.parser.get_text_val("id")
+        self.description = self.parser.get_text_val("description")
+        # Difficulty levels are separated by commas, so there are
+        # count(',')+1 difficulty levels.
+        self.levels = self.parser.get_text_val("difficulties").count(',') + 1
         self.credits_link = "http://wiki.wesnoth.org/Credits#" + self.id
-        self.scenarios = self.build_scenario_list(path)
-        self.total_scenarios = len(self.scenarios)
-        print self.description
+        #self.scenarios = self.build_scenario_list()
+        #self.total_scenarios = len(self.scenarios)
         # Calculate how many scenarios a player will usually go through
-        self.normal_scenarios = max([int(i.number[:2]) for i in self.scenarios ])
+        #self.normal_scenarios = max([int(i.number[:2]) for i in self.scenarios ])
+        self.total_scenarios = self.normal_scenarios = 0
+
+    def build_scenario_list(self):
+        """
+        Should find a better way to do this
+        """
+        scenarios = glob.glob(os.path.join('data/campaigns', self.name[:5]+ '*', 'scenarios/*.cfg'))
+        print scenarios
+        return [Scenario(self.name, args.wesnoth) for i in scenarios]
 
-    def build_scenario_list(self, path):
-        scenarios = glob.glob(os.path.join(path, 'scenarios/*.cfg'))
-        return [Scenario(i, self.wesnoth) for i in scenarios]
 
 class Scenario:
     """
     A class for a specific scenario
     """
-    def __init__(self, path, wesnoth):
+    def __init__(self, name, wesnoth):
         """
         We need wesnoth executable link to parse files.
         """
-        self.path = path
-        self.parser = wmlparser2.Parser(wesnoth, None, None, True)
+        self.parser = wmlparser2.Parser(wesnoth, None, None, False)
         self.number = self.parser.parse_file(path)
-        for scenario in self.parser.get_all(tag = 'scenario'):
+        for scenario in self.parser.get_all(tag='scenario'):
             self.turns = scenario.get_text_val("turns")
-            self.number = scenario.get_text_val("id", val=0)[:scenario.get_text_val("id", val=0).find('_')]      
+            self.number = scenario.get_text_val("id", val=0)[:scenario.get_text_val("id", val=0).find('_')]
+
 
 def wiki_output(campaign):
     """
     Takes a campaign instance and outputs information in wiki format
     """
-    output = """== {0} ==
+    # Remove Espreon fancy but bug-inducing characters
+    # FIXME: This is not elegant at all, find a better way to do it
+    for i in (u"’", u"—", u'‘'):
+        campaign.name = ''.join(campaign.name.split(i))
+        campaign.description = ''.join(campaign.description.split(i))
+    text = """== {0} ==
 {1}
 Total scenarios : {2}
 Scenarios you will go through : {3}
-Difficulty levels : {4} 
+Difficulty levels : {4}
 * [{5} Credits]
 """.format(campaign.name, campaign.description, campaign.total_scenarios, campaign.normal_scenarios, campaign.levels, campaign.credits_link)
-    return output
+    return text
 
 
 if __name__ == "__main__":
@@ -83,23 +87,19 @@ if __name__ == "__main__":
     arg_parser = argparse.ArgumentParser(description='campaign2wiki is a script\
 which generates information about campaigns for the wiki.')
     arg_parser.add_argument('-d', '--data', default='data/',
-dest='data_dir', help="The location of wesnoth data directory")
+        dest='data_dir', help="The location of wesnoth data directory")
     arg_parser.add_argument('-o', '--output', default='/tmp/CampaignWML',
-dest='output_path', help="The location of the output file.")
+        dest='output_path', help="The location of the output file.")
     arg_parser.add_argument('-w', '--wesnoth', default='./wesnoth',
-dest='wesnoth', help='The wesnoth executable location')
+        dest='wesnoth', help='The wesnoth executable location')
     args = arg_parser.parse_args()
 
-    # TODO:Blacklist : investigate each one of these and see where the issues are
-    blacklist = ['Delfadors_Memoirs', 'Eastern_Invasion', 'Legend_of_Wesmere',
-'Liberty', 'Northern_Rebirth', 'Sceptre_of_Fire', 'Son_Of_The_Black_Eye',
-'The_South_Guard', 'The_Rise_Of_Wesnoth', 'Two_Brothers', 'tutorial']
-    blacklist = ['data/campaigns/' + i for i in blacklist]
     output = ''
-    for campaign in glob.glob(os.path.join(args.data_dir, 'campaigns/*')):
-        if campaign not in blacklist: 
-            a = Campaign(campaign, args.wesnoth)
-            output += wiki_output(a)
+    main = wmlparser2.Parser(args.wesnoth, None, None, False)
+    main.parse_file('data/_main.cfg')
+    for campaign in main.get_all(tag='campaign'):
+        a = Campaign(campaign)
+        output += wiki_output(a)
 
     with open(args.output_path, "w") as wiki_format:
         wiki_format.write(output)