Merge branch 'demo_audit_21_oct' into JC

Conflicts:
	tests/vaulttests.py
	tutorius/vault.py

69 files changed, 4911 insertions, 767 deletions

diff --git a/Workshop.activity/MANIFEST b/Workshop.activity/MANIFEST
new file mode 100644
index 0000000..c5c6d42
--- /dev/null
+++ b/Workshop.activity/MANIFEST
@@ -0,0 +1,5 @@
+TutoriusActivity.py
+activity/someicon.svg
+activity/activity.info
+setup.py
+MANIFEST
diff --git a/Workshop.activity/TutorialStoreCategories.py b/Workshop.activity/TutorialStoreCategories.py
new file mode 100644
index 0000000..2bf843d
--- /dev/null
+++ b/Workshop.activity/TutorialStoreCategories.py
@@ -0,0 +1,28 @@
+import sys, os
+import gtk
+
+class TutorialStoreCategories:
+
+    def __init__(self):
+        categorie_math = gtk.Label('Math (8)')
+        categorie_physics = gtk.Label('Phyisics (16)')
+        categorie_history = gtk.Label('History (32)')
+        categorie_learning = gtk.Label('Learning (53)')
+      
+        categorie_box = gtk.VBox(True, 5)
+        self.categorie_box_frame = gtk.Frame('Categories')
+        self.categorie_box_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        categorie_box.pack_start(categorie_math, True, True, 4)
+        categorie_box.pack_start(categorie_physics, True, True, 4)
+        categorie_box.pack_start(categorie_history, True, True, 4)
+        categorie_box.pack_start(categorie_learning, True, True, 4)
+       
+        self.categorie_box_frame.add(categorie_box)
+
+        categorie_math.show()
+        categorie_physics.show()
+        categorie_history.show()
+        categorie_learning.show()
+        categorie_box.show()
+        self.categorie_box_frame.show()
\ No newline at end of file
diff --git a/Workshop.activity/TutorialStoreDetails.py b/Workshop.activity/TutorialStoreDetails.py
new file mode 100644
index 0000000..67b85d0
--- /dev/null
+++ b/Workshop.activity/TutorialStoreDetails.py
@@ -0,0 +1,74 @@
+import sys, os
+import gtk
+
+class TutorialStoreDetails:
+
+    def __init__(self):
+        tuto_icon = gtk.Image()
+        tuto_icon.set_from_file('icon.svg')
+        
+        full_star_icon1 = gtk.Image()
+        full_star_icon1.set_from_file('full_star.svg')
+        full_star_icon2 = gtk.Image()
+        full_star_icon2.set_from_file('full_star.svg')
+        full_star_icon3 = gtk.Image()
+        full_star_icon3.set_from_file('full_star.svg')
+        
+        grayed_star_icon = gtk.Image()
+        grayed_star_icon.set_from_file('grayed_star.svg')
+        
+        half_star_icon= gtk.Image()
+        half_star_icon.set_from_file('half_star.svg')
+        
+        title_autor_box = gtk.VBox()
+        tuto_title_label = gtk.Label('<Title>')
+        tuto_author_label = gtk.Label('by <Author>')
+        title_autor_box.pack_start(tuto_title_label)
+        title_autor_box.pack_start(tuto_author_label)
+        
+        tuto_descrip_label = gtk.Label('Description 1 : Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.')
+        tuto_descrip_label.set_line_wrap(True)
+        tuto_descrip_label.set_width_chars(50)
+        
+        download_button = gtk.Button('Download')
+        infos_button = gtk.Button('Informations')
+        comp_button = gtk.Button('Compatibility')
+        
+        tutorial_title_bar = gtk.HBox (False, 4)
+        tutorial_title_bar.pack_start(tuto_icon)
+        tutorial_title_bar.pack_start(title_autor_box)
+        tutorial_title_bar.pack_start(full_star_icon1)
+        tutorial_title_bar.pack_start(full_star_icon2)
+        tutorial_title_bar.pack_start(full_star_icon3)
+        tutorial_title_bar.pack_start(half_star_icon)
+        tutorial_title_bar.pack_start(grayed_star_icon)
+        tutorial_button_bar = gtk.HBox(True, 25)
+        tutorial_button_bar.pack_start(download_button)
+        tutorial_button_bar.pack_start(infos_button)
+        tutorial_button_bar.pack_start(comp_button)
+        
+        self.tutorial_store_details = gtk.VBox (False, 5)
+        back_button = gtk.Button('Back')
+        
+        self.tutorial_store_details.pack_start(back_button)
+        self.tutorial_store_details.pack_start(tutorial_title_bar)
+        self.tutorial_store_details.pack_start(tuto_descrip_label)
+        self.tutorial_store_details.pack_start(tutorial_button_bar)
+        
+        
+        tuto_icon.show()
+        full_star_icon1.show()
+        full_star_icon2.show()
+        full_star_icon3.show()
+        grayed_star_icon.show()
+        half_star_icon.show()
+        tuto_title_label.show()
+        tuto_author_label.show()
+        title_autor_box.show()
+        tuto_descrip_label.show()
+        tutorial_title_bar.show()
+        tutorial_button_bar.show()
+        download_button.show()
+        infos_button.show()
+        comp_button.show()
+        self.tutorial_store_details.show()
diff --git a/Workshop.activity/TutorialStoreHome.py b/Workshop.activity/TutorialStoreHome.py
new file mode 100644
index 0000000..8a361dc
--- /dev/null
+++ b/Workshop.activity/TutorialStoreHome.py
@@ -0,0 +1,109 @@
+import logging
+import TutorialStoreCategories
+import TutorialStoreSearch
+import TutorialStoreSuggestion
+import TutorialStoreResults
+import TutorialStoreDetails
+
+import sys, os
+import gtk
+
+class TutorialStoreHome:
+    def log(self,widget,data=None):
+        logging.info('Tutorial Store Home start')
+
+    def __init__(self):
+        
+        self.categories = TutorialStoreCategories.TutorialStoreCategories()
+        categories_frame = self.categories.categorie_box_frame
+        
+        self.search = TutorialStoreSearch.TutorialStoreSearch()
+        tutorial_store_search = self.search.tutorial_store_search
+
+        self.search_button = self.search.search_button_access()
+        
+        self.suggestion = TutorialStoreSuggestion.TutorialStoreSuggestion()
+        
+        tut_store_suggestion = gtk.HBox(homogeneous=True, spacing=5)
+        tut_store_suggestion.pack_start(self.suggestion.top_five_frame, expand=False, fill=False, padding=0)
+        tut_store_suggestion.pack_start(self.suggestion.also_like_frame, expand=False, fill=False, padding=0)
+        
+        self.results = TutorialStoreResults.TutorialStoreResults()
+        
+        tut_store_home_base = gtk.VBox(False, 5)
+        tut_store_home_base.pack_start(tutorial_store_search, False, False, 25)
+        tut_store_home_base.pack_start(tut_store_suggestion, False, False, 0)
+        
+        self.labeltest = gtk.Label('Test')
+        
+        self.tutorial_store_home = gtk.HBox(False, 5)
+        self.tutorial_store_home.pack_start(categories_frame, True, True, 5)
+        self.tutorial_store_home.pack_start(tut_store_home_base, True, True, 5)
+        self.tutorial_store_home.pack_start(tut_store_home_base, True, True, 5)
+        
+        tut_store_suggestion.show()
+        categories_frame.show()
+        tut_store_home_base.show()
+        self.tutorial_store_home.show()
+        
+    def get_search_button(self):
+            
+        return self.search_button
+    
+    def get_more_button(self):
+        return self.suggestion.get_more_button()
+    
+    def get_results_widget(self):
+        
+        self.search = TutorialStoreSearch.TutorialStoreSearch()
+        tutorial_store_search = self.search.tutorial_store_search
+        
+        self.results = TutorialStoreResults.TutorialStoreResults()
+        tutorial_store_results = self.results.tutorial_store_results
+        
+        self.categories = TutorialStoreCategories.TutorialStoreCategories()
+        categories_frame = self.categories.categorie_box_frame
+        
+        tut_store_home_base = gtk.VBox(False, 5)
+        tut_store_home_base.pack_start(tutorial_store_search, False, False, 25)
+        tut_store_home_base.pack_start(tutorial_store_results, False, False, 0)
+        
+        self.tutorial_store_home = gtk.HBox(False, 5)
+        self.tutorial_store_home.pack_start(categories_frame, True, True, 5)
+        self.tutorial_store_home.pack_start(tut_store_home_base, True, True, 5)
+        
+        tut_store_home_base.show()
+        tutorial_store_search.show()
+        tutorial_store_results.show()
+        categories_frame.show()
+        self.tutorial_store_home.show()
+        
+        return self.tutorial_store_home
+    
+    def get_details_widget(self):
+        
+        self.search = TutorialStoreSearch.TutorialStoreSearch()
+        tutorial_store_search = self.search.tutorial_store_search
+        
+        self.details = TutorialStoreDetails.TutorialStoreDetails()
+        tutorial_store_details = self.details.tutorial_store_details
+        
+        self.categories = TutorialStoreCategories.TutorialStoreCategories()
+        categories_frame = self.categories.categorie_box_frame
+        
+        tut_store_home_base = gtk.VBox(False, 5)
+        tut_store_home_base.pack_start(tutorial_store_search, False, False, 25)
+        tut_store_home_base.pack_start(tutorial_store_details, False, False, 0)
+        
+        self.tutorial_store_home = gtk.HBox(False, 5)
+        self.tutorial_store_home.pack_start(categories_frame, True, True, 5)
+        self.tutorial_store_home.pack_start(tut_store_home_base, True, True, 5)
+        
+        tut_store_home_base.show()
+        tutorial_store_search.show()
+        tutorial_store_details.show()
+        categories_frame.show()
+        self.tutorial_store_home.show()
+        
+        return self.tutorial_store_home
+
diff --git a/Workshop.activity/TutorialStoreResults.py b/Workshop.activity/TutorialStoreResults.py
new file mode 100644
index 0000000..0e8e54c
--- /dev/null
+++ b/Workshop.activity/TutorialStoreResults.py
@@ -0,0 +1,124 @@
+import sys, os
+import gtk
+
+class TutorialStoreResults:
+
+    def __init__(self):
+        tuto_icon1 = gtk.Image()
+        tuto_icon1.set_from_file('icon.svg')
+        tuto_icon2 = gtk.Image()
+        tuto_icon2.set_from_file('icon.svg')
+        
+        full_star_icon1 = gtk.Image()
+        full_star_icon1.set_from_file('full_star.svg')
+        full_star_icon2 = gtk.Image()
+        full_star_icon2.set_from_file('full_star.svg')
+        full_star_icon3 = gtk.Image()
+        full_star_icon3.set_from_file('full_star.svg')
+        full_star_icon4 = gtk.Image()
+        full_star_icon4.set_from_file('full_star.svg')
+        full_star_icon5 = gtk.Image()
+        full_star_icon5.set_from_file('full_star.svg')
+        
+        grayed_star_icon1 = gtk.Image()
+        grayed_star_icon1.set_from_file('grayed_star.svg')
+        grayed_star_icon2 = gtk.Image()
+        grayed_star_icon2.set_from_file('grayed_star.svg')
+        grayed_star_icon3 = gtk.Image()
+        grayed_star_icon3.set_from_file('grayed_star.svg')
+        grayed_star_icon4 = gtk.Image()
+        grayed_star_icon4.set_from_file('grayed_star.svg')
+        
+        half_star_icon1= gtk.Image()
+        half_star_icon1.set_from_file('half_star.svg')
+        
+        tuto_title_label1 = gtk.Label('Titre 1')
+        tuto_title_label2 = gtk.Label('Titre 2')
+        
+        tuto_descrip_label1 = gtk.Label('Description 1 : Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.')
+        tuto_descrip_label1.set_line_wrap(True)
+        tuto_descrip_label1.set_width_chars(50)
+        tuto_descrip_label2 = gtk.Label('Description 2 : Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.')
+        tuto_descrip_label2.set_line_wrap(True)
+        tuto_descrip_label2.set_width_chars(50)
+        
+        download_button1 = gtk.Button('Download')
+        download_button2 = gtk.Button('Download')
+        details_button1 = gtk.Button('Details')
+        details_button2 = gtk.Button('Details')
+        
+        show_resuls_label = gtk.Label('Showing results 1-29 of 109')
+        # TODO : Probably must be something else than a label, or find a way to listen to click event on label ...
+        next_results_label = gtk.Label('< 1 2 3 4 >')
+        
+        tutorial_title_bar1 = gtk.HBox (False, 0)
+        tutorial_title_bar1.pack_start(tuto_icon1)
+        tutorial_title_bar1.pack_start(tuto_title_label1)
+        tutorial_title_bar1.pack_start(full_star_icon1)
+        tutorial_title_bar1.pack_start(full_star_icon2)
+        tutorial_title_bar1.pack_start(full_star_icon3)
+        tutorial_title_bar1.pack_start(grayed_star_icon1)
+        tutorial_title_bar1.pack_start(grayed_star_icon2)
+        
+        tutorial_button_bar1 = gtk.HBox(True, 25)
+        tutorial_button_bar1.pack_start(download_button1)
+        tutorial_button_bar1.pack_start(details_button1)
+        
+        tutorial1 = gtk.VBox (False, 5)
+        tutorial1.pack_start(tutorial_title_bar1)
+        tutorial1.pack_start(tuto_descrip_label1)
+        tutorial1.pack_start(tutorial_button_bar1)
+        
+        tutorial_title_bar2 = gtk.HBox (False, 5)
+        tutorial_title_bar2.pack_start(tuto_icon2)
+        tutorial_title_bar2.pack_start(tuto_title_label2)
+        tutorial_title_bar2.pack_start(full_star_icon4)
+        tutorial_title_bar2.pack_start(full_star_icon5)
+        tutorial_title_bar2.pack_start(half_star_icon1)
+        tutorial_title_bar2.pack_start(grayed_star_icon3)
+        tutorial_title_bar2.pack_start(grayed_star_icon4)
+        
+        tutorial_button_bar2 = gtk.HBox(True, 55)
+        tutorial_button_bar2.pack_start(download_button2)
+        tutorial_button_bar2.pack_start(details_button2)
+        
+        tutorial2 = gtk.VBox (False, 5)
+        tutorial2.pack_start(tutorial_title_bar2)
+        tutorial2.pack_start(tuto_descrip_label2)
+        tutorial2.pack_start(tutorial_button_bar2)
+        
+        self.tutorial_store_results = gtk.VBox(False, 10)
+        self.tutorial_store_results.pack_start(tutorial1, True, True, 10)
+        self.tutorial_store_results.pack_start(tutorial2, True, True, 10)
+        self.tutorial_store_results.pack_start(show_resuls_label)
+        self.tutorial_store_results.pack_start(next_results_label)
+        
+        tuto_icon1.show()
+        tuto_icon2.show()
+        full_star_icon1.show()
+        full_star_icon2.show()
+        full_star_icon3.show()
+        full_star_icon4.show()
+        full_star_icon5.show()
+        grayed_star_icon1.show()
+        grayed_star_icon2.show()
+        grayed_star_icon3.show()
+        grayed_star_icon4.show()
+        half_star_icon1.show()
+        tuto_title_label1.show()
+        tuto_title_label2.show()
+        tuto_descrip_label1.show()
+        tuto_descrip_label2.show()
+        download_button1.show()
+        download_button2.show()
+        details_button1.show()
+        details_button2.show()
+        show_resuls_label.show()
+        next_results_label.show()
+        tutorial_title_bar1.show()
+        tutorial_title_bar2.show()
+        tutorial_button_bar1.show()
+        tutorial_button_bar2.show()
+        tutorial1.show()
+        tutorial2.show()
+        self.tutorial_store_results.show()
\ No newline at end of file
diff --git a/Workshop.activity/TutorialStoreSearch.py b/Workshop.activity/TutorialStoreSearch.py
new file mode 100644
index 0000000..1663f80
--- /dev/null
+++ b/Workshop.activity/TutorialStoreSearch.py
@@ -0,0 +1,33 @@
+import sys, os
+import gtk
+
+class TutorialStoreSearch:
+
+    def __init__(self):
+        search_label = gtk.Label('Search :')
+        search_box = gtk.Entry(400)
+        in_label = gtk.Label('in')
+        search_combobox = gtk.combo_box_new_text()
+        search_combobox.insert_text(0, 'all Categories (109)')
+        search_combobox.insert_text(1, 'Math (8)')
+        search_combobox.insert_text(2, 'Physics (16)')
+        search_combobox.insert_text(3, 'History (32)')
+        search_combobox.insert_text(4, 'Learning (53)')
+        self.search_button = gtk.Button('Search')
+        
+        self.tutorial_store_search = gtk.HBox(False, 5)
+        self.tutorial_store_search.pack_start(search_label, True, True, 5)
+        self.tutorial_store_search.pack_start(search_box, True, True, 5)
+        self.tutorial_store_search.pack_start(in_label, True, True, 5)
+        self.tutorial_store_search.pack_start(search_combobox, True, True, 5)
+        self.tutorial_store_search.pack_start(self.search_button, True, True, 5)
+        
+        search_label.show()
+        search_box.show()
+        in_label.show()
+        search_combobox.show()
+        self.search_button.show()
+        self.tutorial_store_search.show()
+        
+    def search_button_access(self):
+        return self.search_button
\ No newline at end of file
diff --git a/Workshop.activity/TutorialStoreSuggestion.py b/Workshop.activity/TutorialStoreSuggestion.py
new file mode 100644
index 0000000..9164ca0
--- /dev/null
+++ b/Workshop.activity/TutorialStoreSuggestion.py
@@ -0,0 +1,139 @@
+import sys, os
+import gtk
+
+class TutorialStoreSuggestion:
+
+    def __init__(self):
+        
+        tutorial1 = gtk.HBox(homogeneous=True, spacing=0)
+        tutorial2 = gtk.HBox(homogeneous=True, spacing=0)
+        tutorial3 = gtk.HBox(homogeneous=True, spacing=0)
+        tutorial4 = gtk.HBox(homogeneous=True, spacing=0)
+        tutorial5 = gtk.HBox(homogeneous=True, spacing=0)
+        tutorial6 = gtk.HBox(homogeneous=True, spacing=0)
+        
+        icon1 = gtk.Image()
+        icon1.set_from_file('icon.svg')
+        icon2 = gtk.Image()
+        icon2.set_from_file('icon.svg')
+        icon3 = gtk.Image()
+        icon3.set_from_file('icon.svg')
+        icon4 = gtk.Image()
+        icon4.set_from_file('icon.svg')
+        icon5 = gtk.Image()
+        icon5.set_from_file('icon.svg')
+        icon6 = gtk.Image()
+        icon6.set_from_file('icon.svg')
+        
+        label1 = gtk.Label('Tuto 1')
+        label2 = gtk.Label('Tuto 2')
+        label3 = gtk.Label('Tuto 3')
+        
+        label4 = gtk.Label('Tuto 4')
+        label5 = gtk.Label('Tuto 5')
+        label6 = gtk.Label('Tuto 6')
+        
+        self.more_button1 = gtk.Button('More')
+        more_button2 = gtk.Button('More')
+        more_button3 = gtk.Button('More')
+        more_button4 = gtk.Button('More')
+        more_button5 = gtk.Button('More')
+        more_button6 = gtk.Button('More')
+        
+        tutorial1.pack_start(icon1, expand=True, fill=True, padding=4)
+        tutorial1.pack_start(label1, expand=True, fill=True, padding=0)
+        tutorial1.pack_start(self.more_button1, expand=False, fill=False, padding=5)
+        tutorial1_frame = gtk.Frame()
+        tutorial1_frame.add(tutorial1)
+        tutorial1_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        tutorial2.pack_start(icon2, expand=True, fill=True, padding=4)
+        tutorial2.pack_start(label2, expand=True, fill=True, padding=0)
+        tutorial2.pack_start(more_button2, expand=False, fill=False, padding=5)
+        tutorial2_frame = gtk.Frame()
+        tutorial2_frame.add(tutorial2)
+        tutorial2_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        tutorial3.pack_start(icon3, expand=True, fill=True, padding=4)
+        tutorial3.pack_start(label3, expand=True, fill=True, padding=0)
+        tutorial3.pack_start(more_button3, expand=False, fill=False, padding=5)
+        tutorial3_frame = gtk.Frame()
+        tutorial3_frame.add(tutorial3)
+        tutorial3_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        tutorial4.pack_start(icon4, expand=True, fill=True, padding=4)
+        tutorial4.pack_start(label4, expand=True, fill=True, padding=0)
+        tutorial4.pack_start(more_button4, expand=False, fill=False, padding=5)
+        tutorial4_frame = gtk.Frame()
+        tutorial4_frame.add(tutorial4)
+        tutorial4_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        tutorial5.pack_start(icon5, expand=True, fill=True, padding=4)
+        tutorial5.pack_start(label5, expand=True, fill=True, padding=0)
+        tutorial5.pack_start(more_button5, expand=False, fill=False, padding=5)
+        tutorial5_frame = gtk.Frame()
+        tutorial5_frame.add(tutorial5)
+        tutorial5_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        tutorial6.pack_start(icon6, expand=True, fill=True, padding=4)
+        tutorial6.pack_start(label6, expand=True, fill=True, padding=0)
+        tutorial6.pack_start(more_button6, expand=False, fill=False, padding=5)
+        tutorial6_frame = gtk.Frame()
+        tutorial6_frame.add(tutorial6)
+        tutorial6_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+        
+        top_five = gtk.VBox(homogeneous=True, spacing=0)
+        self.top_five_frame = gtk.Frame('Top 5 Most Popular')
+##        top_five_frame.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0,0))
+
+        top_five.pack_start(tutorial1_frame, expand=True, fill=True, padding=0)
+        top_five.pack_start(tutorial2_frame, expand=True, fill=True, padding=0)
+        top_five.pack_start(tutorial3_frame, expand=True, fill=True, padding=0)
+        
+        also_like = gtk.VBox(homogeneous=True, spacing=0)
+        self.also_like_frame = gtk.Frame('You might also like :')
+
+        also_like.pack_start(tutorial4_frame, expand=True, fill=True, padding=0)
+        also_like.pack_start(tutorial5_frame, expand=True, fill=True, padding=0)
+        also_like.pack_start(tutorial6_frame, expand=True, fill=True, padding=0)
+
+        self.top_five_frame.add(top_five)
+        self.also_like_frame.add(also_like)
+        
+        label1.show()
+        label2.show()
+        label3.show()
+        label4.show()
+        label5.show()
+        label6.show()
+        icon1.show()
+        icon2.show()
+        icon3.show()
+        icon4.show()
+        icon5.show()
+        icon6.show()
+        self.more_button1.show()
+        more_button2.show()
+        more_button3.show()
+        more_button4.show()
+        more_button5.show()
+        more_button6.show()
+        tutorial1_frame.show()
+        tutorial2_frame.show()
+        tutorial3_frame.show()
+        tutorial4_frame.show()
+        tutorial5_frame.show()
+        tutorial6_frame.show()
+        tutorial1.show()
+        tutorial2.show()
+        tutorial3.show()
+        tutorial4.show()
+        tutorial5.show()
+        tutorial6.show()
+        top_five.show()
+        self.top_five_frame.show()
+        also_like.show()
+        self.also_like_frame.show()
+        
+    def get_more_button(self):
+        return self.more_button1
\ No newline at end of file
diff --git a/Workshop.activity/TutoriusActivity.py b/Workshop.activity/TutoriusActivity.py
new file mode 100755
index 0000000..b262a9f
--- /dev/null
+++ b/Workshop.activity/TutoriusActivity.py
@@ -0,0 +1,77 @@
+from sugar.activity import activity
+import TutorialStoreHome
+from Workshop import WorkshopView
+import logging
+
+import sys, os
+import gtk
+from dialogs import LoginDialog
+
+class TutoriusActivity(activity.Activity):
+    def hello(self,widget,data=None):
+        logging.info('Hello world')
+        
+    def callback(self, widget, button_string):
+        
+        if button_string == 'search_button':
+            self.right_container.remove(self.tutorial_store_home.tutorial_store_home)
+        
+            results_widget = self.tutorial_store_home.get_results_widget()
+        
+            self.right_container.pack_start(results_widget)
+        
+            results_widget.show()
+            self.right_container.show()
+            
+        elif button_string == 'more_button':
+            self.right_container.remove(self.tutorial_store_home.tutorial_store_home)
+        
+            details_widget = self.tutorial_store_home.get_details_widget()
+        
+            self.right_container.pack_start(details_widget)
+        
+            details_widget.show()
+            self.right_container.show()
+
+    def __init__(self,handle):
+        print "running activity init", handle
+        activity.Activity.__init__(self,handle)
+        print "actiity running"
+
+        toolbox = activity.ActivityToolbox(self)
+        self.set_toolbox(toolbox)
+        toolbox.show()
+
+        self.table = gtk.HPaned()
+        self.table.set_position(100)
+        self.left_container = gtk.VBox()
+        btn1 = gtk.Button("My tutorials")
+        btn2 = gtk.Button("Tutorial Store")
+        btn3 = gtk.Button("test button")
+
+        self.left_container.pack_start(btn1,expand=False)
+        self.left_container.pack_start(btn2,expand=False)
+        self.tutorial_store_home = TutorialStoreHome.TutorialStoreHome()
+        
+        tutorial_store_search_button = self.tutorial_store_home.get_search_button()
+        tutorial_store_search_button.connect("clicked", self.callback, 'search_button')
+        
+        tutorial_store_more_button = self.tutorial_store_home.get_more_button()
+        tutorial_store_more_button.connect("clicked", self.callback, 'more_button')
+        
+        self.right_container = gtk.VBox()
+        #self.right_container.pack_start(self.tutorial_store_home.tutorial_store_home)
+        
+        self.workshop = WorkshopView()
+
+        self.table.add1(self.left_container)
+        self.table.add2(self.workshop)
+        self.set_canvas(self.table)
+        btn3.show()
+        btn1.show()
+        btn2.show()
+        self.left_container.show()
+        self.workshop.show()
+        self.table.show()
+        
+        print "AT THE END OF THE CLASS" 
diff --git a/Workshop.activity/Workshop.py b/Workshop.activity/Workshop.py
new file mode 100644
index 0000000..1ca6be2
--- /dev/null
+++ b/Workshop.activity/Workshop.py
@@ -0,0 +1,285 @@
+import gtk
+
+from WorkshopListItem import WorkshopListItem,Rating
+from WorkshopModel import WorkshopModel
+from WorkshopController import WorkshopController
+
+class WorkshopView(gtk.Alignment):
+    def __init__(self):
+        gtk.Alignment.__init__(self,0.0,0.0,1.0,1.0)
+        self.model = WorkshopModel(self)
+        self.controller = WorkshopController(self,self.model)
+        
+        self.mainView = WorkshopMain(self.controller)
+        self.detailView = WorkshopDetail(None,self.controller)
+
+        self.add(self.mainView)
+        
+        self.mainView.show()
+        self.detailView.show()
+        
+        self.controller.tutorial_query(None,None)
+        
+    def set_tutorial_list(self,tutorial_list):
+        """
+        Set the list of tutorial to display in the main View
+        Refresh the View
+
+        @param tutorial_list the list of tutorial
+        """
+        self.mainView.set_tutorial_list(tutorial_list)
+
+
+    def change_sorting(self,sorting_key):
+        """
+        Sort the list of tutorial base on the sorting_key
+
+        @param sorting_key the tutorial metadata to use to sort the tutorials
+        """
+        self.mainView.change_sorting(sorting_key)
+
+    def refresh_tutorial_info(self):
+        """
+        Tell the view to refresh the content of the tutorial list because some info have changed
+
+        Call this function when information about tutorial have changed, but the tutorial to display are the same
+        """
+        pass
+
+    def toggle_tutorial_publish(self,tutorial,published):
+        """
+        Change the publish/unpublish status of the tutorial on the view
+
+        @param tutorial the tutorial to change the status
+        @param published True if the tutorial is published, False if not
+        """
+        pass
+    
+    def display_detail(self,tutorial):
+        """
+        Displays the detail view of a tutorial
+
+        @param tutorial the tutorial to display
+        """
+        self.mainView.hide()
+        self.remove(self.mainView)
+        print tutorial.name
+        self.detailView = WorkshopDetail(tutorial,self.controller)
+        self.add(self.detailView)
+        self.detailView.show()
+
+    def display_main_view(self):
+        """
+        Displays the main view of the Workshop
+        """
+        self.detailView.hide()
+        self.remove(self.detailView)
+        self.add(self.mainView)
+        self.mainView.show()
+
+    def display_info_dialog(self,tutorial):
+        """
+        Displays the infos dialog on a tutorial
+
+        @param tutorial the tutorial to edit
+        """
+        pass
+
+class WorkshopMain(gtk.VBox):
+    def __init__(self,controller):
+        gtk.VBox.__init__(self,False,10)
+
+        self.controller = controller
+
+        self.set_border_width(10)
+        self.search_bar = SearchBar(self.controller)
+        self.pack_start(self.search_bar,False,False)
+
+        sep = gtk.HSeparator()
+        self.pack_start(sep,False,False)
+        self.main_container = gtk.ScrolledWindow()
+        self.main_container.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
+
+        self.list_container= gtk.VBox()
+
+        self.main_container.add_with_viewport(self.list_container)
+        self.pack_start(self.main_container)
+
+        self.search_bar.show()
+        self.list_container.show()
+        self.main_container.show()
+        sep.show()
+        self.tutorial_list = []
+        self.sorting_key = 'Name'
+        
+
+    def change_sorting(self,sorting):
+        self.sorting_key = sorting
+        self.sort_tutorial()
+    
+    def sort_tutorial(self):
+        self.tutorial_list.sort(lambda x, y:
+        cmp(str(getattr(x,self.sorting_key.lower())).lower(),str(getattr(y,self.sorting_key.lower())).lower()))
+        self.refresh_tutorial_display()
+        
+    def set_tutorial_list(self,tutorial_list):
+        self.tutorial_list = tutorial_list
+        self.sort_tutorial()
+        
+    def refresh_tutorial_display(self):
+        for child in self.list_container.get_children():
+            self.list_container.remove(child)
+        for tuto in self.tutorial_list:
+            item = WorkshopListItem(tuto,self.controller)
+            self.list_container.pack_start(item)
+            item.show()
+
+class SearchBar(gtk.HBox):
+    def __init__(self,controller):
+        gtk.HBox.__init__(self,False,10)
+        self.set_border_width(5)
+        self.controller = controller
+
+        self.search_entry = gtk.Entry(400)
+        self.search_button = gtk.Button("Go")
+        self.separator = gtk.VSeparator()
+        self.sort_label = gtk.Label("Sort by")
+        self.sort_combo = gtk.combo_box_new_text()
+        self.sort_combo.insert_text(0,"Name")
+        self.sort_combo.insert_text(1,"Rating")
+        self.sort_combo.set_active(0)
+        self.selected_sorting = self.sort_combo.get_active_text()
+
+        self.pack_start(self.search_entry,padding=5)
+        self.pack_start(self.search_button,False,False,padding=10)
+        self.pack_start(self.separator,False,False,padding=10)
+        self.pack_start(self.sort_label,False,False,padding=5)
+        self.pack_start(self.sort_combo,)
+
+        self.search_entry.show()
+        self.search_button.show()
+        self.separator.show()
+        self.sort_label.show()
+        self.sort_combo.show()
+        
+        self.search_button.connect("clicked",self.controller.tutorial_query,self.search_entry.get_text())
+        self.sort_combo.connect("changed",self.controller.sort_selection_changed,None)
+        
+    def get_sorting(self):
+        return self.selected_sorting
+
+    sorting = property(get_sorting)
+    
+    
+
+class WorkshopDetail(gtk.VBox):
+    def __init__(self,tutorial,controller):
+        if tutorial is None:
+            return
+        
+        self.title_text = '<span size="xx-large">%(title)s</span>'
+        self.author_text = '<span size="large">by %(author)s</span>'
+        self.desc_text = 'Description: %(description)s'
+        self.controller = controller
+        gtk.VBox.__init__(self,False,10)
+        self.set_border_width(10)
+        
+        first_row = gtk.HBox(False)
+        back_image = gtk.Image()
+        back_image.set_from_file('arrow_back.png')
+        self.back_button = gtk.Button("Back")
+        self.back_button.set_image(back_image)
+
+        first_row.pack_start(self.back_button,False,False)
+
+        second_row = gtk.HBox(False)
+        icon = gtk.Image()
+        icon.set_from_file('icon.svg')
+
+        label_holder = gtk.VBox(False,10)
+
+        self.title_label = gtk.Label(tutorial.name)
+        self.title_label.set_alignment(0.0,0.5)
+        self.author_label = gtk.Label(tutorial.author)
+        self.author_label.set_alignment(0.05,0.5)
+
+        label_holder.pack_start(self.title_label)
+        label_holder.pack_start(self.author_label)
+
+        self.rating = Rating(tutorial.rating)
+
+        second_row.pack_start(icon,False,False)
+        second_row.pack_start(label_holder)
+        second_row.pack_end(self.rating,False,False)
+
+        self.desc_view = gtk.TextView()
+        self.desc_buff = gtk.TextBuffer()
+        self.desc_buff.set_text(tutorial.description)
+        self.desc_view.set_buffer(self.desc_buff)
+        self.desc_view.set_editable(False)
+        self.desc_view.set_wrap_mode(gtk.WRAP_WORD)
+        self.desc_view.set_cursor_visible(False)
+        self.desc_view.connect("realize",self.realize_cb,None)
+        self.desc_view.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("gray") )
+
+        fourth_row = gtk.HBox(False,15)
+        self.launch_button = gtk.Button('Launch')
+        self.launch_button.get_child().set_markup(self.title_text %{"title":"Launch"})
+        self.edit_button = gtk.Button('Edit')
+        self.edit_button.get_child().set_markup(self.title_text %{"title":"Edit"})
+        self.update_button = gtk.Button('Update')
+        self.update_button.get_child().set_markup(self.title_text %{"title":"Update"})
+        self.info_button = gtk.Button('Infos')
+        self.info_button.get_child().set_markup(self.title_text %{"title":"Infos"})
+        self.delete_button = gtk.Button('Delete')
+        self.delete_button.get_child().set_markup(self.title_text %{"title":"Delete"})
+
+        fourth_row.pack_start(self.launch_button,False,False)
+        fourth_row.pack_start(self.edit_button,False,False)
+        fourth_row.pack_start(self.update_button,False,False)
+        fourth_row.pack_start(self.info_button,False,False)
+        fourth_row.pack_end(self.delete_button,False,False)
+
+        fifth_row = gtk.HBox(False,15)
+        self.publish_button = gtk.Button('')
+        self.publish_button.get_child().set_markup(self.title_text %{"title":"Publish"})
+        self.unpublish_button = gtk.Button('')
+        self.unpublish_button.get_child().set_markup(self.title_text %{"title":"Unpublish"})
+
+        fifth_row.pack_start(self.publish_button,False,False)
+        fifth_row.pack_start(self.unpublish_button,False,False)
+
+        self.pack_start(first_row,False,False)
+        self.pack_start(second_row,False,False)
+        self.pack_start(self.desc_view)
+        self.pack_end(fifth_row,False,False)
+        self.pack_end(fourth_row,False,False)
+
+
+        self.back_button.show()
+        first_row.show()
+        self.title_label.show()
+        self.author_label.show()
+        self.rating.show()
+        label_holder.show()
+        second_row.show()
+        icon.show()
+        self.desc_view.show()
+        self.launch_button.show()
+        self.edit_button.show()
+        self.update_button.show()
+        self.info_button.show()
+        self.delete_button.show()
+        fourth_row.show()
+        
+        self.publish_button.show()
+        self.unpublish_button.show()
+        fifth_row.show()
+
+        self.title_label.set_markup(self.title_text % {"title":tutorial.name})
+        self.author_label.set_markup(self.author_text % {"author":tutorial.author})
+        
+        self.back_button.connect("clicked",self.controller.back_pressed,None)
+
+    def realize_cb(self,widget,data=None):
+        widget.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.LEFT_PTR))
\ No newline at end of file
diff --git a/Workshop.activity/WorkshopController.py b/Workshop.activity/WorkshopController.py
new file mode 100644
index 0000000..ba192cf
--- /dev/null
+++ b/Workshop.activity/WorkshopController.py
@@ -0,0 +1,119 @@
+"""
+WorkshopController
+
+This module handles user action from the workshop view
+
+"""
+import logging
+from WorkshopModel import Tutorial
+class WorkshopController():
+    def __init__(self,view,model):
+        self.view = view
+        self.model = model
+
+    def tutorial_query(self,widget,keyword):
+        """
+        Handles query from the view
+
+        @param widget the widget that sent the query
+        @param keyword the keyword for the query, empty to get all tutorials
+        """
+        self.model.query(keyword)
+
+    def sort_selection_changed(self,widget,data):
+        """
+        Handles selection changes in the sorting selection
+
+        @param widget the widget that sent the query
+        @param sort the property to use to sort tutorial
+        """
+        sorting = widget.get_active_text()
+        self.view.change_sorting(sorting)
+        
+
+    def launch_tutorial_triggered(self,widget,tutorial):
+        """
+        Handles start tutorial action
+
+        @param widget the widget that triggered the action
+        @param tutorial the tutorial to launch
+        """
+        pass
+
+    def show_details(self,widget,tutorial):
+        """
+        show the details for a tutorial
+
+        @param widget the widget that made the call
+        @param tutorial the tutorial to 
+        """
+        self.view.display_detail(tutorial)
+
+    def back_pressed(self,widget,data):
+        """
+        When in detail view, go back to general view
+
+        @param widget the widget that made the call
+        @param data not used
+        """
+        self.view.display_main_view()
+
+    def rate_tutorial(self,widget,data):
+        """
+        Change the rating for a tutorial
+
+        @param widget the widget that made the call
+        @param data a tuple (tutorial,new_rating)
+        """
+        pass
+
+    def edit_tutorial(self,widget,tutorial):
+        """
+        Edit the tutorial in the detail view
+
+        @param widget the widget that made the call
+        @param tutorial the tutorial to edit
+        """
+        pass
+
+    def update_tutorial(self,widget,tutorial):
+        """
+        Need to know what this do
+        """
+        pass
+
+    def info_tutorial(self,widget,tutorial):
+        """
+        Edit the infos about the tutorial
+
+        @param widget the widget that made the call
+        @param tutorial the tutorial to edit
+        """
+        pass
+
+    def delete_tutorial(self,widget,tutorial):
+        """
+        Delete a tutorial
+
+        @param widget the widget that made the call
+        @param tutorial the tutorial to delete
+        """
+        self.model.delete_tutorial(tutorial)
+
+    def publish_tutorial(self,widget,tutorial):
+        """
+        Publish a tutorial
+
+        @param widget the widget that made the call
+        @param tutorial the tutorial to publish
+        """
+        self.model.publish_tutorial(tutorial)
+
+    def unpublish_tutorial(self,widget,tutorial):
+        """
+        Unpublish a tutorial
+
+        @param widget the widget that made the call
+        @param tutorial the tutorial to unpublish
+        """
+        self.model.unpublish_tutorial(tutorial)
diff --git a/Workshop.activity/WorkshopListItem.py b/Workshop.activity/WorkshopListItem.py
new file mode 100644
index 0000000..0828f2c
--- /dev/null
+++ b/Workshop.activity/WorkshopListItem.py
@@ -0,0 +1,78 @@
+import gtk
+
+class WorkshopListItem(gtk.Alignment):
+    def __init__(self,tutorial,controller):
+        gtk.Alignment.__init__(self,0.0,0.0,1.0,1.0)
+        self.tutorial = tutorial
+        self.controller = controller
+        
+        self.title_text = '<span size="xx-large">%(title)s</span>'
+        self.table = gtk.Table(3,3,False)
+        
+        self.lbl_title = gtk.Label('')
+        self.lbl_desc = gtk.Label(tutorial.description)
+        self.lbl_desc.set_line_wrap(True)
+        self.btn_launch = gtk.Button('Launch')
+        launch_align= gtk.Alignment(0.0,1.0,0.0,0.0)
+        launch_align.add(self.btn_launch)
+        self.btn_details = gtk.Button('Details')
+        self.icon = gtk.Image()
+        self.icon.set_from_file('icon.svg')
+        self.rating = Rating(tutorial.rating)
+
+        self.table.attach(self.icon,0,1,0,1,0,0)
+        self.table.attach(self.lbl_title,1,2,0,1,yoptions=0)
+        self.table.attach(self.lbl_desc,1,2,1,2,xoptions=gtk.FILL,yoptions=gtk.EXPAND)
+        self.table.attach(launch_align,1,2,2,3,gtk.FILL)
+        self.table.attach(self.btn_details,2,3,2,3,0,0)
+        self.table.attach(self.rating,2,3,0,2,0,0)
+
+        self.table.set_row_spacing(1,10)
+
+        self.lbl_title.set_alignment(0.0,0.5)
+        self.lbl_title.set_markup(self.title_text % {'title':tutorial.name})
+        self.lbl_desc.set_alignment(0.0,0.5)
+
+        self.table.show()
+        self.icon.show()
+        self.lbl_title.show()
+        launch_align.show()
+        self.lbl_desc.show()
+        self.btn_launch.show()
+        self.btn_details.show()
+        self.rating.show()
+
+        self.add(self.table)
+        
+        self.btn_details.connect("clicked",self.controller.show_details,self.tutorial)
+
+class Rating(gtk.HBox):
+    def __init__(self,rating):
+        gtk.HBox.__init__(self,False,4)
+        value = rating
+        self.stars = [0,0,0,0,0]
+        for x in range(5):
+            if value -1 > 0:
+                self.stars[x]=1
+            elif value -1 == -0.5:
+                self.stars[x] = 0.5
+                break
+            else:
+                self.stars[x]=1
+                break
+            value -= 1
+        self.prepare_image()
+    
+    def prepare_image(self):
+        for x in self.stars:
+            if x == 0:
+                filename='grayed_star.png'
+            elif x == 0.5:
+                filename='half_star.png'
+            elif x == 1:
+                filename='full_star.png'
+            image = gtk.Image()
+            image.set_from_file(filename)
+            self.pack_start(image)
+            image.show()
+            
diff --git a/Workshop.activity/WorkshopModel.py b/Workshop.activity/WorkshopModel.py
new file mode 100644
index 0000000..ebc5579
--- /dev/null
+++ b/Workshop.activity/WorkshopModel.py
@@ -0,0 +1,162 @@
+"""
+WorkshopModel
+
+This module is the model of the Workshop Activity
+"""
+
+from sugar.tutorius.vault import *
+
+class WorkshopModel():
+    def __init__(self,view):
+        self.view = view
+
+    def query(self,keyword):
+        """
+        Query the vault for tutorial that are linked with the keyword
+        Update the currently managed tutorials and notifies the view that the managed tutorials have changed
+
+        @param keyword the keyword for the query
+        """
+##        t1 = Tutorial({'name':'tuto 1',"description":"This is the description","rating":5})
+##        t2 = Tutorial({'name':'tuto 2',"description":"This is the description of another","rating":4})
+##        t3 = Tutorial({'name':'tuto 3',"description":"This is the description oh the last","rating":3})
+##        t4 = Tutorial({'name':'tuto 4',"description":"This is the description oh the last","rating":1})
+##        t5 = Tutorial({'name':'tuto 5',"description":"This is the description oh the last","rating":1})
+##        t6 = Tutorial({'name':'tuto 6',"description":"This is the description oh the last","rating":1})
+##        t7 = Tutorial({'name':'tuto 7',"description":"This is the description oh the last","rating":1})
+##        tutorial_list = [t1,t2,t3,t4,t5,t6,t7]
+
+        vault_return = Vault.query()
+        tutorial_list = []
+        for tuto in vault_return:
+            tutorial_list.append(Tutorial(tuto))
+            
+        self.view.set_tutorial_list(tutorial_list)
+
+    def delete_tutorial(self,tutorial):
+        """
+        Delete a tutorial and updated the currently managed tutorials
+        Notifies the view that the manages tutorials have changed
+
+        @param tutorial the tutorial to delete
+        """
+        pass
+
+    def update_tutorial_infos(self,tutorial, new_infos):
+        """
+        Updates the metadata on a tutorial and updates the currently managed tutorials
+        Notifies the view tha the managed tutorials have changed
+
+        @param tutorial the tutorial to update
+        @param new_infos a dictionnary of the new informations i.e. {"title":"tut1","author":"Max Power"}
+        """
+        pass
+
+    def publish_tutorial(self,tutorial):
+        """
+        Publishes a tutorial
+
+        Details to come
+        """
+        pass
+
+    def unpublish_tutorial(self,tutorial):
+        """
+        Unpublishes a tutorial
+
+        Details to come
+        """
+        pass
+
+
+class Tutorial():
+    """
+    Wrapper for tutorial metadata
+    """
+    def __init__(self,metadata_dict):
+        self.__original_dict = metadata_dict
+        self.__update_dict = metadata_dict
+
+        if 'name' in self.__original_dict:
+            self.__name = self.__original_dict['name']
+        else:
+            self.__description = name
+
+        if 'description' in self.__original_dict:
+            self.__description = self.__original_dict['description']
+        else:
+            self.__description = None
+
+        if 'author' in self.__original_dict:
+            self.__author = self.__original_dict['author']
+        else:
+            self.__author = None
+
+        if 'rating' in self.__original_dict:
+            self.__rating = self.__original_dict['rating']
+        else:
+            self.__rating = 0 
+
+        if 'publish_state' in self.__original_dict:
+            self.__published_state = self.__original_dict['publish_state']
+        else:
+            self.__published_state = None
+
+        if 'guid' in self.__original_dict:
+            self.__id = self.__original_dict['guid']
+        else:
+            self.__id = None
+
+    def get_name(self):
+        return self.__name
+    
+    def set_name(self,name):
+        self.__name = name
+
+    def get_description(self):
+        return self.__description
+
+    def set_description(self,description):
+        self.__description = description
+        self.__update_dict['Description'] = description
+
+    def get_author(self):
+        return self.__author
+
+    def set_author(self,author):
+        self.__author = author
+        self.__update_dict['Author'] = author
+
+    def get_rating(self):
+        return self.__rating
+
+    def set_rating(self,rating):
+        self.__rating = rating
+        self.__update_dict['Rating'] = rating
+
+    def get_published_state(self):
+        return self.__published_state
+
+    def set_published_state(self,published_state):
+        self.__published_state = published_state
+        self.__update_dict['PublishedState'] = published_state
+
+    def get_id(self):
+        return self.__id
+
+    def set_id(self,id):
+        self.__id = id
+        self.__update_dict['TutorialId'] = id
+
+    def get_updated_metadata(self):
+        return self.__update_dict
+
+    name = property(get_name,set_name)
+    description = property(get_description,set_description)
+    author = property(get_author,set_author)
+    rating = property(get_rating,set_rating)
+    published_state = property(get_published_state,set_published_state)
+    id = property(get_id,set_id)
+    updated_metadata = property(get_updated_metadata)
+
+
diff --git a/Workshop.activity/activity/activity.info b/Workshop.activity/activity/activity.info
new file mode 100644
index 0000000..02dbee1
--- /dev/null
+++ b/Workshop.activity/activity/activity.info
@@ -0,0 +1,8 @@
+[Activity]
+name = Tutorius
+bundle_id = org.laptop.TutoriusActivity
+class = TutoriusActivity.TutoriusActivity
+icon = someicon
+activity_version = 1
+host_version = 1
+show_launcher = yes
diff --git a/Workshop.activity/activity/someicon.svg b/Workshop.activity/activity/someicon.svg
new file mode 100644
index 0000000..bb28f04
--- /dev/null
+++ b/Workshop.activity/activity/someicon.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?><!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000000">
+	<!ENTITY fill_color "#ffffff">
+]><svg height="55px" id="svg2393" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.47pre1 r21720" sodipodi:docname="tutortool.svg" sodipodi:version="0.32" version="1.1" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs2395">
+    <inkscape:perspective id="perspective2401" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" sodipodi:type="inkscape:persp3d"/>
+  </defs>
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="3.7661233" inkscape:cy="33.132055" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="675" inkscape:window-maximized="0" inkscape:window-width="1057" inkscape:window-x="108" inkscape:window-y="45" inkscape:zoom="3.9590209" pagecolor="#ffffff" showgrid="true"/>
+  <metadata id="metadata2398">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1" transform="translate(0,23)">
+    <path d="m 38.01548,1.5478747 c 0,7.1837999 -7.3667,13.0141283 -16.443525,13.0141283 -2.269208,0 -8.124729,3.152936 -13.9608513,4.252763 C 13.382177,14.110994 11.434521,11.926642 9.9463815,10.748864 6.9701032,8.3933076 5.1284282,5.1397735 5.1284282,1.5478747 c 0,-7.1837994 7.3666998,-13.0141297 16.4435268,-13.0141297 9.076825,0 16.443525,5.8303303 16.443525,13.0141297 z" id="path2403" sodipodi:nodetypes="cscsssc" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.96931934;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
+    <path d="m 50.150276,6.4721386 c 0,2.621116 -1.428036,4.9953144 -3.735846,6.7142344 -1.153905,0.85946 -1.824287,2.434433 1.398853,6.784273 -6.258422,-3.991066 -8.65379,-4.001712 -10.413335,-4.001712 -7.03818,0 -12.750327,-4.254565 -12.750327,-9.4967954 0,-5.2422321 5.712147,-9.4967971 12.750327,-9.4967971 7.038182,0 12.750328,4.254565 12.750328,9.4967971 z" id="path3175" sodipodi:nodetypes="cccsssc" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.96931934;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Workshop.activity/arrow_back.png b/Workshop.activity/arrow_back.png
new file mode 100644
index 0000000..8263674
--- /dev/null
+++ b/Workshop.activity/arrow_back.png
diff --git a/Workshop.activity/dialogs.py b/Workshop.activity/dialogs.py
new file mode 100644
index 0000000..1cf135d
--- /dev/null
+++ b/Workshop.activity/dialogs.py
@@ -0,0 +1,139 @@
+import gtk
+
+class LoginDialog(gtk.Dialog):
+	def __init__(self):
+		gtk.Dialog.__init__(self,"Login",None,gtk.DIALOG_MODAL)
+		ok_button = gtk.Button("Login")
+		ok_button.connect("clicked",self.ok_clicked,None)
+		ok_button.show()
+		self.action_area.pack_start(ok_button)
+		self.add_button("Cancel",gtk.RESPONSE_REJECT)
+		self.set_resizable(False)
+		self.prepare_dialog()
+
+
+	def prepare_dialog(self):
+		self.user_line = gtk.HBox(False,10)
+		self.pass_line = gtk.HBox(False,10)
+		self.register_line = gtk.HBox(False)
+		self.remember_line = gtk.HBox(False)
+
+		self.username_lbl = gtk.Label("Username:")
+		self.username_entry = gtk.Entry()
+		self.username_entry.set_width_chars(40)
+
+		self.password_lbl = gtk.Label("Password:")
+		self.password_entry = gtk.Entry()
+		self.password_entry.set_visibility(False)
+		self.password_entry.set_width_chars(40)
+
+		self.register_me = gtk.LinkButton("","Register Now!")
+		self.not_registered = gtk.Label("Not Registered? ")
+
+		self.remember_user = gtk.CheckButton("Remember my username",False)
+
+		self.register_me.connect("clicked",self.click_link,None)
+
+		self.user_line.pack_start(self.username_lbl,False)
+		self.user_line.pack_end(self.username_entry,False)
+		
+		self.pass_line.pack_start(self.password_lbl,False)
+		self.pass_line.pack_end(self.password_entry,False)
+
+		self.register_line.pack_end(self.register_me,False)
+		self.register_line.pack_end(self.not_registered,False)
+
+		self.remember_line.pack_start(self.remember_user,False,padding=80)
+
+		self.vbox.pack_start(self.register_line,False)
+		self.vbox.pack_start(self.user_line,False,padding=10)
+		self.vbox.pack_start(self.pass_line,False,padding=10)
+		self.vbox.pack_start(self.remember_line,False)
+
+		self.vbox.show()
+		self.user_line.show()
+		self.pass_line.show()
+		self.register_line.show()
+		self.remember_line.show()
+		
+		self.username_lbl.show()
+		self.username_entry.show()
+
+		self.password_lbl.show()
+		self.password_entry.show()
+		
+		self.register_me.show()
+		self.not_registered.show()
+
+		self.remember_user.show()
+
+	def ok_clicked(self,widget,data=None):
+		self.response(gtk.RESPONSE_ACCEPT)
+
+	def click_link(self,widget,data=None):
+		self.register_dialog = RegisterDialog()
+		self.register_dialog.run()
+		self.register_dialog.destroy()
+
+class RegisterDialog(gtk.Dialog):
+	def __init__(self):
+		gtk.Dialog.__init__(self,"Register",None,gtk.DIALOG_MODAL)
+		ok_button = gtk.Button("Register")
+		ok_button.connect("clicked",self.ok_clicked,None)
+		ok_button.show()
+		self.action_area.pack_start(ok_button)
+		self.add_button("Cancel",gtk.RESPONSE_REJECT)
+		self.set_resizable(False)
+		self.create_content()
+	
+	def ok_clicked(self,widget,data=None):
+		self.response(gtk.RESPONSE_ACCEPT)
+
+	def create_content(self):
+		entry_length = 40
+		table = gtk.Table(10,4,False)
+		labels = ["Email address","Name","Username","Password","Confirmation","Location","Web Site"]
+		required=[True,True,True,True,True,False,False]
+		hidden=[False,False,False,True,True,False,False]
+		for x in range(6):
+			lbl = gtk.Label(labels[x]+":")
+			entry = gtk.Entry()
+			entry.set_width_chars(entry_length)
+			table.attach(lbl,0,1,x,x+1,xpadding=10)
+			table.attach(entry,1,2,x,x+1,ypadding=10)
+			if hidden[x]:
+				entry.set_visibility(False)
+			if required[x]:
+				required_lbl = gtk.Label("*")
+				table.attach(required_lbl,2,3,x,x+1)
+				required_lbl.show()
+			lbl.set_alignment(0.0,0.5)
+			lbl.show()
+			entry.show()
+
+
+		if_required = gtk.Label("		* Required Field")
+		table.attach(if_required,3,4,0,1)
+		
+		under_13 = gtk.CheckButton("I am 13 years old or younger",False)
+		legal = gtk.CheckButton("I have read the",False)
+		legal_notices=gtk.LinkButton('',"legal notices")
+		and_lbl = gtk.Label("and")
+		privacy = gtk.LinkButton('',"privacy statement")
+		hbox = gtk.HBox(False,0)
+		hbox.pack_start(legal)
+		hbox.pack_start(legal_notices)
+		hbox.pack_start(and_lbl)
+		hbox.pack_start(privacy)
+
+		table.attach(under_13,1,2,7,8)
+		table.attach(hbox,1,2,8,9)
+		under_13.show()
+		legal.show()
+		legal_notices.show()
+		and_lbl.show()
+		privacy.show()
+		hbox.show()
+		if_required.show()
+		table.show()
+		self.vbox.pack_start(table)
diff --git a/Workshop.activity/full_star.png b/Workshop.activity/full_star.png
new file mode 100644
index 0000000..9f7d095
--- /dev/null
+++ b/Workshop.activity/full_star.png
diff --git a/Workshop.activity/grayed_star.png b/Workshop.activity/grayed_star.png
new file mode 100644
index 0000000..7f8b1e1
--- /dev/null
+++ b/Workshop.activity/grayed_star.png
diff --git a/Workshop.activity/half_star.png b/Workshop.activity/half_star.png
new file mode 100644
index 0000000..48ebae3
--- /dev/null
+++ b/Workshop.activity/half_star.png
diff --git a/Workshop.activity/icon.svg b/Workshop.activity/icon.svg
new file mode 100644
index 0000000..bb28f04
--- /dev/null
+++ b/Workshop.activity/icon.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?><!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000000">
+	<!ENTITY fill_color "#ffffff">
+]><svg height="55px" id="svg2393" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.47pre1 r21720" sodipodi:docname="tutortool.svg" sodipodi:version="0.32" version="1.1" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs2395">
+    <inkscape:perspective id="perspective2401" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" sodipodi:type="inkscape:persp3d"/>
+  </defs>
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="3.7661233" inkscape:cy="33.132055" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="675" inkscape:window-maximized="0" inkscape:window-width="1057" inkscape:window-x="108" inkscape:window-y="45" inkscape:zoom="3.9590209" pagecolor="#ffffff" showgrid="true"/>
+  <metadata id="metadata2398">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1" transform="translate(0,23)">
+    <path d="m 38.01548,1.5478747 c 0,7.1837999 -7.3667,13.0141283 -16.443525,13.0141283 -2.269208,0 -8.124729,3.152936 -13.9608513,4.252763 C 13.382177,14.110994 11.434521,11.926642 9.9463815,10.748864 6.9701032,8.3933076 5.1284282,5.1397735 5.1284282,1.5478747 c 0,-7.1837994 7.3666998,-13.0141297 16.4435268,-13.0141297 9.076825,0 16.443525,5.8303303 16.443525,13.0141297 z" id="path2403" sodipodi:nodetypes="cscsssc" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.96931934;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
+    <path d="m 50.150276,6.4721386 c 0,2.621116 -1.428036,4.9953144 -3.735846,6.7142344 -1.153905,0.85946 -1.824287,2.434433 1.398853,6.784273 -6.258422,-3.991066 -8.65379,-4.001712 -10.413335,-4.001712 -7.03818,0 -12.750327,-4.254565 -12.750327,-9.4967954 0,-5.2422321 5.712147,-9.4967971 12.750327,-9.4967971 7.038182,0 12.750328,4.254565 12.750328,9.4967971 z" id="path3175" sodipodi:nodetypes="cccsssc" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.96931934;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Workshop.activity/setup.py b/Workshop.activity/setup.py
new file mode 100755
index 0000000..f95b630
--- /dev/null
+++ b/Workshop.activity/setup.py
@@ -0,0 +1,3 @@
+#! /usr/bin/env python
+from sugar.activity import bundlebuilder
+bundlebuilder.start()
diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py
index a859ef8..2bd2d31 100644
--- a/addons/bubblemessage.py
+++ b/addons/bubblemessage.py
@@ -13,31 +13,34 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-from sugar.tutorius.actions import *
+from sugar.tutorius.actions import Action, DragWrapper
+from sugar.tutorius.properties import TStringProperty, TArrayProperty
+from sugar.tutorius import overlayer
+from sugar.tutorius.services import ObjectStore
 
 class BubbleMessage(Action):
     message = TStringProperty("Message")
     # Create the position as an array of fixed-size 2
-    position = TArrayProperty([0,0], 2, 2)
+    position = TArrayProperty((0,0), 2, 2)
     # Do the same for the tail position
-    tail_pos = TArrayProperty([0,0], 2, 2)
+    tail_pos = TArrayProperty((0,0), 2, 2)
 
-    def __init__(self, message=None, pos=None, speaker=None, tailpos=None):
+    def __init__(self, message=None, position=None, speaker=None, tail_pos=None):
         """
         Shows a dialog with a given text, at the given position on the screen.
 
         @param message A string to display to the user
-        @param pos A list of the form [x, y]
+        @param position A list of the form [x, y]
         @param speaker treeish representation of the speaking widget
-        @param tailpos The position of the tail of the bubble; useful to point to
+        @param tail_pos The position of the tail of the bubble; useful to point to
         specific elements of the interface
         """
         Action.__init__(self)
 
-        if pos:
-            self.position = pos
-        if tailpos:
-            self.tail_pos = tailpos
+        if position:
+            self.position = position
+        if tail_pos:
+            self.tail_pos = tail_pos
         if message:
             self.message = message
 
@@ -94,7 +97,7 @@ class BubbleMessage(Action):
 
     def exit_editmode(self, *args):
         x,y = self._drag.position
-        self.position = [int(x), int(y)]
+        self.position = (int(x), int(y))
         if self._drag:
             self._drag.draggable = False
             self._drag = None
diff --git a/addons/chainaction.py b/addons/chainaction.py
new file mode 100644
index 0000000..43c4fa4
--- /dev/null
+++ b/addons/chainaction.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.actions import * 
+
+class ChainAction(Action):
+    actions = TAddonListProperty()
+
+    """Utility class to allow executing actions in a specific order"""
+    def __init__(self, actions=[]):
+        """ChainAction(action1, ... ) builds a chain of actions"""
+        Action.__init__(self)
+        self.actions = actions
+
+    def do(self,**kwargs):
+        """do() each action in the chain"""
+        for act in self.actions:
+            act.do(**kwargs)
+
+    def undo(self):
+        """undo() each action in the chain, starting with the last"""
+        for act in reversed(self.actions):
+            act.undo()
+
+__action__ = {
+    'name': 'ChainAction',
+    'display_name' : 'Chain of actions',
+    'icon' : 'chain',
+    'class' : ChainAction,
+    'mandatory_props' : ['actions']
+}
diff --git a/addons/clickaction.py b/addons/clickaction.py
new file mode 100644
index 0000000..828dd75
--- /dev/null
+++ b/addons/clickaction.py
@@ -0,0 +1,52 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius import gtkutils
+from sugar.tutorius.actions import *
+
+class ClickAction(Action):
+    """                
+    Action that simulate a click on a widget    
+    Work on any widget that implements a clicked() method
+                       
+    @param widget The threehish representation of the widget
+    """                
+    widget = TStringProperty("")
+    def __init__(self, widget):
+        Action.__init__(self)
+        self.widget = widget
+                       
+    def do(self):      
+        """            
+        click the widget
+        """
+        realWidget = gtkutils.find_widget(ObjectStore().activity, self.widget)
+        if hasattr(realWidget, "clicked"):
+            realWidget.clicked()
+        
+    def undo(self):
+        """
+        No undo
+        """
+        pass
+
+__action__ = {
+    'name' : 'ClickAction',
+    'display_name' : 'Click',
+    'icon' : 'format-justify-center',
+    'class' : ClickAction,
+    'mandatory_props' : ['widget'] 
+}
diff --git a/addons/dialogmessage.py b/addons/dialogmessage.py
index 22a223b..f15f256 100644
--- a/addons/dialogmessage.py
+++ b/addons/dialogmessage.py
@@ -20,21 +20,21 @@ from sugar.tutorius.actions import *
 
 class DialogMessage(Action):
     message = TStringProperty("Message")
-    position = TArrayProperty([0, 0], 2, 2)
+    position = TArrayProperty((0, 0), 2, 2)
 
-    def __init__(self, message=None, pos=None):
+    def __init__(self, message=None, position=None):
         """
         Shows a dialog with a given text, at the given position on the screen.
 
         @param message A string to display to the user
-        @param pos A list of the form [x, y]
+        @param position A list of the form [x, y]
         """
         super(DialogMessage, self).__init__()
         self._dialog = None
         
         if message:
             self.message = message
-        if pos: self.position = pos
+        if position: self.position = position
 
     def do(self):
         """
diff --git a/addons/disablewidget.py b/addons/disablewidget.py
new file mode 100644
index 0000000..ce3f235
--- /dev/null
+++ b/addons/disablewidget.py
@@ -0,0 +1,59 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.actions import *
+from sugar.tutorius import gtkutils
+from sugar.tutorius.services import ObjectStore
+
+class DisableWidgetAction(Action):
+    target = TStringProperty("0")
+
+    def __init__(self, target):
+        """Constructor
+        @param target target treeish
+        """
+        Action.__init__(self)
+        if target is not None:
+            self.target = target
+        self._widget = None
+
+    def do(self):
+        """Action do"""
+        os = ObjectStore()
+        if os.activity:
+            self._widget = gtkutils.find_widget(os.activity, self.target)
+            if self._widget:
+                # If we have an object whose sensitivity we can query, we will
+                # keep it to reset it in the undo() method  
+                if hasattr(self._widget, 'get_sensitive') and callable(self._widget.get_sensitive):
+                    self._previous_sensitivity = self._widget.get_sensitive()
+                self._widget.set_sensitive(False)
+                       
+    def undo(self):    
+        """Action undo"""
+        if self._widget:
+            if hasattr(self, '_previous_sensitivity'):
+                self._widget.set_sensitive(self._previous_sensitivity)
+            else:
+                self._widget.set_sensitive(True)
+
+__action__ = {
+    'name' : 'DisableWidgetAction',
+    'display_name' : 'Disable Widget',
+    'icon' : 'stop',
+    'class' : DisableWidgetAction,
+    'mandatory_props' : ['target']
+}
diff --git a/addons/gtkwidgeteventfilter.py b/addons/gtkwidgeteventfilter.py
index cbfb00c..5497af4 100644
--- a/addons/gtkwidgeteventfilter.py
+++ b/addons/gtkwidgeteventfilter.py
@@ -13,8 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-from sugar.tutorius.filters import *
-from sugar.tutorius.properties import *
+from sugar.tutorius.filters import EventFilter
+from sugar.tutorius.properties import TUAMProperty, TStringProperty
+from sugar.tutorius.gtkutils import find_widget
 
 class GtkWidgetEventFilter(EventFilter):
     """
@@ -23,13 +24,12 @@ class GtkWidgetEventFilter(EventFilter):
     object_id = TUAMProperty()
     event_name = TStringProperty("clicked")
 
-    def __init__(self, next_state=None, object_id=None, event_name=None):
+    def __init__(self, object_id=None, event_name=None):
         """Constructor
-        @param next_state default EventFilter param, passed on to EventFilter
         @param object_id object fqdn-style identifier
         @param event_name event to attach to
         """
-        super(GtkWidgetEventFilter,self).__init__(next_state)
+        super(GtkWidgetEventFilter,self).__init__()
         self._callback = None
         self.object_id = object_id
         self.event_name = event_name
diff --git a/addons/gtkwidgettypefilter.py b/addons/gtkwidgettypefilter.py
new file mode 100644
index 0000000..816a754
--- /dev/null
+++ b/addons/gtkwidgettypefilter.py
@@ -0,0 +1,100 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.filters import *
+from sugar.tutorius.properties import *
+from sugar.tutorius.services import ObjectStore
+from sugar.tutorius.gtkutils import find_widget
+
+import logging
+logger = logging.getLogger("GtkWidgetTypeFilter")
+
+class GtkWidgetTypeFilter(EventFilter):
+    """
+    Event Filter that listens for keystrokes on a widget
+    """
+    object_id = TStringProperty("")
+    text = TStringProperty("")
+    strokes = TArrayProperty([])
+
+    def __init__(self, object_id, text=None, strokes=None):
+        """Constructor
+        @param next_state default EventFilter param, passed on to EventFilter
+        @param object_id object tree-ish identifier
+        @param text resulting text expected
+        @param strokes list of strokes expected
+
+        At least one of text or strokes must be supplied
+        """
+        super(GtkWidgetTypeFilter, self).__init__()
+        self.object_id = object_id
+        self.text = text
+        self._captext = ""
+        self.strokes = strokes
+        self._capstrokes = []
+        self._widget = None
+        self._handler_id = None
+
+    def install_handlers(self, callback, **kwargs):
+        """install handlers
+        @param callback default EventFilter callback arg
+        """
+        super(GtkWidgetTypeFilter, self).install_handlers(callback, **kwargs)
+        logger.debug("~~~GtkWidgetTypeFilter install")
+        activity = ObjectStore().activity
+        if activity is None:
+            logger.error("No activity")
+            raise RuntimeWarning("no activity in the objectstore")
+
+        self._widget = find_widget(activity, self.object_id)
+        if self._widget:
+            self._handler_id= self._widget.connect("key-press-event",self.__keypress_cb)
+            logger.debug("~~~Connected handler %d on %s" % (self._handler_id,self.object_id) )
+
+    def remove_handlers(self):
+        """remove handlers"""
+        super(GtkWidgetTypeFilter, self).remove_handlers()
+        #if an event was connected, disconnect it
+        if self._handler_id:
+            self._widget.handler_disconnect(self._handler_id)
+            self._handler_id=None
+
+    def __keypress_cb(self, widget, event, *args):
+        """keypress callback"""
+        logger.debug("~~~keypressed!")
+        key = event.keyval
+        keystr = event.string
+        logger.debug("~~~Got key: " + str(key) + ":"+ keystr)
+        self._capstrokes += [key]
+        #TODO Treat other stuff, such as arrows
+        if key == gtk.keysyms.BackSpace:
+            self._captext = self._captext[:-1]
+        else:
+            self._captext = self._captext + keystr
+
+        logger.debug("~~~Current state: " + str(self._capstrokes) + ":" + str(self._captext))
+        if not self.strokes is None and self.strokes in self._capstrokes:
+            self.do_callback()
+        if not self.text is None and self.text in self._captext:
+            self.do_callback()
+
+__event__ = {
+    'name' : 'GtkWidgetTypeFilter',
+    'display_name' : 'Widget Filter',
+    'icon' : '',
+    'class' : GtkWidgetTypeFilter,
+    'mandatory_props' : ['next_state', 'object_id']
+}
diff --git a/addons/oncewrapper.py b/addons/oncewrapper.py
new file mode 100644
index 0000000..97f4752
--- /dev/null
+++ b/addons/oncewrapper.py
@@ -0,0 +1,59 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.actions import *
+
+class OnceWrapper(Action):
+    """
+    Wraps a class to perform an action once only
+
+    This ConcreteActions's do() method will only be called on the first do()
+    and the undo() will be callable after do() has been called
+    """
+
+    action = TAddonProperty()
+
+    def __init__(self, action):
+        Action.__init__(self)
+        self._called = False
+        self._need_undo = False
+        self.action = action
+
+    def do(self):
+        """
+        Do the action only on the first time
+        """
+        if not self._called:
+            self._called = True
+            self.action.do()
+            self._need_undo = True
+
+    def undo(self):
+        """
+        Undo the action if it's been done
+        """
+        if self._need_undo:
+            self.action.undo()
+            self._need_undo = False
+
+
+__action__ = {
+    'name' : 'OnceWrapper',
+    'display_name' : 'Execute an action only once',
+    'icon' : 'once_wrapper',
+    'class' : OnceWrapper,
+    'mandatory_props' : ['action'] 
+}
diff --git a/addons/readfile.py b/addons/readfile.py
new file mode 100644
index 0000000..0d276b9
--- /dev/null
+++ b/addons/readfile.py
@@ -0,0 +1,56 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+
+from sugar.tutorius.actions import Action
+from sugar.tutorius.properties import TFileProperty
+from sugar.tutorius.services import ObjectStore
+
+class ReadFile(Action):
+    filename = TFileProperty(None)
+
+    def __init__(self, filename=None):
+        """
+        Calls activity.read_file to restore a specified state to an activity
+        like when restored from the journal.
+        @param filename Path to the file to read
+        """
+        Action.__init__(self)
+
+        if filename:
+            self.filename=filename
+
+    def do(self):
+        """
+        Perform the action, call read_file on the activity
+        """
+        if os.path.isfile(str(self.filename)):
+            ObjectStore().activity.read_file(self.filename)
+
+    def undo(self):
+        """
+        Not undoable
+        """
+        pass
+
+__action__ = {
+    "name" : "ReadFile",
+    "display_name" : "Read File",
+    "icon" : "message-bubble", #FIXME
+    "class" : ReadFile,
+    "mandatory_props" : ["filename"]
+}
diff --git a/addons/timerevent.py b/addons/timerevent.py
new file mode 100644
index 0000000..c7374d0
--- /dev/null
+++ b/addons/timerevent.py
@@ -0,0 +1,73 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import gobject
+
+from sugar.tutorius.filters import EventFilter
+from sugar.tutorius.properties import TIntProperty
+
+class TimerEvent(EventFilter):
+    """
+    TimerEvent is a special EventFilter that uses gobject
+    timeouts to trigger a state change after a specified amount
+    of time. It must be used inside a gobject main loop to work.
+    """
+    timeout = TIntProperty(15, 0)
+
+    def __init__(self, timeout=None):
+        """Constructor.
+
+        @param timeout timeout in seconds
+        """
+        super(TimerEvent,self).__init__()
+        if timeout:
+            self.timeout = timeout
+        self._handler_id = None
+
+    def install_handlers(self, callback, **kwargs):
+        """install_handlers creates the timer and starts it"""
+        super(TimerEvent,self).install_handlers(callback, **kwargs)
+        #Create the timer
+        self._handler_id = gobject.timeout_add_seconds(self.timeout, self._timeout_cb)
+
+    def remove_handlers(self):
+        """remove handler removes the timer"""
+        super(TimerEvent,self).remove_handlers()
+        if self._handler_id:
+            try:
+                #XXX What happens if this was already triggered?
+                #remove the timer
+                gobject.source_remove(self._handler_id)
+            except:
+                pass
+
+    def _timeout_cb(self):
+        """
+        _timeout_cb triggers the eventfilter callback.
+
+        It is necessary because gobject timers only stop if the callback they
+        trigger returns False
+        """
+        self.do_callback()
+        return False #Stops timeout
+
+__event__ = {
+    "name" : "TimerEvent",
+    "display_name" : "Timed transition",
+    "icon" : "clock",
+    "class" : TimerEvent,
+    "mandatory_props" : ["timeout"]
+}
diff --git a/addons/triggereventfilter.py b/addons/triggereventfilter.py
new file mode 100644
index 0000000..acc0d0d
--- /dev/null
+++ b/addons/triggereventfilter.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.filters import *
+from sugar.tutorius.properties import *
+
+class TriggerEventFilter(EventFilter):
+    """
+    This event filter can be triggered by simply calling its do_callback function.
+    
+    Used to fake events and see the effect on the FSM.
+    """
+    def __init__(self):
+        EventFilter.__init__(self)
+        self.toggle_on_callback = False
+    
+    def install_handlers(self, callback, **kwargs):
+        """
+        Forsakes the incoming callback function and just set the inner one.
+        """
+        self._callback = self._inner_cb
+    
+    def _inner_cb(self, event_filter):
+        self.toggle_on_callback = not self.toggle_on_callback
+
+__event__ = {
+    'name' : 'TriggerEventFilter',
+    'display_name' : 'Triggerable event filter (test only)',
+    'icon' : '',
+    'class' : TriggerEventFilter,
+    'mandatory_props' : ['next_state'],
+    'test' : True
+}
diff --git a/addons/typetextaction.py b/addons/typetextaction.py
new file mode 100644
index 0000000..fee66e5
--- /dev/null
+++ b/addons/typetextaction.py
@@ -0,0 +1,57 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.actions import *
+from sugar.tutorius import gtkutils
+
+class TypeTextAction(Action):
+    """                
+    Simulate a user typing text in a widget
+    Work on any widget that implements a insert_text method
+                       
+    @param widget The treehish representation of the widget
+    @param text the text that is typed
+    """                
+    widget = TStringProperty("")
+    text = TStringProperty("")
+
+    def __init__(self, widget, text):
+        Action.__init__(self)
+                       
+        self.widget = widget
+        self.text = text
+                       
+    def do(self, **kwargs):
+        """            
+        Type the text  
+        """            
+        widget = gtkutils.find_widget(ObjectStore().activity, self.widget)
+        if hasattr(widget, "insert_text"):
+            widget.insert_text(self.text, -1)
+                       
+    def undo(self):    
+        """            
+        no undo        
+        """            
+        pass           
+
+__action__ = {
+    'name' : 'TypeTextAction',
+    'display_name' : 'Type text',
+    'icon' : 'format-justify-center',
+    'class' : TypeTextAction,
+    'mandatory_props' : ['widgetUAM', 'text'] 
+}
diff --git a/addons/widgetidentifyaction.py b/addons/widgetidentifyaction.py
new file mode 100644
index 0000000..3c66211
--- /dev/null
+++ b/addons/widgetidentifyaction.py
@@ -0,0 +1,47 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from sugar.tutorius.actions import *
+
+from sugar.tutorius.editor import WidgetIdentifier
+
+class WidgetIdentifyAction(Action):
+    def __init__(self):
+        Action.__init__(self)
+        self.activity = None
+        self._dialog = None
+
+    def do(self):
+        os = ObjectStore()
+        if os.activity:
+            self.activity = os.activity
+
+            self._dialog = WidgetIdentifier(self.activity)
+            self._dialog.show()
+
+
+    def undo(self):
+        if self._dialog:
+            self._dialog.destroy()
+
+__action__ = {
+    "name" : 'WidgetIdentifyAction',
+    "display_name" : 'Widget Identifier',
+    "icon" : 'viewmag1',
+    "class" : WidgetIdentifyAction,
+    "mandatory_props" : [],
+    'test' : True
+}
diff --git a/data/icons/chain.svg b/data/icons/chain.svg
new file mode 100644
index 0000000..e268f4f
--- /dev/null
+++ b/data/icons/chain.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2597"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="chain.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2599">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective2605" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="33.017737"
+     inkscape:cy="33.013898"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="645"
+     inkscape:window-height="726"
+     inkscape:window-x="625"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata2602">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       d="M 9.8339096,17.521424 L 11.225374,16.510468 L 21.895596,24.262843 L 20.957347,27.150437 L 19.395745,28.285012 L 20.561807,24.696201 L 11.225374,17.912898 L 10.202552,18.656048 L 9.8339096,17.521424 z M 21.057049,9.3673619 L 31.727272,1.6149871 L 42.397446,9.3673619 L 39.590553,18.005887 L 38.62545,17.304719 L 41.063657,9.8007699 L 31.727272,3.0174177 L 22.390838,9.8007699 L 23.597982,13.515988 L 23.001478,15.351781 L 21.057049,9.3673619 z M 24.194484,19.023319 L 24.790989,17.187573 L 25.957048,20.776336 L 37.497447,20.776336 L 37.888118,19.573873 L 38.853268,20.275089 L 38.321764,21.910912 L 25.132685,21.910912 L 24.194484,19.023319 z M 0.5551853,24.262843 L 7.9036154,18.923855 L 8.2723049,20.058432 L 1.8889674,24.696201 L 5.4551984,35.671819 L 16.995595,35.671819 L 18.202737,31.9566 L 19.764434,30.821973 L 17.819959,36.806394 L 4.6308143,36.806394 L 0.5551853,24.262843 z M 31.476438,20.209046 L 36.567095,16.510468 L 47.237269,24.262843 L 43.161633,36.806394 L 34.078493,36.806394 L 34.447138,35.671819 L 42.337264,35.671819 L 45.903479,24.696201 L 36.567095,17.912898 L 33.406728,20.209046 L 31.476438,20.209046 z M 5.3950189,9.3673619 L 16.065194,1.6149871 L 23.413707,6.9539745 L 22.44856,7.6551909 L 16.065194,3.0174177 L 6.7288079,9.8007699 L 10.29502,20.776336 L 14.201416,20.776336 L 15.763019,21.910912 L 9.4707017,21.910912 L 5.3950189,9.3673619 z M 18.061955,20.776336 L 21.835416,20.776336 L 25.401627,9.8007699 L 24.378759,9.0576215 L 25.343953,8.3564062 L 26.735416,9.3673619 L 22.659781,21.910912 L 19.623558,21.910912 L 18.061955,20.776336 z M 14.494797,37.37368 L 15.687758,37.37368 L 18.126011,44.877733 L 29.666452,44.877733 L 33.232667,33.902157 L 30.072253,31.605965 L 29.475748,29.770175 L 34.566456,33.468751 L 30.490816,46.012316 L 17.301647,46.012316 L 14.494797,37.37368 z M 25.896871,24.262843 L 28.353226,22.478199 L 30.283475,22.478199 L 27.230659,24.696201 L 30.796869,35.671819 L 32.061166,35.671819 L 31.692527,36.806394 L 29.972505,36.806394 L 25.896871,24.262843 z M 13.226011,33.468751 L 23.896234,25.716376 L 26.352544,27.501018 L 26.949047,29.336809 L 23.896234,27.118808 L 14.559799,33.902157 L 14.950472,35.104529 L 13.757512,35.104529 L 13.226011,33.468751 z"
+       id="path2535" />
+  </g>
+</svg>
diff --git a/data/icons/clock.svg b/data/icons/clock.svg
new file mode 100644
index 0000000..8adb898
--- /dev/null
+++ b/data/icons/clock.svg
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="231" height="231" id="svg2" sodipodi:version="0.32" inkscape:version="0.44+devel" sodipodi:docbase="C:\Documents and Settings\Molumen\Desktop" sodipodi:docname="clock_beige.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" sodipodi:modified="true" version="1.0">
+  <defs id="defs4">
+    <linearGradient y2="84.524567" x2="302" y1="365.95651" x1="302" gradientUnits="userSpaceOnUse" id="linearGradient20470" xlink:href="#linearGradient13034" inkscape:collect="always"/>
+    <radialGradient r="90.78125" fy="691.20294" fx="527" cy="691.20294" cx="527" gradientTransform="matrix(1, 0, 0, 0.231842, -340, 200.219)" gradientUnits="userSpaceOnUse" id="radialGradient20468" xlink:href="#linearGradient12977" inkscape:collect="always"/>
+    <radialGradient r="113.53125" fy="368.17188" fx="528" cy="368.17188" cx="528" gradientTransform="matrix(1, 0, 0, 0.262455, -341, 27.5432)" gradientUnits="userSpaceOnUse" id="radialGradient20466" xlink:href="#linearGradient12977" inkscape:collect="always"/>
+    <radialGradient r="2.625" fy="468.57623" fx="504.125" cy="468.57623" cx="504.125" gradientTransform="matrix(1.05261, 0, 0, 1.05261, -26.5224, -23.8951)" gradientUnits="userSpaceOnUse" id="radialGradient20464" xlink:href="#linearGradient13172" inkscape:collect="always"/>
+    <radialGradient r="138" fy="467.18744" fx="525.49945" cy="467.18744" cx="525.49945" spreadMethod="pad" gradientTransform="matrix(1.77314, 0, 0, 1.77314, -744.784, -597.014)" gradientUnits="userSpaceOnUse" id="radialGradient20462" xlink:href="#linearGradient12953" inkscape:collect="always"/>
+    <radialGradient r="138" fy="239.93021" fx="302" cy="239.93021" cx="302" gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" gradientUnits="userSpaceOnUse" id="radialGradient20460" xlink:href="#linearGradient20428" inkscape:collect="always"/>
+    <radialGradient r="138" fy="239.93021" fx="302" cy="239.93021" cx="302" gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" gradientUnits="userSpaceOnUse" id="radialGradient20438" xlink:href="#linearGradient20428" inkscape:collect="always"/>
+    <radialGradient r="138" fy="467.18744" fx="525.49945" cy="467.18744" cx="525.49945" spreadMethod="pad" gradientTransform="matrix(1.77314, 0, 0, 1.77314, -744.784, -597.014)" gradientUnits="userSpaceOnUse" id="radialGradient19456" xlink:href="#linearGradient12953" inkscape:collect="always"/>
+    <radialGradient r="113.53125" fy="368.17188" fx="528" cy="368.17188" cx="528" gradientTransform="matrix(1, 0, 0, 0.262455, -341, 27.5432)" gradientUnits="userSpaceOnUse" id="radialGradient19449" xlink:href="#linearGradient12977" inkscape:collect="always"/>
+    <radialGradient r="90.78125" fy="691.20294" fx="527" cy="691.20294" cx="527" gradientTransform="matrix(1, 0, 0, 0.231842, -340, 200.219)" gradientUnits="userSpaceOnUse" id="radialGradient19446" xlink:href="#linearGradient12977" inkscape:collect="always"/>
+    <linearGradient y2="84.524567" x2="302" y1="365.95651" x1="302" gradientUnits="userSpaceOnUse" id="linearGradient19441" xlink:href="#linearGradient13034" inkscape:collect="always"/>
+    <radialGradient r="90.78125" fy="691.20294" fx="527" cy="691.20294" cx="527" gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" gradientUnits="userSpaceOnUse" id="radialGradient19439" xlink:href="#linearGradient12977" inkscape:collect="always"/>
+    <radialGradient r="113.53125" fy="368.17188" fx="528" cy="368.17188" cx="528" gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" gradientUnits="userSpaceOnUse" id="radialGradient19437" xlink:href="#linearGradient12977" inkscape:collect="always"/>
+    <radialGradient r="2.625" fy="468.57623" fx="504.125" cy="468.57623" cx="504.125" gradientTransform="matrix(1.05261, 0, 0, 1.05261, -26.5224, -23.8951)" gradientUnits="userSpaceOnUse" id="radialGradient19435" xlink:href="#linearGradient13172" inkscape:collect="always"/>
+    <radialGradient r="138" fy="467.18744" fx="525.49945" cy="467.18744" cx="525.49945" spreadMethod="pad" gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" gradientUnits="userSpaceOnUse" id="radialGradient19433" xlink:href="#linearGradient12953" inkscape:collect="always"/>
+    <radialGradient r="138" fy="239.93021" fx="302" cy="239.93021" cx="302" gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" gradientUnits="userSpaceOnUse" id="radialGradient19431" xlink:href="#linearGradient13012" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16295" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -781.919, -183.605)" gradientUnits="userSpaceOnUse" id="radialGradient16293" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16285" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -781.919, -183.605)" gradientUnits="userSpaceOnUse" id="radialGradient16283" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16275" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -781.919, -183.605)" gradientUnits="userSpaceOnUse" id="radialGradient16273" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16265" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -781.919, -183.605)" gradientUnits="userSpaceOnUse" id="radialGradient16263" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16249" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -781.919, -183.605)" gradientUnits="userSpaceOnUse" id="radialGradient16241" xlink:href="#linearGradient16243" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16197" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16195" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16189" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16187" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16181" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16179" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16173" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16171" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16165" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16163" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16095" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, -173.605)" gradientUnits="userSpaceOnUse" id="radialGradient16093" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16091" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16089" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16087" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, -173.605)" gradientUnits="userSpaceOnUse" id="radialGradient16085" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16083" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16081" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16079" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, -173.605)" gradientUnits="userSpaceOnUse" id="radialGradient16077" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16075" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16073" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16071" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, -173.605)" gradientUnits="userSpaceOnUse" id="radialGradient16069" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16067" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16065" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16063" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, -173.605)" gradientUnits="userSpaceOnUse" id="radialGradient16061" xlink:href="#linearGradient15913" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" gradientUnits="userSpaceOnUse" id="radialGradient16059" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient r="131" fy="361.61154" fx="296.26508" cy="361.61154" cx="296.26508" gradientTransform="matrix(1.25538, -1.25538, 2.63349, 2.63349, -1015.92, 24.3952)" gradientUnits="userSpaceOnUse" id="radialGradient16057" xlink:href="#linearGradient3346" inkscape:collect="always"/>
+    <radialGradient xlink:href="#linearGradient10759" cx="202.5" cy="578.86218" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="578.86218" fx="202.5" id="radialGradient13728" r="91.5"/>
+    <linearGradient y2="84.524567" y1="365.95651" xlink:href="#linearGradient13034" x2="302" x1="302" inkscape:collect="always" gradientUnits="userSpaceOnUse" id="linearGradient13265"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13263" r="90.78125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient13261" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1.05261, 0, 0, 1.05261, -26.5224, -23.8951)" xlink:href="#linearGradient13172" cx="504.125" cy="468.57623" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="468.57623" fx="504.125" id="radialGradient13259" r="2.625"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient13257" r="138"/>
+    <radialGradient gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" xlink:href="#linearGradient13012" cx="302" cy="239.93021" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="239.93021" fx="302" id="radialGradient13255" r="138"/>
+    <linearGradient y2="84.524567" y1="365.95651" xlink:href="#linearGradient13034" x2="302" x1="302" inkscape:collect="always" gradientUnits="userSpaceOnUse" id="linearGradient13231"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13229" r="90.78125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient13227" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1.05261, 0, 0, 1.05261, -26.5224, -23.8951)" xlink:href="#linearGradient13172" cx="504.125" cy="468.57623" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="468.57623" fx="504.125" id="radialGradient13225" r="2.625"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient13223" r="138"/>
+    <radialGradient gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" xlink:href="#linearGradient13012" cx="302" cy="239.93021" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="239.93021" fx="302" id="radialGradient13221" r="138"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient13206" r="138"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient13203" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13200" r="90.78125"/>
+    <linearGradient y2="84.524567" y1="365.95651" xlink:href="#linearGradient13034" x2="302" x1="302" inkscape:collect="always" gradientUnits="userSpaceOnUse" id="linearGradient13195"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13193" r="90.78125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient13191" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient13189" r="138"/>
+    <radialGradient gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" xlink:href="#linearGradient13012" cx="302" cy="239.93021" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="239.93021" fx="302" id="radialGradient13187" r="138"/>
+    <radialGradient gradientTransform="matrix(1.05261, 0, 0, 1.05261, -26.5224, -23.8951)" xlink:href="#linearGradient13172" cx="504.125" cy="468.57623" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="468.57623" fx="504.125" id="radialGradient13170" r="2.625"/>
+    <linearGradient y2="84.524567" y1="365.95651" xlink:href="#linearGradient13034" x2="302" x1="302" inkscape:collect="always" gradientUnits="userSpaceOnUse" id="linearGradient13146"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient13143" r="138"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient13140" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13137" r="90.78125"/>
+    <linearGradient y2="150.36218" y1="426.36218" xlink:href="#linearGradient13034" x2="302" x1="302" inkscape:collect="always" gradientUnits="userSpaceOnUse" id="linearGradient13133"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13131" r="90.78125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient13129" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient13127" r="138"/>
+    <radialGradient gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" xlink:href="#linearGradient13012" cx="302" cy="239.93021" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="239.93021" fx="302" id="radialGradient13125" r="138"/>
+    <linearGradient y2="150.36218" y1="426.36218" xlink:href="#linearGradient13034" x2="302" x1="302" inkscape:collect="always" gradientUnits="userSpaceOnUse" id="linearGradient13032"/>
+    <radialGradient gradientTransform="matrix(3.14096, 0, 0, 3.14096, -646.57, -549.905)" xlink:href="#linearGradient13012" cx="302" cy="239.93021" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="239.93021" fx="302" id="radialGradient13010" r="138"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.231842, -1, 463.219)" xlink:href="#linearGradient12977" cx="527" cy="691.20294" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="691.20294" fx="527" id="radialGradient13000" r="90.78125"/>
+    <radialGradient gradientTransform="matrix(-0.932879, 0, 0, -0.244839, 1018.94, 683.505)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient12987" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1, 0, 0, 0.262455, -2, 290.543)" xlink:href="#linearGradient12977" cx="528" cy="368.17188" inkscape:collect="always" gradientUnits="userSpaceOnUse" fy="368.17188" fx="528" id="radialGradient12983" r="113.53125"/>
+    <radialGradient gradientTransform="matrix(1.77314, 0, 0, 1.77314, -405.784, -334.014)" xlink:href="#linearGradient12953" cx="525.49945" cy="467.18744" inkscape:collect="always" gradientUnits="userSpaceOnUse" spreadMethod="pad" fy="467.18744" fx="525.49945" id="radialGradient12959" r="138"/>
+    <linearGradient id="linearGradient5553">
+      <stop id="stop5555" style="stop-color: rgb(53, 155, 68); stop-opacity: 1;" offset="0"/>
+      <stop id="stop5557" style="stop-color: rgb(50, 204, 73); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5613">
+      <stop id="stop5615" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.888889;" offset="0"/>
+      <stop id="stop5617" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.5"/>
+      <stop id="stop5619" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop5621" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5675">
+      <stop id="stop5677" style="stop-color: rgb(0, 138, 0); stop-opacity: 0.890196;" offset="0"/>
+      <stop id="stop5679" style="stop-color: rgb(72, 143, 51); stop-opacity: 0;" offset="0.5"/>
+      <stop id="stop5681" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop5683" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5563">
+      <stop id="stop5565" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.703704;" offset="0"/>
+      <stop id="stop5571" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.189815;" offset="0.50850612"/>
+      <stop id="stop5573" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop5567" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5537">
+      <stop id="stop5539" style="stop-color: rgb(74, 206, 96); stop-opacity: 1;" offset="0"/>
+      <stop id="stop5541" style="stop-color: rgb(180, 234, 135); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10743">
+      <stop id="stop10745" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.703704;" offset="0"/>
+      <stop id="stop10747" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.189815;" offset="0.50850612"/>
+      <stop id="stop10749" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop10751" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10753">
+      <stop id="stop10755" style="stop-color: rgb(53, 155, 68); stop-opacity: 1;" offset="0"/>
+      <stop id="stop10757" style="stop-color: rgb(50, 204, 73); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10759">
+      <stop id="stop10761" style="stop-color: rgb(74, 206, 96); stop-opacity: 1;" offset="0"/>
+      <stop id="stop10763" style="stop-color: rgb(180, 234, 135); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10767">
+      <stop id="stop10769" style="stop-color: rgb(53, 155, 68); stop-opacity: 1;" offset="0"/>
+      <stop id="stop10771" style="stop-color: rgb(50, 204, 73); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10773">
+      <stop id="stop10775" style="stop-color: rgb(0, 138, 0); stop-opacity: 0.890196;" offset="0"/>
+      <stop id="stop10777" style="stop-color: rgb(72, 143, 51); stop-opacity: 0;" offset="0.5"/>
+      <stop id="stop10779" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop10781" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10783">
+      <stop id="stop10785" style="stop-color: rgb(0, 138, 0); stop-opacity: 0.890196;" offset="0"/>
+      <stop id="stop10787" style="stop-color: rgb(72, 143, 51); stop-opacity: 0;" offset="0.5"/>
+      <stop id="stop10789" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop10791" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10793">
+      <stop id="stop10795" style="stop-color: rgb(0, 138, 0); stop-opacity: 0.890196;" offset="0"/>
+      <stop id="stop10797" style="stop-color: rgb(72, 143, 51); stop-opacity: 0;" offset="0.5"/>
+      <stop id="stop10799" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop10801" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10803">
+      <stop id="stop10805" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.888889;" offset="0"/>
+      <stop id="stop10807" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.5"/>
+      <stop id="stop10809" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0.51142859"/>
+      <stop id="stop10811" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10813">
+      <stop id="stop10815" style="stop-color: rgb(53, 155, 68); stop-opacity: 1;" offset="0"/>
+      <stop id="stop10817" style="stop-color: rgb(50, 204, 73); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient10819">
+      <stop id="stop10821" style="stop-color: rgb(74, 206, 96); stop-opacity: 1;" offset="0"/>
+      <stop id="stop10823" style="stop-color: rgb(180, 234, 135); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient12953">
+      <stop id="stop12955" style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" offset="0"/>
+      <stop id="stop12965" style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" offset="0.47816542"/>
+      <stop id="stop12961" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0.49808899"/>
+      <stop id="stop12967" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0.50756544"/>
+      <stop id="stop12963" style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" offset="0.53007674"/>
+      <stop id="stop12957" style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient12977">
+      <stop id="stop12979" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.319444;" offset="0"/>
+      <stop id="stop12981" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient13012">
+      <stop id="stop13014" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0"/>
+      <stop id="stop13018" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0.20165709"/>
+      <stop id="stop13020" style="stop-color: rgb(239, 245, 251); stop-opacity: 1;" offset="0.32675916"/>
+      <stop id="stop13016" style="stop-color: rgb(4, 72, 127); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient13034">
+      <stop id="stop13036" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="0"/>
+      <stop id="stop13038" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient13172">
+      <stop id="stop13174" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0"/>
+      <stop id="stop13176" style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3346">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop3348"/>
+      <stop style="stop-color: rgb(233, 233, 233); stop-opacity: 1;" offset="1" id="stop3350"/>
+    </linearGradient>
+    <filter id="filter4767" inkscape:collect="always">
+      <feGaussianBlur id="feGaussianBlur4769" stdDeviation="0.77125" inkscape:collect="always"/>
+    </filter>
+    <linearGradient id="linearGradient3916">
+      <stop style="stop-color: rgb(139, 139, 139); stop-opacity: 0.639175;" offset="0" id="stop3918"/>
+      <stop id="stop3924" offset="0.44642857" style="stop-color: rgb(141, 141, 141); stop-opacity: 0.206186;"/>
+      <stop id="stop3922" offset="1" style="stop-color: rgb(143, 143, 143); stop-opacity: 0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3440">
+      <stop style="stop-color: black; stop-opacity: 1;" offset="0" id="stop3442"/>
+      <stop id="stop3452" offset="0.3125" style="stop-color: black; stop-opacity: 1;"/>
+      <stop id="stop3446" offset="0.53727454" style="stop-color: white; stop-opacity: 1;"/>
+      <stop style="stop-color: white; stop-opacity: 1;" offset="0.60522962" id="stop3542"/>
+      <stop style="stop-color: black; stop-opacity: 1;" offset="0.6964286" id="stop3448"/>
+      <stop style="stop-color: black; stop-opacity: 1;" offset="1" id="stop3444"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3757">
+      <stop id="stop3759" offset="0" style="stop-color: black; stop-opacity: 1;"/>
+      <stop id="stop3761" offset="1" style="stop-color: black; stop-opacity: 0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3584">
+      <stop id="stop3586" offset="0" style="stop-color: white; stop-opacity: 1;"/>
+      <stop style="stop-color: white; stop-opacity: 0.498039;" offset="1" id="stop3592"/>
+      <stop id="stop3588" offset="1" style="stop-color: white; stop-opacity: 0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient15913">
+      <stop id="stop15915" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
+      <stop id="stop15917" offset="1" style="stop-color: rgb(240, 216, 35); stop-opacity: 1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient16243">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop16245"/>
+      <stop style="stop-color: rgb(35, 178, 240); stop-opacity: 1;" offset="1" id="stop16247"/>
+    </linearGradient>
+    <linearGradient id="linearGradient20428">
+      <stop offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" id="stop20430"/>
+      <stop offset="0.20165709" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" id="stop20432"/>
+      <stop offset="0.32675916" style="stop-color: rgb(251, 248, 239); stop-opacity: 1;" id="stop20434"/>
+      <stop offset="1" style="stop-color: rgb(127, 98, 4); stop-opacity: 1;" id="stop20436"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3346" id="radialGradient2855" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.03888, -1.98608, 4.32211, 2.26874, -1497.58, 2.13654)" cx="296.26508" cy="361.61154" fx="296.26508" fy="361.61154" r="131"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.49497475" inkscape:cx="448.89881" inkscape:cy="364.07566" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1208" inkscape:window-height="1070" inkscape:window-x="222" inkscape:window-y="20"/>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-436.343, -114.661)">
+    <g transform="matrix(0.836957, 0, 0, 0.836957, 111.604, -183.61)" id="g19409">
+      <path sodipodi:ry="138" sodipodi:rx="138" transform="matrix(0.862319, 0, 0, 0.862319, 265.58, 245.715)" d="M 440,288.36218 A 138,138 0 1 1 164,288.36218 A 138,138 0 1 1 440,288.36218 z" sodipodi:type="arc" sodipodi:cy="288.36218" sodipodi:cx="302" id="path19411" style="fill: url(#radialGradient19431) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+      <path d="M 526,356.375 C 449.824,356.375 388,418.199 388,494.375 C 388,570.551 449.824,632.375 526,632.375 C 602.176,632.375 664,570.551 664,494.375 C 664,418.199 602.176,356.375 526,356.375 z M 526,375.375 C 591.688,375.375 645,428.687 645,494.375 C 644.99999,560.063 591.688,613.375 526,613.375 C 460.312,613.37499 407,560.063 407,494.375 C 407,428.687 460.312,375.375 526,375.375 z" id="path19413" style="fill: url(#radialGradient19433) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+      <g id="g19415">
+        <path id="path19417" sodipodi:nodetypes="ccccc" d="M 572.45442,416.66652 L 574.56216,417.96362 L 518.94889,510.35634 L 515.03453,507.94743 L 572.45442,416.66652 z" style="fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+        <path id="path19419" sodipodi:nodetypes="ccccc" d="M 470.10131,522.52645 L 468.3205,518.67564 L 539.27256,484.69517 L 541.94377,490.47138 L 470.10131,522.52645 z" style="fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+        <path sodipodi:ry="2.625" sodipodi:rx="2.625" transform="matrix(1.85714, 0, 0, 1.85714, -410.232, -381.244)" d="M 506.75,471.48718 A 2.625,2.625 0 1 1 501.5,471.48718 A 2.625,2.625 0 1 1 506.75,471.48718 z" sodipodi:type="arc" sodipodi:cy="471.48718" sodipodi:cx="504.125" id="path19421" style="opacity: 1; fill: url(#radialGradient19435) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+      </g>
+      <path d="M 526,357.375 C 478.94483,357.375 437.38188,380.97729 412.46875,416.96875 C 441.06326,387.02851 481.36166,368.375 526,368.375 C 570.63834,368.375 610.93674,387.02852 639.53125,416.96875 C 614.61812,380.97729 573.05517,357.375 526,357.375 z" id="path19423" style="fill: url(#radialGradient19437) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+      <path d="M 526,623.46875 C 562.37673,623.46875 594.94742,607.12155 616.78125,581.375 C 592.50974,602.60542 560.7553,615.46875 526,615.46875 C 491.2447,615.46875 459.49026,602.60542 435.21875,581.375 C 457.05258,607.12155 489.62327,623.46875 526,623.46875 z" id="path19425" style="fill: url(#radialGradient19439) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+      <path d="M 523.53125,378.40625 L 523.53125,402.125 C 525.1769,402.07398 526.82304,402.09578 528.46875,402.125 L 528.46875,378.40625 L 523.53125,378.40625 z M 468.9375,393.40625 L 467.09375,394.46875 L 477.0625,411.75 C 477.67174,411.38819 478.28844,411.03612 478.90625,410.6875 L 468.9375,393.40625 z M 583.0625,393.40625 L 573.09375,410.6875 C 573.71156,411.03612 574.32826,411.38819 574.9375,411.75 L 584.90625,394.46875 L 583.0625,393.40625 z M 426.09375,435.46875 L 425.03125,437.3125 L 442.3125,447.28125 C 442.66112,446.66344 443.01319,446.04674 443.375,445.4375 L 426.09375,435.46875 z M 625.90625,435.46875 L 608.625,445.4375 C 608.98681,446.04674 609.33888,446.66344 609.6875,447.28125 L 626.96875,437.3125 L 625.90625,435.46875 z M 410.03125,491.90625 L 410.03125,496.84375 L 433.75,496.84375 C 433.69898,495.1981 433.72078,493.55196 433.75,491.90625 L 410.03125,491.90625 z M 618.25,491.90625 C 618.30102,493.5519 618.27922,495.19804 618.25,496.84375 L 641.96875,496.84375 L 641.96875,491.90625 L 618.25,491.90625 z M 442.3125,541.46875 L 425.03125,551.4375 L 426.09375,553.28125 L 443.375,543.3125 C 443.01319,542.70326 442.66112,542.08656 442.3125,541.46875 z M 609.6875,541.46875 C 609.33888,542.08656 608.98681,542.70326 608.625,543.3125 L 625.90625,553.28125 L 626.96875,551.4375 L 609.6875,541.46875 z M 477.0625,577 L 467.09375,594.28125 L 468.9375,595.34375 L 478.90625,578.0625 C 478.28844,577.71388 477.67174,577.36181 477.0625,577 z M 574.9375,577 C 574.32826,577.36181 573.71156,577.71388 573.09375,578.0625 L 583.0625,595.34375 L 584.90625,594.28125 L 574.9375,577 z M 523.53125,586.625 L 523.53125,610.34375 L 528.46875,610.34375 L 528.46875,586.625 C 526.8231,586.67602 525.17696,586.65422 523.53125,586.625 z" sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" id="path19427" style="fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+      <path sodipodi:ry="138" sodipodi:rx="138" transform="matrix(0.728261, 0, 0, 0.601449, 306.065, 286.927)" d="M 440,288.36218 A 138,138 0 1 1 164,288.36218 A 138,138 0 1 1 440,288.36218 z" sodipodi:type="arc" sodipodi:cy="288.36218" sodipodi:cx="302" id="path19429" style="fill: url(#linearGradient19441) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/data/icons/once_wrapper.svg b/data/icons/once_wrapper.svg
new file mode 100644
index 0000000..ad48720
--- /dev/null
+++ b/data/icons/once_wrapper.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2393"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="once_wrapper.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2395">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective2401" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="645"
+     inkscape:window-height="726"
+     inkscape:window-x="625"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata2398">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot2403"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol"
+       transform="matrix(1.2841451,0,0,1.2841451,-10.095321,-10.594455)"><flowRegion
+         id="flowRegion2405"><rect
+           id="rect2407"
+           width="45"
+           height="45"
+           x="1.8571428"
+           y="1.4285715"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol" /></flowRegion><flowPara
+         id="flowPara2409"> 1</flowPara></flowRoot>  </g>
+</svg>
diff --git a/setup.cfg b/setup.cfg.example
index e33c680..e33c680 100644
--- a/setup.cfg
+++ b/setup.cfg.example
diff --git a/setup.py b/setup.py
index df9b92d..9362dc7 100755
--- a/setup.py
+++ b/setup.py
@@ -10,14 +10,19 @@ class TestCommand(Command):
     user_options = [('coverage',
                      None,
                      'enable code coverage reporting'),
-                     ('prefix=',
+                    ('prefix=',
                      'p',
-                     'set sugar installation prefix, for dependency loading'),]
+                     'set sugar installation prefix, for dependency loading'),
+                    ('single=',
+                     't',
+                     'run a single test'),
+                   ]
     description = 'runs tests from the test directory'
 
     def initialize_options(self):
         self._dir = os.getcwd()
         self.coverage = False
+        self.single = False
         self.prefix = None
 
     def finalize_options(self):
@@ -33,6 +38,7 @@ class TestCommand(Command):
                               'python%d.%d'%sys.version_info[:2],
                               'site-packages') 
         sys.path.insert(1, prefix)
+        os.environ.setdefault('SUGAR_PREFIX', self.prefix)
         if self.coverage:
             import coverage
             coverage.erase()
@@ -40,15 +46,23 @@ class TestCommand(Command):
 
         loader = TestLoader()
         suite = TestSuite()
-        skipped = file('tests/skip', 'r').read().split('\n')
-        for t in glob.glob(pjoin(self._dir, 'tests', '*.py')):
-            if not t.endswith('__init__.py') and basename(t) not in skipped:
-                modname = '.'.join(['tests', splitext(basename(t))[0]])
-                mod = __import__(modname, {'sys':sys}, fromlist=[modname])
-                print "loading %s" % modname
-                suite.addTest(loader.loadTestsFromModule(mod))
-            else:
-                print "skipping %s" % t
+        if not self.single:
+            skipped = file('tests/skip', 'r').read().split('\n')
+            for t in glob.glob(pjoin(self._dir, 'tests', '*.py')):
+                if not t.endswith('__init__.py') and basename(t) not in skipped:
+                    modname = '.'.join(['tests', splitext(basename(t))[0]])
+                    mod = __import__(modname, {'sys':sys}, fromlist=[modname])
+                    print "loading %s" % modname
+                    suite.addTest(loader.loadTestsFromModule(mod))
+                else:
+                    print "skipping %s" % t
+        else:
+            modname = '.'.join(['tests', self.single])
+            mod = __import__(modname, {'sys':sys}, fromlist=[modname])
+            print "loading %s" % modname
+            suite.addTest(loader.loadTestsFromModule(mod))
+
+
 
         t = TextTestRunner(verbosity = 1)
         t.run(suite)
diff --git a/tests/actiontests.py b/tests/actiontests.py
index 4e126b3..7b8d1cb 100644
--- a/tests/actiontests.py
+++ b/tests/actiontests.py
@@ -25,6 +25,7 @@ import unittest
 import gtk
 
 from sugar.tutorius import addon
+from sugar.tutorius.addons.triggereventfilter import * 
 from sugar.tutorius.actions import *
 from sugar.tutorius.services import ObjectStore
 
@@ -65,7 +66,7 @@ class DialogMessageTest(unittest.TestCase):
     
 class BubbleMessageTest(unittest.TestCase):
     def setUp(self):
-        self.bubble = addon.create('BubbleMessage', message="Message text", pos=[200, 300], tailpos=[-15, -25])
+        self.bubble = addon.create('BubbleMessage', message="Message text", position=[200, 300], tail_pos=[-15, -25])
         
     def test_properties(self):
         props = self.bubble.get_properties()
@@ -115,7 +116,7 @@ class OnceWrapperTests(unittest.TestCase):
         CountAction
         """
         act = CountAction()
-        wrap = OnceWrapper(act)
+        wrap = addon.create('OnceWrapper', act)
 
         assert act.do_count == 0, "do() should not have been called in __init__()"
         assert act.undo_count == 0, "undo() should not have been called in __init__()"
@@ -152,7 +153,7 @@ class ChainActionTest(unittest.TestCase):
     def test_empty(self):
         """If the expected empty behavior (do nothing) changes 
         and starts throwing exceptions, this will flag it"""
-        a = ChainAction()
+        a = addon.create('ChainAction')
         a.do()
         a.undo()
 
@@ -161,7 +162,7 @@ class ChainActionTest(unittest.TestCase):
         first = ChainTester(witness)
         second = ChainTester(witness)
 
-        c = ChainAction(first, second)
+        c = addon.create('ChainAction', [first, second])
         assert witness == [], "Actions should not be triggered on init"""
         c.do()
 
@@ -194,13 +195,171 @@ class DisableWidgetActionTests(unittest.TestCase):
         
         assert btn.props.sensitive is True, "Callback should have been called"
 
-        act = DisableWidgetAction("0")
+        act = addon.create('DisableWidgetAction', "0")
         assert btn.props.sensitive is True, "Callback should have been called again"
         act.do()
         assert btn.props.sensitive is False, "Callback should not have been called again"
         act.undo()
         assert btn.props.sensitive is True, "Callback should have been called again"
 
+class TrueWhileActiveAction(Action):
+    """
+    This action's active member is set to True after a do and to False after
+    an undo.
+    
+    Used to verify that a State correctly triggers the do and undo actions.
+    """
+    def __init__(self):
+        Action.__init__(self)
+        self.active = False
+        
+    def do(self):
+        self.active = True
+        
+    def undo(self):
+        self.active = False
+        
+class ClickableWidget():
+    """
+    This class fakes a widget with a clicked() method
+    """
+    def __init__(self):
+        self.click_count = 0
+        
+    def clicked(self):
+        self.click_count += 1
+      
+class FakeTextEntry():
+    """
+    This class fakes a widget with an insert_text() method
+    """
+    def __init__(self):
+        self.text_lines = []
+        self.last_entered_line = ""
+        self.displayed_text = ""
+        
+    def insert_text(self, text, index):
+        self.last_entered_line = text
+        self.text_lines.append(text)
+        self.displayed_text = self.displayed_text[0:index] + text + self.displayed_text[index+1:]
+
+class FakeParentWidget():
+    """
+    This class fakes a widet container, it implements the get_children() method
+    """
+    def __init__(self):
+        self._children = []
+        
+    def add_child(self, child):
+        self._children.append(child)
+        
+    def get_children(self):
+        return self._children
+
+class FakeEventFilter(TriggerEventFilter):
+    """
+    This is a fake event that is connected to the tutorial.
+    
+    The difference between this one and the TriggerEventFilter is that the
+    tutorial's set_state will be called on the callback.
+    
+    Do not forget to add the do_callback() after creating the object.
+    """
+    def set_tutorial(self, tutorial):
+        self.tutorial = tutorial
+    
+    def _inner_cb(self, event_filter):
+        self.toggle_on_callback = not self.toggle_on_callback
+        self.tutorial.set_state(event_filter.get_next_state())
+
+class TypeTextActionTests(unittest.TestCase):
+    """
+    Test class for type text action
+    """
+    def test_do_action(self):
+        activity = FakeParentWidget()
+        widget = FakeTextEntry()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+
+        test_text = "This is text"
+       
+        
+        action = addon.create('TypeTextAction', "0.0", test_text)
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.do()
+        
+        assert widget.last_entered_line == test_text, "insert_text() should have been called by do()"
+        
+        action.do()
+        
+        assert widget.last_entered_line == test_text, "insert_text() should have been called by do()"
+        assert len(widget.text_lines) == 2, "insert_text() should have been called twice"
+
+    def test_undo(self):
+        activity = FakeParentWidget()
+        widget = FakeTextEntry()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+
+        test_text = "This is text"
+       
+        
+        action = addon.create('TypeTextAction', "0.0", test_text)
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.undo()
+        
+        #There is no undo for this action so the test should not fail
+        assert True
+
+class ClickActionTests(unittest.TestCase):
+    """
+    Test class for click action
+    """
+    def test_do_action(self):
+        activity = FakeParentWidget()
+        widget = ClickableWidget()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+        
+        action = addon.create('ClickAction', "0.0")
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.do()
+        
+        assert widget.click_count == 1, "clicked() should have been called by do()"
+        
+        action.do()
+        
+        assert widget.click_count == 2, "clicked() should have been called by do()"
+
+    def test_undo(self):
+        activity = FakeParentWidget()
+        widget = ClickableWidget()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+        
+        action = addon.create('ClickAction', "0.0")
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.undo()
+        
+        #There is no undo for this action so the test should not fail
+        assert True
 if __name__ == "__main__":
     unittest.main()
 
diff --git a/tests/addontests.py b/tests/addontests.py
new file mode 100644
index 0000000..5fb4f61
--- /dev/null
+++ b/tests/addontests.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2009, Tutorius.org
+# Copyright (C) 2009, Simon Poirier <simpoir@gmail.com>
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import unittest
+
+from sugar.tutorius import addon
+
+class AddonTest(unittest.TestCase):
+    def test_create_constructor_fail(self):
+        try:
+            obj = addon.create("BubbleMessage", wrong_param=True, second_wrong="This", last_wrong=12, unknown=13.4)
+            assert False, "Constructor with wrong parameter should raise an exception"
+        except:
+            pass
+
+    def test_create_wrong_addon(self):
+        try:
+            obj = addon.create("Non existing addon name")
+            assert False, "Addon creator should raise an exception when the requested addon is unknown"
+        except:
+            pass
+
+    def test_create(self):
+        obj = addon.create("BubbleMessage", message="Hi!", position=[12,31])
+
+        assert obj is not None
+
+    def test_reload_addons(self):
+        addon._cache = None
+        assert len(addon.list_addons()) > 0, "Addons should be reloaded upon cache clear"
+
+    def test_get_addon_meta(self):
+        addon._cache = None
+        meta = addon.get_addon_meta("BubbleMessage")
+        assert meta.keys() == ['mandatory_props', 'class', 'display_name', 'name', 'icon',]
diff --git a/tests/constraintstests.py b/tests/constraintstests.py
index b7b0a47..4e19a92 100644
--- a/tests/constraintstests.py
+++ b/tests/constraintstests.py
@@ -16,6 +16,9 @@
 
 import unittest
 
+import uuid
+import os
+
 from sugar.tutorius.constraints import *
 
 class ConstraintTest(unittest.TestCase):
@@ -218,10 +221,18 @@ class EnumConstraintTest(unittest.TestCase):
             assert False, "Wrong exception type thrown"
             
 class FileConstraintTest(unittest.TestCase):
+    def setUp(self):
+        self.temp_filename = "sample_file_" + str(uuid.uuid1()) + ".txt"
+        self.file1 = file(self.temp_filename, "w")
+        self.file1.close()
+
+    def tearDown(self):
+        os.unlink(self.temp_filename)
+
     def test_validate(self):
         cons = FileConstraint()
         
-        cons.validate("run-tests.py")
+        cons.validate(self.temp_filename)
         
         try:
             cons.validate("unknown/file.py")
@@ -230,4 +241,4 @@ class FileConstraintTest(unittest.TestCase):
             pass
 
 if __name__ == "__main__":
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/tests/coretests.py b/tests/coretests.py
index eadea01..b2f68e5 100644
--- a/tests/coretests.py
+++ b/tests/coretests.py
@@ -28,13 +28,14 @@ and event filters. Those are in their separate test module
 
 import unittest
 
+import copy
 import logging
-from sugar.tutorius.actions import Action, OnceWrapper, ClickAction, TypeTextAction
+from sugar.tutorius.actions import *
+from sugar.tutorius.addon import *
 from sugar.tutorius.core import *
 from sugar.tutorius.filters import *
 
-
-from actiontests import CountAction
+from actiontests import CountAction, FakeEventFilter
 
 # Helper classes to help testing
 class SimpleTutorial(Tutorial):
@@ -49,6 +50,28 @@ class SimpleTutorial(Tutorial):
     def set_state(self, name):
         self.current_state_name = name
 
+class TutorialTest(unittest.TestCase):
+    """Tests the tutorial functions that are not covered elsewhere."""
+    def test_detach(self):
+        class Activity(object):
+            name = "this"
+
+        activity1 = Activity()
+        activity2 = Activity()
+
+        fsm = FiniteStateMachine("Sample example")
+        
+        tutorial = Tutorial("Test tutorial", fsm)
+
+        assert tutorial.activity == None, "There is a default activity in the tutorial"
+
+        tutorial.attach(activity1)
+
+        assert tutorial.activity == activity1, "Activity should have been associated to this tutorial"
+
+        tutorial.attach(activity2)
+        assert tutorial.activity == activity2, "Activity should have been changed to activity2"
+
 class TutorialWithFSM(Tutorial):
     """
     Fake tutorial, but associated with a FSM.
@@ -73,173 +96,6 @@ class TrueWhileActiveAction(Action):
         
     def undo(self):
         self.active = False
-        
-class ClickableWidget():
-    """
-    This class fakes a widget with a clicked() method
-    """
-    def __init__(self):
-        self.click_count = 0
-        
-    def clicked(self):
-        self.click_count += 1
-      
-class FakeTextEntry():
-    """
-    This class fakes a widget with an insert_text() method
-    """
-    def __init__(self):
-        self.text_lines = []
-        self.last_entered_line = ""
-        self.displayed_text = ""
-        
-    def insert_text(self, text, index):
-        self.last_entered_line = text
-        self.text_lines.append(text)
-        self.displayed_text = self.displayed_text[0:index] + text + self.displayed_text[index+1:]
-
-class FakeParentWidget():
-    """
-    This class fakes a widet container, it implements the get_children() method
-    """
-    def __init__(self):
-        self._children = []
-        
-    def add_child(self, child):
-        self._children.append(child)
-        
-    def get_children(self):
-        return self._children
-
-
-
-
-class TriggerEventFilter(EventFilter):
-    """
-    This event filter can be triggered by simply calling its do_callback function.
-    
-    Used to fake events and see the effect on the FSM.
-    """
-    def __init__(self, next_state):
-        EventFilter.__init__(self, next_state)
-        self.toggle_on_callback = False
-    
-    def install_handlers(self, callback, **kwargs):
-        """
-        Forsakes the incoming callback function and just set the inner one.
-        """
-        self._callback = self._inner_cb
-    
-    def _inner_cb(self, event_filter):
-        self.toggle_on_callback = not self.toggle_on_callback
-
-class FakeEventFilter(TriggerEventFilter):
-    """
-    This is a fake event that is connected to the tutorial.
-    
-    The difference between this one and the TriggerEventFilter is that the
-    tutorial's set_state will be called on the callback.
-    
-    Do not forget to add the do_callback() after creating the object.
-    """
-    def set_tutorial(self, tutorial):
-        self.tutorial = tutorial
-    
-    def _inner_cb(self, event_filter):
-        self.toggle_on_callback = not self.toggle_on_callback
-        self.tutorial.set_state(event_filter.get_next_state())
-    
-
-class ClickActionTests(unittest.TestCase):
-    """
-    Test class for click action
-    """
-    def test_do_action(self):
-        activity = FakeParentWidget()
-        widget = ClickableWidget()
-        activity.add_child(widget)
-        ObjectStore().activity = activity
-        
-        action = ClickAction("0.0")
-        
-        assert widget == ObjectStore().activity.get_children()[0],\
-            "The clickable widget isn't reachable from the object store \
-            the test cannot pass"
-        
-        action.do()
-        
-        assert widget.click_count == 1, "clicked() should have been called by do()"
-        
-        action.do()
-        
-        assert widget.click_count == 2, "clicked() should have been called by do()"
-
-    def test_undo(self):
-        activity = FakeParentWidget()
-        widget = ClickableWidget()
-        activity.add_child(widget)
-        ObjectStore().activity = activity
-        
-        action = ClickAction("0.0")
-        
-        assert widget == ObjectStore().activity.get_children()[0],\
-            "The clickable widget isn't reachable from the object store \
-            the test cannot pass"
-        
-        action.undo()
-        
-        #There is no undo for this action so the test should not fail
-        assert True
-        
-        
-
-class TypeTextActionTests(unittest.TestCase):
-    """
-    Test class for type text action
-    """
-    def test_do_action(self):
-        activity = FakeParentWidget()
-        widget = FakeTextEntry()
-        activity.add_child(widget)
-        ObjectStore().activity = activity
-
-        test_text = "This is text"
-       
-        
-        action = TypeTextAction("0.0", test_text)
-        
-        assert widget == ObjectStore().activity.get_children()[0],\
-            "The clickable widget isn't reachable from the object store \
-            the test cannot pass"
-        
-        action.do()
-        
-        assert widget.last_entered_line == test_text, "insert_text() should have been called by do()"
-        
-        action.do()
-        
-        assert widget.last_entered_line == test_text, "insert_text() should have been called by do()"
-        assert len(widget.text_lines) == 2, "insert_text() should have been called twice"
-
-    def test_undo(self):
-        activity = FakeParentWidget()
-        widget = FakeTextEntry()
-        activity.add_child(widget)
-        ObjectStore().activity = activity
-
-        test_text = "This is text"
-       
-        
-        action = TypeTextAction("0.0", test_text)
-        
-        assert widget == ObjectStore().activity.get_children()[0],\
-            "The clickable widget isn't reachable from the object store \
-            the test cannot pass"
-        
-        action.undo()
-        
-        #There is no undo for this action so the test should not fail
-        assert True
 
 # State testing class
 class StateTest(unittest.TestCase):
@@ -274,9 +130,9 @@ class StateTest(unittest.TestCase):
         Tests the fact that the event filters are correctly installed on setup
         and uninstalled on teardown.
         """
-        event_filter = TriggerEventFilter("second_state")
+        event_filter = addon.create('TriggerEventFilter')
         
-        state = State("event_test", event_filter_list=[event_filter])
+        state = State("event_test", event_filter_list=[(event_filter, "next_state")])
         state.set_tutorial(SimpleTutorial())
         
         assert event_filter.toggle_on_callback == False, "Wrong init of event_filter"
@@ -326,14 +182,11 @@ class StateTest(unittest.TestCase):
         assert state.add_action(act2), "Could not add the second action"
         assert state.add_action(act3), "Could not add the third action"
         
-        # Try to add a second time an action that was already inserted
-        assert state.add_action(act1) == False, "Not supposed to insert an action twice"
-        
         # Fetch the associated actions
         actions = state.get_action_list()
         
         # Make sure all the actions are present in the state
-        assert act1 in actions and act2 in actions and act3 in actions,\
+        assert act1 in actions and act2 in actions and act3 in actions, \
             "The actions were not properly inserted in the state"
         
         # Clear the list
@@ -345,17 +198,20 @@ class StateTest(unittest.TestCase):
     def test_add_event_filter(self):
         state = State("INIT")
         
-        event1 = TriggerEventFilter("s")
-        event2 = TriggerEventFilter("t")
-        event3 = TriggerEventFilter("r")
+        event1 = addon.create('TriggerEventFilter')
+        # MJM : 2009-10-21 : Commenting the below as per new FSM standard, a state cannot
+        #       have more than one event filter with the same properties (no identical
+        #       properties containers)
+        #event2 = addon.create('TriggerEventFilter')
+        #event3 = addon.create('TriggerEventFilter')
         
         # Insert the event filters
-        assert state.add_event_filter(event1), "Could not add event filter 1"
-        assert state.add_event_filter(event2), "Could not add event filter 2"
-        assert state.add_event_filter(event3), "Could not add event filter 3"
+        assert state.add_event_filter(event1, 's'), "Could not add event filter 1"
+        #assert state.add_event_filter(event2, 't'), "Could not add event filter 2"
+        #assert state.add_event_filter(event3, 'r'), "Could not add event filter 3"
         
         # Make sure we cannot insert an event twice
-        assert state.add_event_filter(event1) == False, "Could add twice the event filter"
+        assert state.add_event_filter(event1, 's') == False, "Could add twice the event filter"
         
         # Get the list of event filters
         event_filters = state.get_event_filter_list()
@@ -368,7 +224,80 @@ class StateTest(unittest.TestCase):
         
         assert len(state.get_event_filter_list()) == 0, \
             "Could not clear the event filter list properly"
+
+    def test_eq_simple(self):
+        """
+        Two empty states with the same name must be identical
+        """
+        st1 = State("Identical")
+        st2 = State("Identical")
+
+        assert st1 == st2, "Empty states with the same name should be identical"
+
+    def test_eq(self):
+        """
+        Test whether two states share the same set of actions and event filters.
+        """
+        st1 = State("Identical")
+        st2 = State("Identical")
+
+        non_state = object()
+
+        act1 = addon.create("BubbleMessage", message="Hi", position=[132,450])
+        act2 = addon.create("BubbleMessage", message="Hi", position=[132,450])
+
+        event1 = addon.create("GtkWidgetEventFilter", "0.0.0.1.1.2.3.1", "clicked")
+
+        act3 = addon.create("DialogMessage", message="Hello again.", position=[200, 400])
+
+        # Build the first state
+        st1.add_action(act1)
+        st1.add_action(act3)
+        st1.add_event_filter(event1, 'nextState')
+
+        # Build the second state
+        st2.add_action(act2)
+        st2.add_action(act3)
+        st2.add_event_filter(event1, 'nextState')
+
+        # Make sure that they are identical for now
+        assert st1 == st2, "States should be considered as identical"
+        assert st2 == st1, "States should be considered as identical"
     
+        # Modify the second bubble message action
+        act2.message = "New message"
+
+        # Since one action changed in the second state, this should indicate that the states
+        # are not identical anymore
+        assert not (st1 == st2), "Action was changed and states should be different"
+        assert not (st2 == st1), "Action was changed and states should be different"
+
+        # Make sure that trying to find identity with something else than a State object fails properly
+        assert not (st1 == non_state), "Passing a non-State object should fail for identity"
+        
+        st2.name = "Not identical anymore"
+        assert not(st1 == st2), "Different state names should give different states"
+        st2.name = "Identical"
+
+        st3 = copy.deepcopy(st1)
+        st3.add_action(addon.create("BubbleMessage", "Hi!", [128,264]))
+
+        assert not (st1 == st3), "States having a different number of actions should be different"
+
+        st4 = copy.deepcopy(st1)
+        st4.add_event_filter(addon.create("GtkWidgetEventFilter", "0.0.1.1.2.2.3", "clicked"), "next_state")
+
+        assert not (st1 == st4), "States having a different number of events should be different"
+
+        st5 = copy.deepcopy(st1)
+        st5.clear_event_filters()
+    
+        st5.add_event_filter(addon.create("GtkWidgetEventFilter", "0.1.2.3.4.1.2", "pressed"), "other_state")
+
+        #import rpdb2; rpdb2.start_embedded_debugger('pass')
+        assert not (st1 == st5), "States having the same number of event filters" \
+             + " but those being different should be different"
+
 class FSMTest(unittest.TestCase):
     """
     This class needs to text the interface and functionality of the Finite 
@@ -379,10 +308,10 @@ class FSMTest(unittest.TestCase):
         act_init = TrueWhileActiveAction()
         act_second = TrueWhileActiveAction()
         
-        event_init = FakeEventFilter("SECOND")
+        event_init = FakeEventFilter()
         
         content = {
-            "INIT": State("INIT", action_list=[act_init],event_filter_list=[event_init]),
+            "INIT": State("INIT", action_list=[act_init],event_filter_list=[(event_init, "SECOND")]),
             "SECOND": State("SECOND", action_list=[act_second])
         }
         
@@ -413,6 +342,7 @@ class FSMTest(unittest.TestCase):
         assert act_second.active == False, "FSM did not teardown SECOND properly"
         
     
+    
     def test_state_insert(self):
         """
         This is a simple test to insert, then find a state.
@@ -472,9 +402,9 @@ class FSMTest(unittest.TestCase):
         This test removes a state from the FSM. It also verifies that the links
         from other states going into the removed state are gone.
         """
-        st1 = State("INIT", event_filter_list=[TriggerEventFilter("second")])
-        st2 = State("second", event_filter_list=[TriggerEventFilter("third")])
-        st3 = State("third", event_filter_list=[TriggerEventFilter("second")])
+        st1 = State("INIT", event_filter_list=[(addon.create('TriggerEventFilter'), "second")])
+        st2 = State("second", event_filter_list=[(addon.create('TriggerEventFilter'), "third")])
+        st3 = State("third", event_filter_list=[(addon.create('TriggerEventFilter'), "second")])
         
         fsm = FiniteStateMachine("StateRemovalTest")
         
@@ -504,10 +434,10 @@ class FSMTest(unittest.TestCase):
         
         # Make sure that there is no link to the removed state in the rest
         # of the FSM
-        assert "second" not in fsm.get_following_states("INIT"),\
+        assert "second" not in fsm.get_following_states("INIT"), \
             "The link to second from INIT still exists after removal"
         
-        assert "second" not in fsm.get_following_states("third"),\
+        assert "second" not in fsm.get_following_states("third"), \
             "The link to second from third still exists after removal"
     
     def test_set_same_state(self):
@@ -534,8 +464,116 @@ class FSMTest(unittest.TestCase):
             "The action was triggered a second time, do_count = %d"%do_count
         
         undo_count = fsm.get_state_by_name("INIT").get_action_list()[0].undo_count
-        assert fsm.get_state_by_name("INIT").get_action_list()[0].undo_count == 0,\
+        assert fsm.get_state_by_name("INIT").get_action_list()[0].undo_count == 0, \
             "The action has been undone unappropriately, undo_count = %d"%undo_count
+
+    def test_setup(self):
+        fsm = FiniteStateMachine("New state machine")
+        
+        try:
+            fsm.setup()
+            assert False, "fsm should throw an exception when trying to setup and not bound to a tutorial"
+        except UnboundLocalError:
+            pass    
+
+    def test_setup_actions(self):
+        tut = SimpleTutorial()
+
+        states_dict = {"INIT": State("INIT")}
+        fsm = FiniteStateMachine("New FSM", state_dict=states_dict)
+
+        act = CountAction()
+        fsm.add_action(act)
+
+        fsm.set_tutorial(tut)
+        
+        fsm.setup()
+
+        # Let's also test the current state name
+        assert fsm.get_current_state_name() == "INIT", "Initial state should be INIT"
+
+        assert act.do_count == 1, "Action should have been called during setup"
+
+        fsm._fsm_has_finished = True
+
+        fsm.teardown()
+
+        assert act.undo_count == 1, "Action should have been undone"
+
+    def test_string_rep(self):
+        fsm = FiniteStateMachine("Testing machine")
+
+        st1 = State("INIT")
+        st2 = State("Other State")
+        st3 = State("Final State")
+
+        st1.add_action(addon.create("BubbleMessage", "Hi!", [132,312]))
+
+        fsm.add_state(st1)
+        fsm.add_state(st2)
+        fsm.add_state(st3)
+
+        assert str(fsm) == "INIT, Final State, Other State, "
+        
+    def test_eq_(self):
+        fsm = FiniteStateMachine("Identity test")
+
+        non_fsm_object = object()
+        
+        assert not (fsm == non_fsm_object), "Testing with non FSM object should not give identity"
+        
+        # Compare FSMs
+        act1 = CountAction()
+
+        fsm.add_action(act1)
+
+        fsm2 = copy.deepcopy(fsm)
+
+        assert fsm == fsm2
+
+        act2 = CountAction()
+        fsm2.add_action(act2)
+
+        assert not(fsm == fsm2), \
+            "FSMs having a different number of actions should be different"
+
+        fsm3 = FiniteStateMachine("Identity test")
+
+        act3 = addon.create("BubbleMessage", "Hi!", [123,312])
+        fsm3.add_action(act3)
+        
+        assert not(fsm3 == fsm), \
+            "Actions having the same number of actions but different ones should be different"
+
+        st1 = State("INIT")
+        
+        st2 = State("OtherState")
+
+        fsm.add_state(st1)
+        fsm.add_state(st2)
+
+        fsm4 = copy.deepcopy(fsm)
+
+        assert fsm == fsm4
+
+        st3 = State("Last State")
+
+        fsm4.add_state(st3)
+
+        assert not (fsm == fsm4), "FSMs having a different number of states should not be identical"
+
+        fsm4.remove_state("OtherState")
+
+        assert not (fsm == fsm4), "FSMs having different states should be different"
+        
+        fsm4.remove_state("Last State")
+        
+        st5 = State("OtherState")
+        st5.add_action(CountAction())
+
+        fsm4.add_state(st5)
+
+        assert not(fsm == fsm4), "FSMs having states with same name but different content should be different"
     
 class FSMExplorationTests(unittest.TestCase):
     def setUp(self):
@@ -547,13 +585,13 @@ class FSMExplorationTests(unittest.TestCase):
         """
         st1 = State("INIT")
         st1.add_action(CountAction())
-        st1.add_event_filter(TriggerEventFilter("Second"))
-        st1.add_event_filter(TriggerEventFilter("Third"))
+        st1.add_event_filter(addon.create('TriggerEventFilter'), "Second")
+        st1.add_event_filter(addon.create('TriggerEventFilter'), "Third")
         
         st2 = State("Second")
         st2.add_action(TrueWhileActiveAction())
-        st2.add_event_filter(TriggerEventFilter("Third"))
-        st2.add_event_filter(TriggerEventFilter("Fourth"))
+        st2.add_event_filter(addon.create('TriggerEventFilter'), "Third")
+        st2.add_event_filter(addon.create('TriggerEventFilter'), "Fourth")
         
         st3 = State("Third")
         st3.add_action(CountAction())
@@ -592,6 +630,5 @@ class FSMExplorationTests(unittest.TestCase):
         
         self.validate_previous_states("Fourth", ("Second"))
         
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/filterstests.py b/tests/filterstests.py
index 3e79bcc..ee6033b 100644
--- a/tests/filterstests.py
+++ b/tests/filterstests.py
@@ -26,26 +26,16 @@ import time
 import gobject
 import gtk
 
-from sugar.tutorius.filters import EventFilter, TimerEvent, GtkWidgetTypeFilter
+from sugar.tutorius.filters import EventFilter 
 from sugar.tutorius import addon
 from gtkutilstests import SignalCatcher
 
 class BaseEventFilterTests(unittest.TestCase):
     """Test the behavior of the Base EventFilter class"""
-    def test_properties(self):
-        """Test EventFilter properties"""
-        e = EventFilter("NEXTSTATE")
-
-        assert e.next_state == "NEXTSTATE", "next_state should have value used in constructor"
-
-        e.next_state = "NEWSTATE"
-
-        assert e.next_state == "NEWSTATE", "next_state should have been changed by setter"
-
 
     def test_callback(self):
         """Test the callback mechanism"""
-        e = EventFilter("Next")
+        e = EventFilter()
         s = SignalCatcher()
 
         #Trigger the do_callback, shouldn't do anything
@@ -79,7 +69,7 @@ class TestTimerEvent(unittest.TestCase):
         ctx = gobject.MainContext()
         main = gobject.MainLoop(ctx)
 
-        e = TimerEvent("Next",1) #1 second should be enough :s
+        e = addon.create('TimerEvent', 2) # 2 seconds should be enough :s
         s = SignalCatcher()
 
         e.install_handlers(s.callback)
@@ -122,7 +112,7 @@ class TestTimerEvent(unittest.TestCase):
         ctx = gobject.MainContext()
         main = gobject.MainLoop(ctx)
 
-        e = TimerEvent("Next",1) #1 second should be enough :s
+        e = addon.create('TimerEvent', 2) # 2 seconds should be enough :s
         s = SignalCatcher()
 
         e.install_handlers(s.callback)
@@ -169,7 +159,7 @@ class TestGtkWidgetEventFilter(unittest.TestCase):
         self.top.add(self.btn1)
     
     def test_install(self):
-        h = addon.create('GtkWidgetEventFilter', "Next","0","whatever")
+        h = addon.create('GtkWidgetEventFilter', "0","whatever")
         try:
             h.install_handlers(None)
 
@@ -178,7 +168,7 @@ class TestGtkWidgetEventFilter(unittest.TestCase):
             assert True, "Install should have failed"
 
     def test_button_clicks(self):
-        h = addon.create('GtkWidgetEventFilter', "Next","0.0","clicked")
+        h = addon.create('GtkWidgetEventFilter', "0.0","clicked")
         s = SignalCatcher()
 
         h.install_handlers(s.callback, activity=self.top)
diff --git a/tests/linear_creatortests.py b/tests/linear_creatortests.py
index dcded57..8b13656 100644
--- a/tests/linear_creatortests.py
+++ b/tests/linear_creatortests.py
@@ -19,7 +19,7 @@ from sugar.tutorius.core import *
 from sugar.tutorius.actions import *
 from sugar.tutorius.filters import *
 from sugar.tutorius.linear_creator import *
-from coretests import TriggerEventFilter
+from sugar.tutorius.addons.triggereventfilter import *
 from actiontests import CountAction
 import unittest
 
@@ -35,11 +35,11 @@ class CreatorTests(unittest.TestCase):
         creator.action(CountAction())
         creator.action(CountAction())
         
-        creator.event(TriggerEventFilter("Not important"))
+        creator.event(TriggerEventFilter())
         
         creator.action(CountAction())
         
-        creator.event(TriggerEventFilter("Not good either..."))
+        creator.event(TriggerEventFilter())
         
         fsm = creator.generate_fsm()
         
@@ -50,13 +50,13 @@ class CreatorTests(unittest.TestCase):
         
         assert len(init_state.get_action_list()) == 2, "Creator did not insert all the actions"
         
-        assert init_state.get_event_filter_list()[0].get_next_state() == "State 1" , "expected next state to be 'State 1' but got %s" %  init_state.get_event_filter_list()[0].get_next_state()
+        assert init_state.get_event_filter_list()[0][1] == "State 1" , "expected next state to be 'State 1' but got %s" %  init_state.get_event_filter_list()[0].get_next_state()
         
         state1 = fsm.get_state_by_name("State 1")
         
         assert len(state1.get_action_list()) == 1, "Creator did not insert all the actions"
         
-        assert state1.get_event_filter_list()[0].get_next_state() == "State 2"
+        assert state1.get_event_filter_list()[0][1] == "State 2"
 
         # Make sure we have the final state and that it's empty
         state2 = fsm.get_state_by_name("State2")
diff --git a/tests/probetests.py b/tests/probetests.py
new file mode 100644
index 0000000..a440334
--- /dev/null
+++ b/tests/probetests.py
@@ -0,0 +1,63 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+"""
+Probe Tests
+
+"""
+
+import unittest
+import os, sys
+import gtk
+import time
+
+from dbus.mainloop.glib import DBusGMainLoop
+import dbus
+
+from sugar.tutorius.TProbe import TProbe, ProbeProxy
+
+
+class FakeActivity(object):
+    def __init__(self):
+        self.top = gtk.Window(type=gtk.WINDOW_TOPLEVEL)
+        self.top.set_name("Top")
+        
+        hbox = gtk.HBox()
+        self.top.add(hbox)
+        hbox.show()
+
+        btn1 = gtk.Button()
+        btn1.set_name("Button1")
+        hbox.pack_start(btn1)
+        btn1.show()
+        self.button = btn1
+
+class ProbeTest(unittest.TestCase):
+    def test_ping(self):
+        m = DBusGMainLoop(set_as_default=True)
+        dbus.set_default_main_loop(m)
+
+        activity = FakeActivity()
+        probe = TProbe("localhost.unittest.ProbeTest", activity.top)
+
+        #Parent, ping the probe
+        proxy = ProbeProxy("localhost.unittest.ProbeTest")
+        res = probe.ping()
+        
+        assert res == "alive", "Probe should be alive"
+
+if __name__ == "__main__":
+    unittest.main()
+
diff --git a/tests/propertiestests.py b/tests/propertiestests.py
index 46346c4..2494ea6 100644
--- a/tests/propertiestests.py
+++ b/tests/propertiestests.py
@@ -15,6 +15,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import unittest
+import uuid
+import os
+import copy
 
 from sugar.tutorius.constraints import *
 from sugar.tutorius.properties import *
@@ -81,7 +84,128 @@ class BasePropertyTest(unittest.TestCase):
         obj.prop = 2
         
         assert obj.prop == 2, "Unable to set a value on base class"
+
+    def test_eq_(self):
+        class klass(TPropContainer):
+            prop = TutoriusProperty()
+        obj = klass()
+
+        obj2 = klass()
+
+        assert obj == obj2, "Base property containers should be identical"
     
+class AdvancedPropertyTest(unittest.TestCase):
+    def test_properties_groups(self):
+        """
+        Tests complex properties containers for identity.
+        """
+        
+        class klass1(TPropContainer):
+            message = TutoriusProperty()
+            property = TutoriusProperty()
+            data = TutoriusProperty()
+
+        class klass3(TPropContainer):
+            property = TutoriusProperty()
+            message = TutoriusProperty()
+            data = TutoriusProperty()
+            extra_prop = TutoriusProperty()
+
+        class klass4(TPropContainer):
+            property = TutoriusProperty()
+            message = TutoriusProperty()
+            data = TFloatProperty(13.0)
+
+        obj1 = klass1()
+        obj1.property = 12
+        obj1.message = "Initial message"
+        obj1.data = [132, 208, 193, 142]
+
+        obj2 = klass1()
+        obj2.property = 12
+        obj2.message = "Initial message"
+        obj2.data = [132, 208, 193, 142]
+
+        obj3 = klass3()
+        obj3.property = 12
+        obj3.message = "Initial message"
+        obj3.data = [132, 208, 193, 142]
+        obj3.extra_prop = "Suprprise!"
+
+        obj4 = klass4()
+        obj4.property = 12
+        obj4.message = "Initial message"
+        obj4.data = 13.4
+
+        # Ensure that both obj1 and obj2 are identical (they have the same list of
+        # properties and they have the same values
+        assert obj1 == obj1, "Identical objects were considered as different"
+
+        # Ensure that obj1 is different from obj3, since obj3 has an extra property
+        assert not (obj1 == obj3), "Objects should not be identical since obj3 has more props"
+        assert not (obj3 == obj1), "Objects should not be identical since obj3 has more properties"
+
+        # Ensure that properties of different type are considered as different
+        assert not (obj1 == obj4), "Properties of different type should not be equal"
+
+    def test_addon_properties(self):
+        """Test an addon property.
+
+        This tests creates a class with a single addon property (klass1) and 
+        assigns a new addon to it (inner1)."""
+        class klass1(TPropContainer):
+            addon = TAddonProperty()
+
+        class inner1(TPropContainer):
+            internal = TutoriusProperty()
+            def __init__(self, value):
+                TPropContainer.__init__(self)
+                self.internal = value
+        
+        obj1 = klass1()
+        obj1.addon = inner1("Hi!")
+
+        obj2 = klass1()
+        obj2.addon = inner1("Hi!")
+
+        assert obj1 == obj2, "Identical objects with addon properties were treated as different"
+
+        obj3 = klass1()
+        obj3.addon = inner1("Hello!")
+
+        assert not (obj1 == obj3), "Objects with addon property having a different value should be considered different"        
+
+    def test_addonlist_properties(self):
+        class klass1(TPropContainer):
+            addon_list = TAddonListProperty()
+
+        class inner1(TPropContainer):
+            message = TutoriusProperty()
+            data = TutoriusProperty()
+            def __init__(self, message, data):
+                TPropContainer.__init__(self)
+                self.message = message
+                self.data = data
+
+        class inner2(TPropContainer):
+            message = TutoriusProperty()
+            other_data = TutoriusProperty()
+            def __init__(self, message, data):
+                TPropContainer.__init__(self)
+                self.message = message
+                self.other_data = data
+
+        obj1 = klass1()
+        obj1.addon_list = [inner1('Hi!', 12), inner1('Hello.', [1,2])]
+        obj2 = klass1()
+        obj2.addon_list = [inner1('Hi!', 12), inner1('Hello.', [1,2])]
+
+        assert obj1 == obj2, "Addon lists with the same containers were considered different"
+
+        obj3 = klass1()
+        obj3.addon_list = [inner1('Hi!', 12), inner2('Hello.', [1,2])]
+        assert not (obj1 == obj3), "Differently named properties should be considered different in the addon list tests"
+
 class TIntPropertyTest(unittest.TestCase):
     def test_int_property(self):
         class klass(TPropContainer):
@@ -251,7 +375,7 @@ class TArrayPropertyTest(unittest.TestCase):
             prop = TArrayProperty([1, 2, 3, 4])
         obj = klass()
         
-        assert obj.prop == [1,2,3,4], "Unable to set initial value via constructor"
+        assert obj.prop == (1,2,3,4), "Unable to set initial value via constructor"
         
         assert klass.prop.type == "array", "Wrong type for array : %s"%klass.prop.type
         
@@ -377,19 +501,38 @@ class TEnumPropertyTest(unittest.TestCase):
         try_wrong_values(self.obj)
     
 class TFilePropertyTest(unittest.TestCase):
+    root_folder = "/tmp/tutorius"
+
     def setUp(self):
+        try:
+            os.mkdir(self.root_folder)
+        except:
+            pass
+        # Create some sample, unique files for the tests
+        self.temp_filename1 = os.path.join(self.root_folder, "sample_file1_" + str(uuid.uuid1())  + ".txt")
+        self.temp_file1 = file(self.temp_filename1, "w")
+        self.temp_file1.close()
+        self.temp_filename2 = os.path.join(self.root_folder, "sample_file2_" + str(uuid.uuid1())  + ".txt")
+        self.temp_file2 = file(self.temp_filename2, "w")
+        self.temp_file2.close()
+
         class klass(TPropContainer):
-            prop = TFileProperty("propertiestests.py")
+            prop = TFileProperty(self.temp_filename1)
         self.obj = klass()
+
+    def tearDown(self):
+        # Unlink the files from the disk when tests are over
+        os.unlink(self.temp_filename1)
+        os.unlink(self.temp_filename2)
         
     def test_basic_file(self):
-        assert self.obj.prop == "propertiestests.py", "Could not set initial value"
+        assert self.obj.prop == self.temp_filename1, "Could not set initial value"
         
         assert type(self.obj).prop.type == "file", "Wrong type for TFileProperty : %s"%type(self.obj).prop.type
         
-        self.obj.prop = "run-tests.py"
+        self.obj.prop = self.temp_filename2
         
-        assert self.obj.prop == "run-tests.py", "Could not change value"
+        assert self.obj.prop == self.temp_filename2, "Could not change value"
         
         try:
             self.obj.prop = "unknown/file/on/disk.gif"
@@ -397,6 +540,45 @@ class TFilePropertyTest(unittest.TestCase):
         except FileConstraintError:
             pass
 
+class TAddonPropertyTest(unittest.TestCase):
+    def test_wrong_value(self):
+        class klass1(TPropContainer):
+            addon = TAddonProperty()
+
+        class wrongAddon(object):
+            pass
+        
+        obj1 = klass1()
+        obj1.addon = klass1()
+        
+        try:
+            obj1.addon = wrongAddon()
+            assert False, "Addon Property should not accept non-TPropContainer values"
+        except ValueError:
+            pass
+
+class TAddonPropertyList(unittest.TestCase):
+    def test_wrong_value(self):
+        class klass1(TPropContainer):
+            addonlist = TAddonListProperty()
+
+        class wrongAddon(object):
+            pass
+
+        obj1 = klass1()
+
+        obj1.addonlist = [klass1(), klass1()]
+
+        try:
+            obj1.addonlist = klass1()
+            assert False, "TAddonPropeprty shouldn't accept anything else than a list"
+        except ValueError:
+            pass
+
+        try:
+            obj1.addonlist = [klass1(), klass1(), wrongAddon(), klass1()]
+        except ValueError:
+            pass
 if __name__ == "__main__":
     unittest.main()
 
diff --git a/tests/run-tests.py b/tests/run-tests.py
deleted file mode 100755
index d41aa0a..0000000
--- a/tests/run-tests.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/python
-# This is a dumb script to run tests on the sugar-jhbuild installed files
-# The path added is the default path for the jhbuild build
-
-INSTALL_PATH="../../../../../../install/lib/python2.5/site-packages/"
-
-import os, sys
-sys.path.insert(0,
-    os.path.abspath(INSTALL_PATH)
-)
-
-FULL_PATH = os.path.join(INSTALL_PATH,"sugar/tutorius")
-SUBDIRS = ["uam"]
-GLOB_PATH = os.path.join(FULL_PATH,"*.py")
-import unittest
-from glob import glob
-def report_files():
-    ret = glob(GLOB_PATH)
-    for dir in SUBDIRS:
-        ret += glob(os.path.join(FULL_PATH,dir,"*.py"))
-    return ret
-
-import sys
-if __name__=='__main__':
-    if "--coverage" in sys.argv:
-        sys.argv=[arg for arg in sys.argv if arg != "--coverage"]
-        import coverage
-        coverage.erase()
-        #coverage.exclude('raise NotImplementedError')
-        coverage.start()
-
-        import coretests
-        import servicestests
-        import gtkutilstests
-        #import overlaytests # broken
-        import linear_creatortests
-        import actiontests
-        import uamtests
-        import filterstests
-        import constraintstests
-        import propertiestests
-        import serializertests
-        suite = unittest.TestSuite()
-        suite.addTests(unittest.findTestCases(coretests))
-        suite.addTests(unittest.findTestCases(servicestests))
-        suite.addTests(unittest.findTestCases(gtkutilstests))
-        #suite.addTests(unittest.findTestCases(overlaytests)) # broken
-        suite.addTests(unittest.findTestCases(linear_creatortests))
-        suite.addTests(unittest.findTestCases(actiontests))
-        suite.addTests(unittest.findTestCases(uamtests))
-        suite.addTests(unittest.findTestCases(filterstests))
-        suite.addTests(unittest.findTestCases(constraintstests))
-        suite.addTests(unittest.findTestCases(propertiestests))
-        suite.addTests(unittest.findTestCases(serializertests))
-        runner = unittest.TextTestRunner()
-        runner.run(suite)
-        coverage.stop()
-        coverage.report(report_files())
-        coverage.erase()
-    else:
-        from coretests import *
-        from servicestests import *
-        from gtkutilstests import *
-        #from overlaytests import * # broken
-        from actiontests import *
-        from linear_creatortests import *
-        from uamtests import *
-        from filterstests import *
-        from constraintstests import *
-        from propertiestests import *
-        from actiontests import *
-        from serializertests import *
-
-        unittest.main()
diff --git a/tests/skip b/tests/skip
index 2061a09..882d14d 100644
--- a/tests/skip
+++ b/tests/skip
@@ -1,2 +1,3 @@
 run-tests.py
 overlaytests.py
+viewer.py
diff --git a/tests/storetests.py b/tests/storetests.py
new file mode 100644
index 0000000..da20c00
--- /dev/null
+++ b/tests/storetests.py
@@ -0,0 +1,107 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import unittest
+
+from sugar.tutorius.store import *
+
+g_tutorial_id = '114db454-b2a1-11de-8cfc-001f5bf747dc'
+g_other_id = '47efc6ee-b2a3-11de-8cfc-001f5bf747dc'
+
+class StoreProxyTest(unittest.TestCase):
+    def setUp(self):
+        self.store = StoreProxy()
+
+    def tearDown(self):
+        pass
+
+    def test_get_categories(self):
+        categories = self.store.get_categories()
+
+        assert isinstance(categories, list), "categories should be a list"
+
+    def test_get_tutorials(self):
+        self.store.get_tutorials()
+
+    def test_get_tutorial_collection(self):
+        collection_list = self.store.get_tutorial_collection('top5_rating')
+
+        assert isinstance(collection_list, list), "get_tutorial_collection should return a list"
+
+    def test_get_latest_version(self):
+        version_dict = self.store.get_latest_version([])
+
+        assert isinstance(version_dict, dict)
+
+    def test_download_tutorial(self):
+        tutorial = self.store.download_tutorial(g_tutorial_id)
+        
+        assert tutorial is not None
+
+    def test_login(self):
+        assert self.store.login("unknown_user", "random_password")
+
+    def test_register_new_user(self):
+        user_info = {
+            'name' : "Albert",
+            'last_name' : "The Tester",
+            'location' : 'Mozambique',
+            'email' : 'albertthetester@mozambique.org'
+        }
+        
+        assert self.store.register_new_user(user_info)
+            
+     
+class StoreProxyLoginTest(unittest.TestCase):
+    def setUp(self):
+        self.store = StoreProxy()
+        self.store.login("unknown_user", "random_password")
+
+    def tearDown(self):
+        session_id = self.store.get_session_id()
+
+        if session_id is not None:
+            self.store.close_session()
+    
+    def test_close_session(self):
+        assert self.store.close_session()
+
+    def test_get_session_id(self):
+        session_id = self.store.get_session_id()
+        
+        assert session_id is not None
+
+    def test_rate(self):
+        assert self.store.rate(5, g_tutorial_id)
+
+    def test_publish(self):
+        # TODO : We need to send in a real tutorial loaded from
+        # the Vault
+        assert self.store.publish(['This should be a real tutorial...'])
+
+    def test_unpublish(self):
+        # TODO : We need to send in a real tutorial loaded from
+        # the Vault
+        self.store.publish([g_tutorial_id, 'Fake tutorial'])
+
+        assert self.store.unpublish(g_tutorial_id)
+
+    def test_update_published_tutorial(self):
+        # TODO : Run these tests with files from the Vault
+        self.store.publish([g_tutorial_id, 'Fake tutorial'])
+
+        assert self.store.update_published_tutorial(g_tutorial_id, [g_tutorial_id, 'This is an updated tutorial']) 
+    
diff --git a/tests/vaulttests.py b/tests/vaulttests.py
index df79cea..d1d1c8d 100644
--- a/tests/vaulttests.py
+++ b/tests/vaulttests.py
@@ -102,12 +102,12 @@ class VaultInterfaceTest(unittest.TestCase):
         # Create a dummy fsm
         self.fsm = FiniteStateMachine("testingMachine")
         # Add a few states
-        act1 = addon.create('BubbleMessage', message="Hi", pos=[300, 450])
-        ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked", "Second")
-        act2 = addon.create('BubbleMessage', message="Second message", pos=[250, 150], tailpos=[1,2])
+        act1 = addon.create('BubbleMessage', message="Hi", position=[300, 450])
+        ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked")
+        act2 = addon.create('BubbleMessage', message="Second message", position=[250, 150], tail_pos=[1,2])
         st1 = State("INIT")
         st1.add_action(act1)
-        st1.add_event_filter(ev1)
+        st1.add_event_filter(ev1, 'Second')
         st2 = State("Second")
         st2.add_action(act2)
         self.fsm.add_state(st1)
@@ -328,13 +328,13 @@ class XMLSerializerTest(unittest.TestCase):
         self.fsm = FiniteStateMachine("testingMachine")
         
         # Add a few states
-        act1 = addon.create('BubbleMessage', message="Hi", pos=[300, 450])
-        ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked", "Second")
-        act2 = addon.create('BubbleMessage', message="Second message", pos=[250, 150], tailpos=[1,2])
+        act1 = addon.create('BubbleMessage', message="Hi", position=[300, 450])
+        ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked")
+        act2 = addon.create('BubbleMessage', message="Second message", position=[250, 150], tail_pos=[1,2])
         
         st1 = State("INIT")
         st1.add_action(act1)
-        st1.add_event_filter(ev1)
+        st1.add_event_filter(ev1, 'Second')
         
         st2 = State("Second")
         
@@ -353,7 +353,6 @@ class XMLSerializerTest(unittest.TestCase):
         """
         Removes the created files, if need be.
         """
-        pass
         if self.remove == True:
             shutil.rmtree(os.path.join(sugar.tutorius.vault._get_store_root(), 'test_bundle_path'))
             
@@ -413,14 +412,14 @@ class XMLSerializerTest(unittest.TestCase):
         """
         st = State("INIT")
         
-        act1 = addon.create('BubbleMessage', "Hi!", pos=[10,120], tailpos=[-12,30])
-        act2 = addon.create('DialogMessage', "Hello again.", pos=[120,10])
-        act3 = WidgetIdentifyAction()
-        act4 = DisableWidgetAction("0.0.0.1.0.0.0")
-        act5 = TypeTextAction("0.0.0.1.1.1.0.0", "New text")
-        act6 = ClickAction("0.0.1.0.1.1")
-        act7 = OnceWrapper(act1)
-        act8 = ChainAction([act1, act2, act3, act4])
+        act1 = addon.create('BubbleMessage', "Hi!", position=[10,120], tail_pos=[-12,30])
+        act2 = addon.create('DialogMessage', "Hello again.", position=[120,10])
+        act3 = addon.create('WidgetIdentifyAction')
+        act4 = addon.create('DisableWidgetAction', "0.0.0.1.0.0.0")
+        act5 = addon.create('TypeTextAction', "0.0.0.1.1.1.0.0", "New text")
+        act6 = addon.create('ClickAction', "0.0.1.0.1.1")
+        act7 = addon.create('OnceWrapper', action=act1)
+        act8 = addon.create('ChainAction', actions=[act1, act2, act3, act4])
         actions = [act1, act2, act3, act4, act5, act6, act7, act8]
         
         for action in actions:
@@ -445,14 +444,14 @@ class XMLSerializerTest(unittest.TestCase):
         """
         st = State("INIT")
         
-        ev1 = TimerEvent("Second", 1000)
-        ev2 = addon.create('GtkWidgetEventFilter', "Second", "0.0.1.1.0.0.1", "clicked")
-        ev3 = GtkWidgetTypeFilter("Second", "0.0.1.1.1.2.3", text="Typed stuff")
-        ev4 = GtkWidgetTypeFilter("Second", "0.0.1.1.1.2.3", strokes="acbd")
+        ev1 = addon.create('TimerEvent', 1000)
+        ev2 = addon.create('GtkWidgetEventFilter', object_id="0.0.1.1.0.0.1", event_name="clicked")
+        ev3 = addon.create('GtkWidgetTypeFilter',  "0.0.1.1.1.2.3", text="Typed stuff")
+        ev4 = addon.create('GtkWidgetTypeFilter',  "0.0.1.1.1.2.3", strokes="acbd")
         filters = [ev1, ev2, ev3, ev4]
         
         for filter in filters:
-            st.add_event_filter(filter)
+            st.add_event_filter(filter, 'Second')
             
         self.fsm.remove_state("INIT")
         self.fsm.add_state(st)
@@ -514,4 +513,4 @@ class TutorialBundlerTests(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main() 
\ No newline at end of file
diff --git a/tests/viewer.py b/tests/viewer.py
new file mode 100755
index 0000000..6c564bf
--- /dev/null
+++ b/tests/viewer.py
@@ -0,0 +1,314 @@
+#!/usr/bin/env python
+import sys
+import os
+SUGAR_PREFIX = os.getenv('SUGAR_PREFIX')
+sys.path.append(SUGAR_PREFIX+'/lib/python2.6/site-packages')
+
+import gtk, gtk.gdk
+import cairo
+from math import pi as PI
+PI2 = PI/2
+
+import rsvg
+
+from sugar.bundle import activitybundle
+ACTIVITY_PATH = '%s/share/sugar/activities/'%SUGAR_PREFIX
+#ACTIVITY_PATH = os.getenv('SUGAR_BUNDLE_PATH')
+
+# FIXME ideally, apps scale correctly and we should use proportional positions
+X_WIDTH = 800
+X_HEIGHT = 600
+ACTION_WIDTH = 100
+ACTION_HEIGHT = 70
+
+# block look
+BLOCK_PADDING = 5
+BLOCK_WIDTH = 100
+BLOCK_CORNERS = 10
+BLOCK_INNER_PAD = 10
+
+SNAP_WIDTH = BLOCK_WIDTH - BLOCK_PADDING - BLOCK_INNER_PAD*2
+SNAP_HEIGHT = SNAP_WIDTH*X_HEIGHT/X_WIDTH
+SNAP_SCALE = float(SNAP_WIDTH)/X_WIDTH
+
+# load data structure
+states = dict(
+    INIT=dict(
+        next='state1',
+        app='Browse',
+        actions=[dict(name='message', pos=[20,5])],
+        events=[{'name':'click', 'pos':(200,200)}],
+    ),
+    state1=dict(
+        next='state2',
+        app='Browse',
+        actions=[dict(name='mock')],
+        events=[{'name':'click', 'pos':(200,100)},{'pos':(200,200), 'name':'keyboard'}],
+    ),
+    state2=dict(
+        next='state3',
+        app='Write',
+        actions=[dict(name='flash', pos=[2,5]), dict(name='text', pos=[400,500])],
+        events=[{'name':'keyboard'}],
+    ),
+    state3=dict(
+        next='state4',
+        app='Write',
+        actions=[dict(name='message', pos=[2,5]), dict(name='hilight', pos=[600,100]), dict(name='message', pos=[300,500])],
+        events=[{'name':'click'}],
+    ),
+    state4=dict(
+        app='Browse',
+        next=None,
+        actions=[dict(name='message', pos=[200,5])],
+        events=[{'name':'scratch&smell'}],
+    ),
+)
+
+def _paint_state(ctx, states):
+    """
+    Paints a tutorius fsm state in a cairo context.
+    Final context state will be shifted by the size of the graphics.
+    """
+    block_width = BLOCK_WIDTH - BLOCK_PADDING
+    block_max_height = alloc.height
+
+    cur_state = 'INIT'
+    cur_app = states[cur_state]['app']
+    app_start = ctx.get_matrix()
+    while cur_state:
+        state = states[cur_state]
+        new_app = state['app']
+        if new_app != cur_app:
+            ctx.save()
+            ctx.set_matrix(app_start)
+            _render_app_hints(ctx, cur_app)
+            ctx.restore()
+            app_start = ctx.get_matrix()
+            ctx.translate(BLOCK_PADDING, 0)
+            cur_app = new_app
+
+        local_height = (block_max_height - BLOCK_PADDING)/len(state['actions']) - BLOCK_PADDING
+        ctx.save()
+        for action in state['actions']:
+            origin = tuple(ctx.get_matrix())[-2:]
+            if click_pos and \
+               click_pos[0]-BLOCK_WIDTH<origin[0] and \
+               drag_pos[0]>origin[0]:
+                selection.append(action)
+            render_action(ctx, block_width, local_height, action)
+            ctx.translate(0, local_height+BLOCK_PADDING)
+
+        ctx.restore()
+        ctx.translate(BLOCK_WIDTH, 0)
+        local_height = (block_max_height - BLOCK_PADDING)/len(state['events']) - BLOCK_PADDING
+        ctx.save()
+        for event in state['events']:
+            origin = tuple(ctx.get_matrix())[-2:]
+            if click_pos and \
+               click_pos[0]-BLOCK_WIDTH<origin[0] and \
+               drag_pos[0]>origin[0]:
+                selection.append(event)
+            render_event(ctx, block_width, local_height, event)
+            ctx.translate(0, local_height+BLOCK_PADDING)
+
+        ctx.restore()
+        ctx.translate(BLOCK_WIDTH, 0)
+
+        # FIXME use special notation for happy path, not chaining
+        cur_state = state['next']
+        yield True
+
+    ctx.set_matrix(app_start)
+    _render_app_hints(ctx, cur_app)
+
+    yield False
+
+alloc = None
+click_pos = None
+drag_pos = None
+selection = []
+
+def _render_snapshot(ctx, elem):
+    ctx.set_source_rgba(1.0, 1.0, 1.0, 0.5)
+    ctx.rectangle(0, 0, SNAP_WIDTH, SNAP_HEIGHT)
+    ctx.fill_preserve()
+    ctx.stroke()
+
+    pos = elem.get('pos')
+    if pos:
+        # FIXME this size approximation is fine, but I believe we could
+        # do better.
+        ctx.scale(SNAP_SCALE, SNAP_SCALE)
+        ctx.rectangle(pos[0], pos[1], ACTION_WIDTH, ACTION_HEIGHT)
+        ctx.fill_preserve()
+        ctx.stroke()
+
+def _render_app_hints(ctx, appname):
+    ctx.set_source_rgb(0.0, 0.0, 0.0)
+    ctx.set_dash((1,1,0,0), 1)
+    ctx.move_to(0, 0)
+    ctx.line_to(0, alloc.height)
+    ctx.stroke()
+    ctx.set_dash(tuple(), 1)
+
+    icon_path = activitybundle.ActivityBundle(
+        os.path.join(ACTIVITY_PATH, appname+'.activity')).get_icon()
+    icon = rsvg.Handle(icon_path)
+    ctx.save()
+    ctx.translate(-15, 0)
+    ctx.scale(0.5, 0.5)
+    icon_surf = icon.render_cairo(ctx)
+    ctx.restore()
+
+
+def render_action(ctx, width, height, action):
+    ctx.save()
+    inner_width = width-(BLOCK_CORNERS<<1)
+    inner_height = height-(BLOCK_CORNERS<<1)
+
+    paint_border = ctx.rel_line_to
+    filling = cairo.LinearGradient(0, 0, 0, inner_height)
+    if action not in selection:
+        filling.add_color_stop_rgb(0.0, 0.7, 0.7, 1.0)
+        filling.add_color_stop_rgb(1.0, 0.1, 0.1, 0.8)
+    else:
+        filling.add_color_stop_rgb(0.0, 0.4, 0.4, 0.8)
+        filling.add_color_stop_rgb(1.0, 0.0, 0.0, 0.5)
+    tracing = cairo.LinearGradient(0, 0, 0, inner_height)
+    tracing.add_color_stop_rgb(0.0, 1.0, 1.0, 1.0)
+    tracing.add_color_stop_rgb(1.0, 0.2, 0.2, 0.2)
+
+    ctx.move_to(BLOCK_CORNERS, 0)
+    paint_border(inner_width, 0)
+    ctx.arc(inner_width+BLOCK_CORNERS, BLOCK_CORNERS, BLOCK_CORNERS, -PI2, 0.0)
+    ctx.arc(inner_width+BLOCK_CORNERS, inner_height+BLOCK_CORNERS, BLOCK_CORNERS, 0.0, PI2)
+    ctx.arc(BLOCK_CORNERS, inner_height+BLOCK_CORNERS, BLOCK_CORNERS, PI2, PI)
+    ctx.arc(BLOCK_CORNERS, BLOCK_CORNERS, BLOCK_CORNERS, -PI, -PI2)
+
+    ctx.set_source(tracing)
+    ctx.stroke_preserve()
+    ctx.set_source(filling)
+    ctx.fill()
+
+    ctx.save()
+    ctx.set_source_rgb(0, 0, 0)
+    ctx.move_to(BLOCK_INNER_PAD, BLOCK_INNER_PAD)
+    ctx.show_text(action['name'])
+    ctx.stroke()
+    ctx.restore()
+
+    ctx.translate(BLOCK_INNER_PAD, (height-SNAP_HEIGHT)/2)
+    _render_snapshot(ctx, action)
+
+    ctx.restore()
+
+def render_event(ctx, width, height, event):
+    ctx.save()
+    inner_width = width-(BLOCK_CORNERS<<1)
+    inner_height = height-(BLOCK_CORNERS<<1)
+
+    filling = cairo.LinearGradient(0, 0, 0, inner_height)
+    if event not in selection:
+        filling.add_color_stop_rgb(0.0, 1.0, 0.8, 0.6)
+        filling.add_color_stop_rgb(1.0, 1.0, 0.6, 0.2)
+    else:
+        filling.add_color_stop_rgb(0.0, 0.8, 0.6, 0.4)
+        filling.add_color_stop_rgb(1.0, 0.6, 0.4, 0.1)
+    tracing = cairo.LinearGradient(0, 0, 0, inner_height)
+    tracing.add_color_stop_rgb(0.0, 1.0, 1.0, 1.0)
+    tracing.add_color_stop_rgb(1.0, 0.3, 0.3, 0.3)
+
+    ctx.move_to(BLOCK_CORNERS, 0)
+    ctx.rel_line_to(inner_width, 0)
+    ctx.rel_line_to(BLOCK_CORNERS, BLOCK_CORNERS)
+    ctx.rel_line_to(0, inner_height)
+    ctx.rel_line_to(-BLOCK_CORNERS, BLOCK_CORNERS)
+    ctx.rel_line_to(-inner_width, 0)
+    ctx.rel_line_to(-BLOCK_CORNERS, -BLOCK_CORNERS)
+    ctx.rel_line_to(0, -inner_height)
+    ctx.close_path()
+
+    ctx.set_source(tracing)
+    ctx.stroke_preserve()
+    ctx.set_source(filling)
+    ctx.fill()
+
+    ctx.set_source_rgb(0, 0, 0)
+    ctx.move_to(BLOCK_INNER_PAD, BLOCK_INNER_PAD)
+    ctx.show_text(event['name'])
+    ctx.stroke()
+
+    ctx.translate(BLOCK_INNER_PAD, (height-SNAP_HEIGHT)/2)
+    _render_snapshot(ctx, event)
+
+    ctx.restore()
+
+def on_viewer_expose(widget, evt):
+    ctx = widget.window.cairo_create()
+    global alloc
+    alloc = widget.get_allocation()
+    ctx.set_source_pixmap(widget.window,
+                          widget.allocation.x,
+                          widget.allocation.y)
+
+    #draw no more than our expose event intersects our child
+    region = gtk.gdk.region_rectangle(widget.allocation)
+    r = gtk.gdk.region_rectangle(evt.area)
+    region.intersect(r)
+    ctx.region (region)
+    ctx.clip()
+    ctx.paint()
+
+    ctx.translate(BLOCK_PADDING, BLOCK_PADDING)
+
+    painter = _paint_state(ctx, states)
+    while painter.next(): pass
+
+    if click_pos and drag_pos:
+        ctx.set_matrix(cairo.Matrix())
+        ctx.rectangle(click_pos[0], click_pos[1], \
+                      drag_pos[0]-click_pos[0], drag_pos[1]-click_pos[1])
+        ctx.set_source_rgba(0, 0, 1, 0.5)
+        ctx.fill_preserve()
+        ctx.stroke()
+
+    return False
+
+def _on_click(widget, evt):
+    # the rendering pipeline will work out the click validation process
+    global selection, click_pos, drag_pos
+    drag_pos = None
+    drag_pos = click_pos = evt.get_coords()
+    widget.queue_draw()
+
+    widget.drag_source_set(gtk.gdk.BUTTON1_MASK, (('view', gtk.TARGET_SAME_APP, 42),), gtk.gdk.ACTION_DEFAULT)
+    widget.drag_source_set_icon_pixbuf(gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 100, 200).get_from_drawable(widget.window, widget.window.get_colormap(), int(click_pos[0]), 0, 0,0, 100,200))
+
+    selection = []
+
+def _on_drag(widget, evt):
+    global selection, click_pos, drag_pos
+    drag_pos = evt.get_coords()
+    widget.queue_draw()
+
+
+#if __name__=='__main__':
+if True:
+    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    win.set_size_request(1000, 200)
+    win.connect("destroy", gtk.mainquit)
+
+    canvas = gtk.DrawingArea()
+    win.add(canvas)
+    canvas.set_app_paintable(True)
+    canvas.connect_after("expose-event", on_viewer_expose)
+    canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_MOTION_MASK)
+    canvas.connect('button-press-event', _on_click)
+    canvas.connect('motion-notify-event', _on_drag)
+
+    win.show_all()
+    gtk.main()
+
+
+
diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py
new file mode 100644
index 0000000..6d7b6e2
--- /dev/null
+++ b/tutorius/TProbe.py
@@ -0,0 +1,506 @@
+import logging
+LOGGER = logging.getLogger("sugar.tutorius.TProbe")
+import os
+
+import gobject
+
+import dbus
+import dbus.service
+import cPickle as pickle
+
+import sugar.tutorius.addon as addon
+
+from sugar.tutorius.services import ObjectStore
+from sugar.tutorius.properties import TPropContainer
+
+from sugar.tutorius.dbustools import remote_call, save_args
+import copy
+
+"""
+  --------------------
+  |  ProbeManager    |
+  --------------------
+           |
+           V
+  --------------------                ----------
+  |    ProbeProxy    |<---- DBus ---->| TProbe |
+  --------------------                ----------
+
+"""
+#TODO Add stub error handling for remote calls in the classes so that it will
+# be clearer how errors can be handled in the future.
+
+
+class TProbe(dbus.service.Object):
+    """ Tutorius Probe
+        Defines an entry point for Tutorius into activities that allows
+        performing actions and registering events onto an activity via 
+        a DBUS Interface.
+    """
+
+    def __init__(self, activity_name, activity):
+        """
+        Create and register a TProbe for an activity.
+
+        @param activity_name unique activity_id
+        @param activity activity reference, must be a gtk container
+        """
+        LOGGER.debug("TProbe :: Creating TProbe for %s (%d)", activity_name, os.getpid())
+        LOGGER.debug("TProbe :: Current gobject context: %s", str(gobject.main_context_default()))
+        LOGGER.debug("TProbe :: Current gobject depth: %s", str(gobject.main_depth()))
+        # Moving the ObjectStore assignment here, in the meantime
+        # the reference to the activity shouldn't be share as a
+        # global variable but passed by the Probe to the objects 
+        # that requires it
+        self._activity = activity
+
+        ObjectStore().activity = activity
+
+        self._activity_name = activity_name
+        self._session_bus = dbus.SessionBus()
+
+        # Giving a new name because _name is already used by dbus
+        self._name2 = dbus.service.BusName(activity_name, self._session_bus)
+        dbus.service.Object.__init__(self, self._session_bus, "/tutorius/Probe")
+
+        # Add the dictionary we will use to store which actions and events
+        # are known
+        self._installedActions = {}
+        self._subscribedEvents = {}
+
+    def start(self):
+        """
+        Optional method to call if the probe is not inserted into an
+        existing activity. Starts a gobject mainloop
+        """
+        mainloop = gobject.MainLoop()
+        print "Starting Probe for " + self._activity_name
+        mainloop.run()
+
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='s', out_signature='')
+    def registered(self, service):
+        print ("Registered with: " + str(service))
+
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='', out_signature='s')
+    def ping(self):
+        """ 
+        Allows testing the connection to a Probe 
+        @return string "alive"
+        """
+        return "alive"
+
+    # ------------------ Action handling --------------------------------------
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='s', out_signature='s')
+    def install(self, pickled_action):
+        """ 
+        Install an action on the Activity
+        @param pickled_action string pickled action
+        @return string address of installed action
+        """
+        loaded_action = pickle.loads(str(pickled_action))
+        action = addon.create(loaded_action.__class__.__name__)
+
+        address = self._generate_action_reference(action)
+
+        self._installedActions[address] = action
+
+        if action._props:
+            action._props.update(loaded_action._props)
+
+        action.do()
+       
+        return address
+
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='ss', out_signature='')
+    def update(self, address, action_props):
+        """
+        Update an already registered action
+        @param address string address returned by install()
+        @param action_props pickled action properties
+        @return None
+        """
+        action = self._installedActions[address]
+
+        if action._props:
+            props = pickle.loads(str(action_props))
+            action._props.update(props)
+            action.undo()
+            action.do()
+
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='s', out_signature='')
+    def uninstall(self, address):
+        """
+        Uninstall an action
+        @param address string address returned by install()
+        @return None
+        """
+        if self._installedActions.has_key(address):
+            action = self._installedActions[address]
+            action.undo()
+            self._installedActions.pop(address)
+    
+
+    # ------------------ Event handling ---------------------------------------
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='s', out_signature='s')
+    def subscribe(self, pickled_event):
+        """ 
+        Subscribe to an Event
+        @param pickled_event string pickled EventFilter
+        @return string unique name of registered event
+        """
+        #TODO Perform event unmapping once Tutorials use abstract events 
+        #   instead of concrete EventFilters that are tied to their 
+        #   implementation.
+        eventfilter = pickle.loads(str(pickled_event))
+
+        # The callback uses the event defined previously and each
+        # successive call to subscribe will register a different
+        # callback that references a different event
+        def callback(*args):
+            self.notify(eventfilter)
+
+        eventfilter.install_handlers(callback, activity=self._activity)
+
+        name = self._generate_event_reference(eventfilter)
+        self._subscribedEvents[name] = eventfilter
+        
+        return name
+
+    @dbus.service.method("org.tutorius.ProbeInterface",
+                         in_signature='s', out_signature='')
+    def unsubscribe(self, address):
+        """
+        Remove subscription to an event
+        @param address string adress returned by subscribe()
+        @return None
+        """
+
+        if self._subscribedEvents.has_key(address):
+            eventfilter = self._subscribedEvents[address]
+            eventfilter.remove_handlers()
+            self._subscribedEvents.pop(address)
+
+    @dbus.service.signal("org.tutorius.ProbeInterface")
+    def eventOccured(self, event):
+        # We need no processing now, the signal will be sent
+        # when the method exit
+        pass
+
+    # The actual method we will call on the probe to send events
+    def notify(self, event):
+        LOGGER.debug("TProbe :: notify event %s", str(event))
+        self.eventOccured(pickle.dumps(event))
+
+    # Return a unique name for this action 
+    def _generate_action_reference(self, action):
+        # TODO elavoie 2009-07-25 Should return a universal address
+        name = action.__class__.__name__
+        suffix = 1
+
+        while self._installedActions.has_key(name+str(suffix)):
+            suffix += 1
+
+        return name + str(suffix)
+
+
+    # Return a unique name for this event
+    def _generate_event_reference(self, event):
+        # TODO elavoie 2009-07-25 Should return a universal address
+        name = event.__class__.__name__
+        #Keep the counter to avoid looping all the time
+        suffix = getattr(self, '_event_ref_suffix', 0 ) + 1
+
+        while self._subscribedEvents.has_key(name+str(suffix)):
+            suffix += 1
+        
+        #setattr(self, '_event_ref_suffix', suffix)
+
+        return name + str(suffix)
+
+class ProbeProxy:
+    """
+    ProbeProxy is a Proxy class for connecting to a remote TProbe.
+
+    It provides an object interface to the TProbe, which requires pickled
+    strings, across a DBus communication.
+    """
+    def __init__(self, activityName):
+        """
+        Constructor
+        @param activityName unique activity id. Must be a valid dbus bus name.
+        """
+        LOGGER.debug("ProbeProxy :: Creating ProbeProxy for %s (%d)", activityName, os.getpid())
+        LOGGER.debug("ProbeProxy :: Current gobject context: %s", str(gobject.main_context_default()))
+        LOGGER.debug("ProbeProxy :: Current gobject depth: %s", str(gobject.main_depth()))
+        bus = dbus.SessionBus()
+        self._object = bus.get_object(activityName, "/tutorius/Probe")
+        self._probe = dbus.Interface(self._object, "org.tutorius.ProbeInterface")
+        
+        self._actions = {}
+        # We keep those two data structures to be able to have multiple callbacks
+        # for the same event and be able to remove them independently
+        # _subscribedEvents holds a list of callback addresses's for each event
+        # _registeredCallbacks holds the functions to call for each address
+        self._subscribedEvents = {}
+        self._registeredCallbacks = {}
+
+
+        self._object.connect_to_signal("eventOccured", self._handle_signal, dbus_interface="org.tutorius.ProbeInterface")
+    
+    def _handle_signal(self, pickled_event):
+        event = pickle.loads(str(pickled_event))
+        LOGGER.debug("ProbeProxy :: Received Event : %s %s", str(event), str(event._props.items()))
+
+        LOGGER.debug("ProbeProxy :: Currently %d events registered", len(self._registeredCallbacks))
+        if self._registeredCallbacks.has_key(event):
+            for callback in self._registeredCallbacks[event].values():
+                callback(event)
+        else:
+            for event in self._registeredCallbacks.keys():
+                LOGGER.debug("==== %s", str(event._props.items()))
+            LOGGER.debug("ProbeProxy :: Event does not appear to be registered")
+
+    def isAlive(self):
+        try:
+            return self._probe.ping() == "alive"
+        except:
+            return False
+
+    def __update_action(self, action, address):
+        LOGGER.debug("ProbeProxy :: Updating action %s with address %s", str(action), str(address))
+        self._actions[action] = str(address)
+
+    def __clear_action(self, action):
+        self._actions.pop(action, None)
+
+    def install(self, action, block=False):
+        """
+        Install an action on the TProbe's activity
+        @param action Action to install
+        @param block Force a synchroneous dbus call if True
+        @return None
+        """
+        return remote_call(self._probe.install, (pickle.dumps(action),),
+           save_args(self.__update_action, action),
+           block=block)
+
+    def update(self, action, newaction, block=False):
+        """
+        Update an already installed action's properties and run it again
+        @param action Action to update
+        @param newaction Action to update it with
+        @param block Force a synchroneous dbus call if True
+        @return None
+        """
+        #TODO review how to make this work well
+        if not action in self._actions:
+            raise RuntimeWarning("Action not installed")
+        #TODO Check error handling
+        return remote_call(self._probe.update, (self._actions[action], pickle.dumps(newaction._props)), block=block)
+
+    def uninstall(self, action, block=False):
+        """
+        Uninstall an installed action
+        @param action Action to uninstall
+        @param block Force a synchroneous dbus call if True
+        """
+        if action in self._actions:
+            remote_call(self._probe.uninstall,(self._actions.pop(action),), block=block)
+
+    def __update_event(self, event, callback, address):
+        LOGGER.debug("ProbeProxy :: Registered event %s with address %s", str(hash(event)), str(address))
+        # Since multiple callbacks could be associated to the same
+        # event signature, we will store multiple callbacks
+        # in a dictionary indexed by the unique address
+        # given for this subscribtion and access this
+        # dictionary from another one indexed by event
+        address = str(address)
+
+        # We use the event object as a key
+        if not self._registeredCallbacks.has_key(event):
+            self._registeredCallbacks[event] = {}
+
+        # TODO elavoie 2009-07-25 decide on a proper exception
+        # taxonomy
+        if self._registeredCallbacks[event].has_key(address):
+            # Oups, how come we have two similar addresses?
+            # send the bad news!
+            raise Exception("Probe subscribe exception, the following address already exists: " + str(address))
+
+        self._registeredCallbacks[event][address] = callback
+
+        # We will keep another dictionary to remember the
+        # event that was associated to this unique address
+        # Let's copy to make sure that even if the event
+        # passed in is modified later it won't screw up
+        # our dictionary (python pass arguments by reference)
+        self._subscribedEvents[address] = copy.copy(event)
+
+        return address
+
+    def __clear_event(self, address):
+        LOGGER.debug("ProbeProxy :: Unregistering adress %s", str(address))
+        # Cleanup everything
+        if self._subscribedEvents.has_key(address):
+            event = self._subscribedEvents[address]
+            
+            if self._registeredCallbacks.has_key(event)\
+            and self._registeredCallbacks[event].has_key(address):
+                self._registeredCallbacks[event].pop(address)
+
+            if self._registeredCallbacks[event] == {}:
+                self._registeredCallbacks.pop(event)
+
+            self._subscribedEvents.pop(address)
+        else:
+            LOGGER.debug("ProbeProxy :: unsubsribe address %s inconsistency : not registered", address)
+
+    def subscribe(self, event, callback, block=True):
+        """
+        Register an event listener
+        @param event Event to listen for
+        @param callback callable that will be called when the event occurs
+        @param block Force a synchroneous dbus call if True (Not allowed yet)
+        @return address identifier used for unsubscribing
+        """
+        LOGGER.debug("ProbeProxy :: Registering event %s", str(hash(event)))
+        if not block:
+            raise RuntimeError("This function does not allow non-blocking mode yet")
+
+        # TODO elavoie 2009-07-25 When we will allow for patterns both
+        # for event types and sources, we will need to revise the lookup
+        # mecanism for which callback function to call
+        return remote_call(self._probe.subscribe, (pickle.dumps(event),),
+            save_args(self.__update_event, event, callback),
+            block=block)
+
+    def unsubscribe(self, address, block=True):
+        """
+        Unregister an event listener
+        @param address identifier given by subscribe()
+        @param block Force a synchroneous dbus call if True
+        @return None
+        """
+        LOGGER.debug("ProbeProxy :: Unregister adress %s issued", str(address))
+        if not block:
+            raise RuntimeError("This function does not allow non-blocking mode yet")
+        if address in self._subscribedEvents.keys():
+            remote_call(self._probe.unsubscribe, (address,),
+                return_cb=save_args(self.__clear_event, address),
+                block=block)
+        else:
+            LOGGER.debug("ProbeProxy :: unsubsribe address %s failed : not registered", address)
+
+    def detach(self, block=False):
+        """
+        Detach the ProbeProxy from it's TProbe. All installed actions and 
+        subscribed events should be removed.
+        """
+        for action in self._actions.keys():
+            self.uninstall(action, block)
+
+        for address in self._subscribedEvents.keys():
+            self.unsubscribe(address, block)
+
+
+class ProbeManager(object):
+    """
+    The ProbeManager provides multiplexing across multiple activity ProbeProxies
+
+    For now, it only handles one at a time, though.
+    Actually it doesn't do much at all. But it keeps your encapsulation happy
+    """
+    def __init__(self):
+        self._probes = {}
+        self._current_activity = None
+
+    def setCurrentActivity(self, activity_id):
+        if not activity_id in self._probes:
+            raise RuntimeError("Activity not attached")
+        self._current_activity = activity_id
+
+    def getCurrentActivity(self):
+        return self._current_activity
+
+    currentActivity = property(fget=getCurrentActivity, fset=setCurrentActivity)
+    def attach(self, activity_id):
+        if activity_id in self._probes:
+            raise RuntimeWarning("Activity already attached")
+
+        self._probes[activity_id] = ProbeProxy(activity_id)
+        #TODO what do we do with this? Raise something?
+        if self._probes[activity_id].isAlive():
+            print "Alive!"
+        else:
+            print "FAil!"
+
+    def detach(self, activity_id):
+        if activity_id in self._probes:
+            probe = self._probes.pop(activity_id)
+            probe.detach()
+
+    def install(self, action, block=False):
+        """
+        Install an action on the current activity
+        @param action Action to install
+        @param block Force a synchroneous dbus call if True
+        @return None
+        """
+        if self.currentActivity:
+            return self._probes[self.currentActivity].install(action, block)
+        else:
+            raise RuntimeWarning("No activity attached")
+
+    def update(self, action, newaction, block=False):
+        """
+        Update an already installed action's properties and run it again
+        @param action Action to update
+        @param newaction Action to update it with
+        @param block Force a synchroneous dbus call if True
+        @return None
+        """
+        if self.currentActivity:
+            return self._probes[self.currentActivity].update(action, newaction, block)
+        else:
+            raise RuntimeWarning("No activity attached")
+
+    def uninstall(self, action, block=False):
+        """
+        Uninstall an installed action
+        @param action Action to uninstall
+        @param block Force a synchroneous dbus call if True
+        """
+        if self.currentActivity:
+            return self._probes[self.currentActivity].uninstall(action, block)
+        else:
+            raise RuntimeWarning("No activity attached")
+
+    def subscribe(self, event, callback):
+        """
+        Register an event listener
+        @param event Event to listen for
+        @param callback callable that will be called when the event occurs
+        @return address identifier used for unsubscribing
+        """
+        if self.currentActivity:
+            return self._probes[self.currentActivity].subscribe(event, callback)
+        else:
+            raise RuntimeWarning("No activity attached")
+
+    def unsubscribe(self, address):
+        """
+        Unregister an event listener
+        @param address identifier given by subscribe()
+        @return None
+        """
+        if self.currentActivity:
+            return self._probes[self.currentActivity].unsubscribe(address)
+        else:
+            raise RuntimeWarning("No activity attached")
+
diff --git a/tutorius/actions.py b/tutorius/actions.py
index 4269cd7..08f55cd 100644
--- a/tutorius/actions.py
+++ b/tutorius/actions.py
@@ -16,16 +16,14 @@
 """
 This module defines Actions that can be done and undone on a state
 """
+import gtk
+
 from gettext import gettext as _
 
-from sugar.tutorius import gtkutils, addon
-from dialog import TutoriusDialog
-import overlayer
-from sugar.tutorius.editor import WidgetIdentifier
+from sugar.tutorius import addon
 from sugar.tutorius.services import ObjectStore
 from sugar.tutorius.properties import *
 from sugar.graphics import icon
-import gtk.gdk
 
 class DragWrapper(object):
     """Wrapper to allow gtk widgets to be dragged around"""
@@ -176,149 +174,4 @@ class Action(TPropContainer):
         x, y = self._drag.position
         self.position = [int(x), int(y)]
         self.__edit_img.destroy()
-
-class OnceWrapper(Action):
-    """
-    Wraps a class to perform an action once only
-
-    This ConcreteActions's do() method will only be called on the first do()
-    and the undo() will be callable after do() has been called
-    """
-
-    _action = TAddonProperty()
-
-    def __init__(self, action):
-        Action.__init__(self)
-        self._called = False
-        self._need_undo = False
-        self._action = action
-
-    def do(self):
-        """
-        Do the action only on the first time
-        """
-        if not self._called:
-            self._called = True
-            self._action.do()
-            self._need_undo = True
-
-    def undo(self):
-        """
-        Undo the action if it's been done
-        """
-        if self._need_undo:
-            self._action.undo()
-            self._need_undo = False
-
-class WidgetIdentifyAction(Action):
-    def __init__(self):
-        Action.__init__(self)
-        self.activity = None
-        self._dialog = None
-
-    def do(self):
-        os = ObjectStore()
-        if os.activity:
-            self.activity = os.activity
-
-            self._dialog = WidgetIdentifier(self.activity)
-            self._dialog.show()
-
-
-    def undo(self):
-        if self._dialog:
-            self._dialog.destroy()
-
-class ChainAction(Action):
-    """Utility class to allow executing actions in a specific order"""
-    def __init__(self, *actions):
-        """ChainAction(action1, ... ) builds a chain of actions"""
-        Action.__init__(self)
-        self._actions = actions
-
-    def do(self,**kwargs):
-        """do() each action in the chain"""
-        for act in self._actions:
-            act.do(**kwargs)
-
-    def undo(self):
-        """undo() each action in the chain, starting with the last"""
-        for act in reversed(self._actions):
-            act.undo()
-
-class DisableWidgetAction(Action):
-    def __init__(self, target):
-        """Constructor
-        @param target target treeish
-        """
-        Action.__init__(self)
-        self._target = target
-        self._widget = None
-
-    def do(self):
-        """Action do"""
-        os = ObjectStore()
-        if os.activity:
-            self._widget = gtkutils.find_widget(os.activity, self._target)
-            if self._widget:
-                self._widget.set_sensitive(False)
-                       
-    def undo(self):    
-        """Action undo"""
-        if self._widget:
-            self._widget.set_sensitive(True)
-                       
-                       
-class TypeTextAction(Action):
-    """                
-    Simulate a user typing text in a widget
-    Work on any widget that implements a insert_text method
-                       
-    @param widget The treehish representation of the widget
-    @param text the text that is typed
-    """                
-    def __init__(self, widget, text):
-        Action.__init__(self)
-                       
-        self._widget = widget
-        self._text = text
-                       
-    def do(self, **kwargs):
-        """            
-        Type the text  
-        """            
-        widget = gtkutils.find_widget(ObjectStore().activity, self._widget)
-        if hasattr(widget, "insert_text"):
-            widget.insert_text(self._text, -1)
-                       
-    def undo(self):    
-        """            
-        no undo        
-        """            
-        pass           
-                       
-class ClickAction(Action):
-    """                
-    Action that simulate a click on a widget    
-    Work on any widget that implements a clicked() method
-                       
-    @param widget The threehish representation of the widget
-    """                
-    def __init__(self, widget):
-        Action.__init__(self)
-        self._widget = widget
-                       
-    def do(self):      
-        """            
-        click the widget
-        """
-        widget = gtkutils.find_widget(ObjectStore().activity, self._widget)
-        if hasattr(widget, "clicked"):
-            widget.clicked()
         
-    def undo(self):
-        """
-        No undo
-        """
-        pass
-
diff --git a/tutorius/addon.py b/tutorius/addon.py
index 51791d1..15612c8 100644
--- a/tutorius/addon.py
+++ b/tutorius/addon.py
@@ -56,7 +56,12 @@ def create(name, *args, **kwargs):
     if not _cache:
         _reload_addons()
     try:
-        return _cache[name]['class'](*args, **kwargs)
+        comp_metadata = _cache[name]
+        try:
+            return comp_metadata['class'](*args, **kwargs)
+        except:
+            logging.error("Could not instantiate %s with parameters %s, %s"%(comp_metadata['name'],str(args), str(kwargs)))
+            return None 
     except KeyError:
         logging.error("Addon not found for class '%s'", name)
         return None
diff --git a/tutorius/constraints.py b/tutorius/constraints.py
index 36abdfb..e91f23a 100644
--- a/tutorius/constraints.py
+++ b/tutorius/constraints.py
@@ -200,7 +200,10 @@ class FileConstraint(Constraint):
     def validate(self, value):
         # TODO : Decide on the architecture for file retrieval on disk
         # Relative paths? From where? Support macros?
-        # 
+        # FIXME This is a hack to make cases where a default file is not valid
+        # work. It allows None values to be validated, though
+        if value is None:
+            return
         if not os.path.isfile(value):
             raise FileConstraintError("Non-existing file : %s"%value)
         return
diff --git a/tutorius/core.py b/tutorius/core.py
index dd2435e..d08c136 100644
--- a/tutorius/core.py
+++ b/tutorius/core.py
@@ -21,14 +21,12 @@ This module contains the core classes for tutorius
 
 """
 
-import gtk
 import logging
-import copy 
 import os
 
-from sugar.tutorius.dialog import TutoriusDialog
-from sugar.tutorius.gtkutils import find_widget
-from sugar.tutorius.services import ObjectStore
+from sugar.tutorius.TProbe import ProbeManager
+from sugar.tutorius.dbustools import save_args
+from sugar.tutorius import addon
 
 logger = logging.getLogger("tutorius")
 
@@ -36,8 +34,11 @@ class Tutorial (object):
     """
     Tutorial Class, used to run through the FSM.
     """
+    #Properties
+    probeManager = property(lambda self: self._probeMgr)
+    activityId = property(lambda self: self._activity_id)
 
-    def __init__(self, name, fsm,filename= None):
+    def __init__(self, name, fsm, filename=None):
         """
         Creates an unattached tutorial.
         """
@@ -51,21 +52,22 @@ class Tutorial (object):
         self.state = None
 
         self.handlers = []
-        self.activity = None
+        self._probeMgr = ProbeManager()
+        self._activity_id = None
         #Rest of initialisation happens when attached
 
-    def attach(self, activity):
+    def attach(self, activity_id):
         """
         Attach to a running activity
         
-        @param activity the activity to attach to
+        @param activity_id the id of the activity to attach to
         """
         #For now, absolutely detach if a previous one!
-        if self.activity:
+        if self._activity_id:
             self.detach()
-        self.activity = activity
-        ObjectStore().activity = activity
-        ObjectStore().tutorial = self
+        self._activity_id = activity_id
+        self._probeMgr.attach(activity_id)
+        self._probeMgr.currentActivity = activity_id
         self._prepare_activity()
         self.state_machine.set_state("INIT")
 
@@ -77,9 +79,9 @@ class Tutorial (object):
         # Uninstall the whole FSM
         self.state_machine.teardown()
 
-        #FIXME There should be some amount of resetting done here...
-        self.activity = None
-        
+        if not self._activity_id is None:
+            self._probeMgr.detach(self._activity_id)
+            self._activity_id = None
 
     def set_state(self, name):
         """
@@ -89,18 +91,6 @@ class Tutorial (object):
         
         self.state_machine.set_state(name)
 
-
-    # Currently unused -- equivalent function is in each state
-    def _eventfilter_state_done(self, eventfilter):
-        """
-        Callback handler for eventfilter to notify
-        when we must go to the next state.
-        """
-        #XXX Tests should be run here normally
-
-        #Swith to the next state pointed by the eventfilter
-        self.set_state(eventfilter.get_next_state())
-        
     def _prepare_activity(self):
         """
         Prepare the activity for the tutorial by loading the saved state and
@@ -112,9 +102,11 @@ class Tutorial (object):
             #of the activity root directory
             filename = os.getenv("SUGAR_ACTIVITY_ROOT") + "/data/" +\
                 self.activity_init_state_filename
-            if os.path.exists(filename):
-                self.activity.read_file(filename)
-
+            readfile = addon.create("ReadFile", filename=filename)
+            if readfile:
+                self._probeMgr.install(readfile)
+                #Uninstall now while we have the reference handy
+                self._probeMgr.uninstall(readfile)
 
 class State(object):
     """
@@ -141,10 +133,9 @@ class State(object):
         
         self._actions = action_list or []
         
-        # Unused for now
-        #self.tests = []
+        self._transitions= dict(event_filter_list or [])
         
-        self._event_filters = event_filter_list or []
+        self._installedEvents = set()
         
         self.tutorial = tutorial
 
@@ -168,12 +159,11 @@ class State(object):
         Install the state itself, by first registering the event filters
         and then triggering the actions.
         """
-        for eventfilter in self._event_filters:
-            eventfilter.install_handlers(self._event_filter_state_done_cb, 
-                activity=self.tutorial.activity)
+        for (event, next_state) in self._transitions.items():
+            self._installedEvents.add(self.tutorial.probeManager.subscribe(event, save_args(self._event_filter_state_done_cb, next_state )))
         
         for action in self._actions:
-            action.do()
+            self.tutorial.probeManager.install(action)
     
     def teardown(self):
         """
@@ -182,38 +172,37 @@ class State(object):
         removing dialogs that were displayed, removing highlights, etc...
         """
         # Remove the handlers for the all of the state's event filters
-        for event_filter in self._event_filters:
-            event_filter.remove_handlers()
+        while len(self._installedEvents) > 0:
+            self.tutorial.probeManager.unsubscribe(self._installedEvents.pop())
         
         # Undo all the actions related to this state
         for action in self._actions:
-            action.undo()
+            self.tutorial.probeManager.uninstall(action)
     
-    def _event_filter_state_done_cb(self, event_filter):
+    def _event_filter_state_done_cb(self, next_state, event):
         """
         Callback for event filters. This function needs to inform the
         tutorial that the state is over and tell it what is the next state.
         
-        @param event_filter The event filter that was called
+        @param next_state The next state for the transition
+        @param event The event that occured
         """
         # Run the tests here, if need be
         
         # Warn the higher level that we wish to change state
-        self.tutorial.set_state(event_filter.get_next_state())
+        self.tutorial.set_state(next_state)
         
     # Model manipulation
     # These functions are used to simplify the creation of states
     def add_action(self, new_action):
         """
-        Adds an action to the state (only if it wasn't added before)
+        Adds an action to the state 
         
         @param new_action The new action to execute when in this state
         @return True if added, False otherwise
         """
-        if new_action not in self._actions:
-            self._actions.append(new_action)
-            return True
-        return False
+        self._actions.append(new_action)
+        return True
         
     # remove_action - We did not define names for the action, hence they're
     # pretty hard to remove on a precise basis
@@ -229,19 +218,21 @@ class State(object):
         Removes all the action associated with this state. A cleared state will
         not do anything when entered or exited.
         """
+        #FIXME What if the action is currently installed?
         self._actions = []
         
-    def add_event_filter(self, event_filter):
+    def add_event_filter(self, event, next_state):
         """
         Adds an event filter that will cause a transition from this state.
         
         The same event filter may not be added twice.
         
-        @param event_filter The new event filter that will trigger a transition
+        @param event The event that will trigger a transition
+        @param next_state The state to which the transition will lead
         @return True if added, False otherwise
         """
-        if event_filter not in self._event_filters:
-            self._event_filters.append(event_filter)
+        if event not in self._transitions.keys():
+            self._transitions[event]=next_state
             return True
         return False
     
@@ -249,7 +240,7 @@ class State(object):
         """
         @return The list of event filters associated with this state.
         """
-        return self._event_filters
+        return self._transitions.items()
     
     def clear_event_filters(self):
         """
@@ -257,7 +248,63 @@ class State(object):
         was just cleared will become a sink and will be the end of the
         tutorial.
         """
-        self._event_filters = []
+        self._transitions = {}
+
+    def __eq__(self, otherState):
+        """
+        Compares two states and tells whether they contain the same states with the
+        same actions and event filters.
+        
+        @param otherState The other State that we wish to match
+        @returns True if every action in this state has a matching action in the 
+                    other state with the same properties and values AND if every
+                    event filters in this state has a matching filter in the 
+                    other state having the same properties and values AND if both
+                    states have the same name.
+`       """
+        if not isinstance(otherState, State):
+            return False
+        if self.name != otherState.name:
+            return False
+        
+        # Do they have the same actions?
+        if len(self._actions) != len(otherState._actions):
+            return False
+
+        if len(self._transitions) != len(otherState._transitions):
+            return False
+
+        for act in self._actions:
+            found = False
+            # For each action in the other state, try to match it with this one.
+            for otherAct in otherState._actions:
+                if act == otherAct:
+                    found = True
+                    break
+            if found == False:
+                # If we arrive here, then we could not find an action with the 
+                # same values in the other state. We know they're not identical
+                return False
+        
+        # Do they have the same event filters?
+        for event in self._transitions:
+            state_name = self._transitions[event]
+            found = False
+            # For every event filter in the other state, try to match it with
+            # the current filter. We just need to find one with the right
+            # properties and values.
+            for otherEvent in otherState._transitions:
+                other_state_name = otherState._transitions[otherEvent]
+                if event == otherEvent:
+                    found = True
+                    break
+            if found == False:
+                # We could not find the given event filter in the other state.
+                return False
+
+        # If nothing failed up to now, then every actions and every filters can
+        # be found in the other state
+        return True
     
 class FiniteStateMachine(State):
     """
@@ -349,7 +396,7 @@ class FiniteStateMachine(State):
             self._fsm_setup_done = True
             # Execute all the FSM level actions
             for action in self.actions:
-                action.do()
+                self.tutorial.probeManager.install(action)
             
         # Then, we need to run the setup of the current state
         self.current_state.setup()
@@ -414,7 +461,7 @@ class FiniteStateMachine(State):
             self._fsm_teardown_done = True
             # Undo all the FSM level actions here
             for action in self.actions:
-                action.undo()
+                self.tutorial.probeManager.uninstall(action)
 
     # TODO : It might be nice to have a start() and stop() method for the 
     # FSM.
@@ -470,9 +517,10 @@ class FiniteStateMachine(State):
             
             #TODO : Move this code inside the State itself - we're breaking
             # encap :P
-            for event_filter in st._event_filters:
-                if event_filter.get_next_state() == state_name:
-                    st._event_filters.remove(event_filter)
+            for event in st._transitions.keys():
+                state = st._transitions[event]
+                if state == state_name:
+                    del st._transitions[event]
         
         # Remove the state from the dictionary
         del self._states[state_name]
@@ -490,8 +538,9 @@ class FiniteStateMachine(State):
         
         next_states = set()
         
-        for event_filter in state._event_filters:
-            next_states.add(event_filter.get_next_state())
+        for event in state._transitions.keys():
+            state_name_in_dict = state._transitions[event]
+            next_states.add(state_name_in_dict)
         
         return tuple(next_states)
     
@@ -513,9 +562,9 @@ class FiniteStateMachine(State):
         states = []
         # Walk through the list of states
         for st in self._states.itervalues():
-            for event_filter in st._event_filters:
-                if event_filter.get_next_state() == state_name:
-                    states.append(event_filter.get_next_state())
+            for event, state in st._transitions.items():
+                if state == state_name:
+                    states.append(state)
                     continue
         
         return tuple(states)
@@ -526,3 +575,58 @@ class FiniteStateMachine(State):
         for st in self._states.itervalues():
             out_string += st.name + ", "
         return out_string
+
+    def __eq__(self, otherFSM):
+        """
+        Compares the elements of two FSM to ensure and returns true if they have the
+        same set of states, containing the same actions and the same event filters.
+        
+        @returns True if the two FSMs have the same content, False otherwise
+        """
+        if not isinstance(otherFSM, FiniteStateMachine):
+            return False
+        
+        # Make sure they share the same name
+        if not (self.name == otherFSM.name) or \
+           not (self.start_state_name == otherFSM.start_state_name):
+            return False
+        
+        # Ensure they have the same number of FSM-level actions
+        if len(self._actions) != len(otherFSM._actions):
+            return False
+
+        # Test that we have all the same FSM level actions
+        for act in self._actions:
+            found = False
+            # For every action in the other FSM, try to match it with the
+            # current one.
+            for otherAct in otherFSM._actions:
+                if act == otherAct:
+                    found = True
+                    break
+            if found == False:
+                return False
+
+        # Make sure we have the same number of states in both FSMs
+        if len(self._states) != len(otherFSM._states):
+            return False
+        
+        # For each state, try to find a corresponding state in the other FSM
+        for state_name in self._states.keys():
+            state = self._states[state_name]
+            other_state = None
+            try:
+                # Attempt to use this key in the other FSM. If it's not present
+                # the dictionary will throw an exception and we'll know we have
+                # at least one different state in the other FSM
+                other_state = otherFSM._states[state_name]
+            except:
+                return False
+            # If two states with the same name exist, then we want to make sure
+            # they are also identical
+            if not state == other_state:
+                return False
+
+        # If we made it here, then all the states in this FSM could be matched to an
+        # identical state in the other FSM.
+        return True        
diff --git a/tutorius/creator.py b/tutorius/creator.py
index 7455ecb..efa17c3 100644
--- a/tutorius/creator.py
+++ b/tutorius/creator.py
@@ -67,6 +67,7 @@ class Creator(object):
 
         self._activity._overlayer.put(self._state_bubble,
             self._width/2-self._state_bubble.allocation.width/2, 0)
+        self._state_bubble.show()
 
         dlg_width = 300
         dlg_height = 70
@@ -113,7 +114,6 @@ class Creator(object):
         """
         self.introspecting = False
         eventfilter = addon.create('GtkWidgetEventFilter',
-            next_state=None,
             object_id=self._selected_widget,
             event_name=event_name)
         # undo actions so they don't persist through step editing
@@ -206,9 +206,13 @@ class Creator(object):
                     had_introspect = True
                     self.introspecting = True
                 elif isinstance(prop, properties.TStringProperty):
-                    dlg = TextInputDialog(title="Mandatory property",
+                    dlg = TextInputDialog(text="Mandatory property",
                                           field=propname)
                     setattr(action, propname, dlg.pop())
+                elif isinstance(prop, properties.TIntProperty):
+                    dlg = TextInputDialog(text="Mandatory property",
+                                          field=propname)
+                    setattr(action, propname, int(dlg.pop()))
                 else:
                     raise NotImplementedError()
 
@@ -239,7 +243,7 @@ class Creator(object):
         Quit editing and cleanup interface artifacts.
         """
         self.introspecting = False
-        eventfilter = filters.EventFilter(None)
+        eventfilter = filters.EventFilter()
         # undo actions so they don't persist through step editing
         for action in self._tutorial.current_actions:
             action.exit_editmode()
@@ -395,7 +399,10 @@ class EditToolBox(gtk.Window):
 
     def _list_prop_changed(self, widget, evt, action, propname, idx):
         try:
-            getattr(action, propname)[idx] = int(widget.get_text())
+            #Save props as tuples so that they can be hashed
+            attr = list(getattr(action, propname))
+            attr[idx] = int(widget.get_text())
+            setattr(action, propname, tuple(attr))
         except ValueError:
             widget.set_text(str(getattr(action, propname)[idx]))
         self.__parent._creator._action_refresh_cb(None, None, action)
diff --git a/tutorius/dbustools.py b/tutorius/dbustools.py
new file mode 100644
index 0000000..1b685d7
--- /dev/null
+++ b/tutorius/dbustools.py
@@ -0,0 +1,41 @@
+import logging
+LOGGER = logging.getLogger("sugar.tutorius.dbustools")
+
+def save_args(callable, *xargs, **xkwargs):
+    def __call(*args, **kwargs):
+        kw = dict()
+        kw.update(kwargs)
+        kw.update(xkwargs)
+        return callable(*(xargs+args), **kw) 
+    return __call
+
+def ignore(*args):
+    LOGGER.debug("Unhandled asynchronous dbus call response with arguments: %s", str(args))
+
+def logError(error):
+    LOGGER.error("Unhandled asynchronous dbus call error: %s", error)
+
+def remote_call(callable, args, return_cb=None, error_cb=None, block=False):
+    reply_cb = return_cb or ignore
+    errhandler_cb = error_cb or logError
+    if block:
+        try:
+            ret_val = callable(*args)
+            LOGGER.debug("remote_call return arguments: %s", str(ret_val))
+        except Exception, e:
+            #Use the specified error handler even for blocking calls
+            errhandler_cb(e)
+
+        #Return value signature might be :
+        if ret_val is None:
+            #Nothing
+            return reply_cb()
+        elif type(ret_val) in (list, tuple):
+            #Several parameters
+            return reply_cb(*ret_val)
+        else:
+            #One parameter
+            return reply_cb(ret_val)
+    else:
+        callable(*args, reply_handler=reply_cb, error_handler=errhandler_cb)
+
diff --git a/tutorius/engine.py b/tutorius/engine.py
new file mode 100644
index 0000000..dda9f3f
--- /dev/null
+++ b/tutorius/engine.py
@@ -0,0 +1,48 @@
+import logging
+import dbus.mainloop.glib
+from jarabe.model import shell
+
+from sugar.tutorius.bundler import TutorialStore
+from sugar.bundle.activitybundle import ActivityBundle
+
+class Engine:
+    """
+    Driver for the execution of tutorials
+    """
+
+    def __init__(self):
+        # FIXME Probe management should be in the probe manager
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        #FIXME shell.get_model() will only be useful in the shell process
+        self._shell = shell.get_model()
+        self._tutorial = None
+
+    def launch(self, tutorialID):
+	""" Launch a tutorial 
+            @param tutorialID unique tutorial identifier used to retrieve it from the disk
+        """
+        if self._tutorial:
+            self._tutorial.detach()
+            self._tutorial = None
+
+        store = TutorialStore()
+
+        #Get the active activity from the shell
+        activity = self._shell.get_active_activity()
+        self._tutorial = store.load_tutorial(tutorialID, bundle_path=activity.get_bundle_path())
+
+        #TProbes automatically use the bundle id, available from the ActivityBundle
+        bundle = ActivityBundle(activity.get_bundle_path())
+        self._tutorial.attach(bundle.get_bundle_id())
+
+    def stop(self):
+        """ Stop the current tutorial
+        """
+        self._tutorial.detach()
+        self._tutorial = None
+
+    def pause(self):
+        """ Interrupt the current tutorial and save its state in the journal
+        """
+        raise NotImplementedError("Unable to store tutorial state")
+
diff --git a/tutorius/filters.py b/tutorius/filters.py
index aa8c997..44621d5 100644
--- a/tutorius/filters.py
+++ b/tutorius/filters.py
@@ -15,13 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import gobject
-import gtk
 import logging
 logger = logging.getLogger("filters")
 
-from sugar.tutorius.gtkutils import find_widget
-from sugar.tutorius.services import ObjectStore
 from sugar.tutorius import properties
 
 
@@ -30,31 +26,13 @@ class EventFilter(properties.TPropContainer):
     Base class for an event filter
     """
 
-    next_state = properties.TStringProperty("None")
-
-    def __init__(self, next_state=None):
+    def __init__(self):
         """
         Constructor.
-        @param next_state name of the next state
         """
         super(EventFilter, self).__init__()
-        if next_state:
-            self.next_state = next_state
         self._callback = None
 
-    def get_next_state(self):
-        """
-        Getter for the next state
-        """
-        return self.next_state
-
-    def set_next_state(self, new_next_name):
-        """
-        Setter for the next state. Should only be used during construction of
-        the event_fitler, not while the tutorial is running.
-        """
-        self.next_state = new_next_name
-        
     def install_handlers(self, callback, **kwargs):
         """
         install_handlers is called for eventfilters to setup all
@@ -94,111 +72,3 @@ class EventFilter(properties.TPropContainer):
         if self._callback:
             self._callback(self)
 
-class TimerEvent(EventFilter):
-    """
-    TimerEvent is a special EventFilter that uses gobject
-    timeouts to trigger a state change after a specified amount
-    of time. It must be used inside a gobject main loop to work.
-    """
-    def __init__(self,next_state,timeout_s):
-        """Constructor.
-
-        @param next_state default EventFilter param, passed on to EventFilter
-        @param timeout_s timeout in seconds
-        """
-        super(TimerEvent,self).__init__(next_state)
-        self._timeout = timeout_s
-        self._handler_id = None
-
-    def install_handlers(self, callback, **kwargs):
-        """install_handlers creates the timer and starts it"""
-        super(TimerEvent,self).install_handlers(callback, **kwargs)
-        #Create the timer
-        self._handler_id = gobject.timeout_add_seconds(self._timeout, self._timeout_cb)
-
-    def remove_handlers(self):
-        """remove handler removes the timer"""
-        super(TimerEvent,self).remove_handlers()
-        if self._handler_id:
-            try:
-                #XXX What happens if this was already triggered?
-                #remove the timer
-                gobject.source_remove(self._handler_id)
-            except:
-                pass
-
-    def _timeout_cb(self):
-        """
-        _timeout_cb triggers the eventfilter callback.
-
-        It is necessary because gobject timers only stop if the callback they
-        trigger returns False
-        """
-        self.do_callback()
-        return False #Stops timeout
-
-class GtkWidgetTypeFilter(EventFilter):
-    """
-    Event Filter that listens for keystrokes on a widget
-    """
-    def __init__(self, next_state, object_id, text=None, strokes=None):
-        """Constructor
-        @param next_state default EventFilter param, passed on to EventFilter
-        @param object_id object tree-ish identifier
-        @param text resulting text expected
-        @param strokes list of strokes expected
-
-        At least one of text or strokes must be supplied
-        """
-        super(GtkWidgetTypeFilter, self).__init__(next_state)
-        self._object_id = object_id
-        self._text = text
-        self._captext = ""
-        self._strokes = strokes
-        self._capstrokes = []
-        self._widget = None
-        self._handler_id = None
-
-    def install_handlers(self, callback, **kwargs):
-        """install handlers
-        @param callback default EventFilter callback arg
-        """
-        super(GtkWidgetTypeFilter, self).install_handlers(callback, **kwargs)
-        logger.debug("~~~GtkWidgetTypeFilter install")
-        activity = ObjectStore().activity
-        if activity is None:
-            logger.error("No activity")
-            raise RuntimeWarning("no activity in the objectstore")
-
-        self._widget = find_widget(activity, self._object_id)
-        if self._widget:
-            self._handler_id= self._widget.connect("key-press-event",self.__keypress_cb)
-            logger.debug("~~~Connected handler %d on %s" % (self._handler_id,self._object_id) )
-
-    def remove_handlers(self):
-        """remove handlers"""
-        super(GtkWidgetTypeFilter, self).remove_handlers()
-        #if an event was connected, disconnect it
-        if self._handler_id:
-            self._widget.handler_disconnect(self._handler_id)
-            self._handler_id=None
-
-    def __keypress_cb(self, widget, event, *args):
-        """keypress callback"""
-        logger.debug("~~~keypressed!")
-        key = event.keyval
-        keystr = event.string
-        logger.debug("~~~Got key: " + str(key) + ":"+ keystr)
-        self._capstrokes += [key]
-        #TODO Treat other stuff, such as arrows
-        if key == gtk.keysyms.BackSpace:
-            self._captext = self._captext[:-1]
-        else:
-            self._captext = self._captext + keystr
-
-        logger.debug("~~~Current state: " + str(self._capstrokes) + ":" + str(self._captext))
-        if not self._strokes is None and self._strokes in self._capstrokes:
-            self.do_callback()
-        if not self._text is None and self._text in self._captext:
-            self.do_callback()
-
diff --git a/tutorius/linear_creator.py b/tutorius/linear_creator.py
index 91b11f4..78e94ce 100644
--- a/tutorius/linear_creator.py
+++ b/tutorius/linear_creator.py
@@ -58,9 +58,8 @@ class LinearCreator(object):
             # Set the next state name - there is no way the caller should have
             # to deal with that.
             next_state_name = "State %d" % (self.nb_state+1)
-            event_filter.set_next_state(next_state_name)
             state = State(self.state_name, action_list=self.current_actions,
-                event_filter_list=[event_filter])
+                event_filter_list=[(event_filter, next_state_name),])
             self.state_name = next_state_name
 
             self.nb_state += 1
diff --git a/tutorius/overlayer.py b/tutorius/overlayer.py
index 931949d..0a3d542 100644
--- a/tutorius/overlayer.py
+++ b/tutorius/overlayer.py
@@ -64,7 +64,7 @@ class Overlayer(gtk.Layout):
         if overlayed:
             self.put(overlayed, 0, 0)
 
-        self.__realizer = self.connect("expose-event", self.__init_realized)
+        self.__realizer = self.connect_after("realize", self.__init_realized)
         self.connect("size-allocate", self.__size_allocate)
         self.show()
 
@@ -89,7 +89,7 @@ class Overlayer(gtk.Layout):
         self.queue_draw()
 
 
-    def __init_realized(self, widget, event):
+    def __init_realized(self, widget):
         """
         Initializer to set once widget is realized.
         Since an expose event is signaled only to realized widgets, we set this
@@ -157,7 +157,7 @@ class TextBubble(gtk.Widget):
     A CanvasDrawableWidget drawing a round textbox and a tail pointing
     to a specified widget.
     """
-    def __init__(self, text, speaker=None, tailpos=[0,0]):
+    def __init__(self, text, speaker=None, tailpos=(0,0)):
         """
         Creates a new cairo rendered text bubble.
 
@@ -199,7 +199,7 @@ class TextBubble(gtk.Widget):
         # TODO fetch speaker coordinates
 
         # draw bubble tail if present
-        if self.tailpos != [0,0]:
+        if self.tailpos != (0,0):
             context.move_to(xradius-width/4, yradius)
             context.line_to(self.tailpos[0], self.tailpos[1])
             context.line_to(xradius+width/4, yradius)
@@ -228,7 +228,7 @@ class TextBubble(gtk.Widget):
         context.fill()
 
         # bubble painting. Redrawing the inside after the tail will combine
-        if self.tailpos != [0,0]:
+        if self.tailpos != (0,0):
             context.move_to(xradius-width/4, yradius)
             context.line_to(self.tailpos[0], self.tailpos[1])
             context.line_to(xradius+width/4, yradius)
diff --git a/tutorius/properties.py b/tutorius/properties.py
index abf76e5..78e3c2b 100644
--- a/tutorius/properties.py
+++ b/tutorius/properties.py
@@ -95,6 +95,25 @@ class TPropContainer(object):
         """
         return object.__getattribute__(self, "_props").keys()
 
+    # Providing the hash methods necessary to use TPropContainers
+    # in a dictionary, according to their properties
+    def __hash__(self):
+        #Return a hash of properties (key, value) sorted by key
+        #We need to transform the list of property key, value lists into 
+        # a tuple of key, value tuples
+        return hash(tuple(map(tuple,sorted(self._props.items(), cmp=lambda x, y: cmp(x[0], y[0])))))
+
+    def __eq__(self, e2):
+        return self._props == e2._props
+
+    # Adding methods for pickling and unpickling an object with
+    # properties
+    def __getstate__(self):
+       return self._props.copy()
+
+    def __setstate__(self, dict):
+       self._props.update(dict)
+
 class TutoriusProperty(object):
     """
     The base class for all actions' properties. The interface is the following :
@@ -145,19 +164,6 @@ class TAddonListProperty(TutoriusProperty):
     """
     pass
 
-    
-    def get_constraints(self):
-        """
-        Returns the list of constraints associated to this property.
-        """
-        if self._constraints is None:
-            self._constraints = []
-            for i in dir(self):
-                typ = getattr(self, i)
-                if isinstance(typ, Constraint):
-                    self._constraints.append(i)
-        return self._constraints
-
 class TIntProperty(TutoriusProperty):
     """
     Represents an integer. Can have an upper value limit and/or a lower value
@@ -207,8 +213,20 @@ class TArrayProperty(TutoriusProperty):
         self.type = "array"
         self.max_size_limit = MaxSizeConstraint(max_size_limit)
         self.min_size_limit = MinSizeConstraint(min_size_limit)
-        self.default = self.validate(value)
+        self.default = tuple(self.validate(value))
     
+    #Make this thing hashable
+    def __setstate__(self, state):
+        self.max_size_limit = MaxSizeConstraint(state["max_size_limit"])
+        self.min_size_limit = MinSizeConstraint(state["min_size_limit"])
+        self.value = state["value"]
+
+    def __getstate__(self):
+        return dict(
+            max_size_limit=self.max_size_limit.limit,
+            min_size_limit=self.min_size_limit.limit,
+            value=self.value,
+            )
 class TColorProperty(TutoriusProperty):
     """
     Represents a RGB color with 3 8-bit integer values.
@@ -287,8 +305,10 @@ class TUAMProperty(TutoriusProperty):
     """
     Represents a widget of the interface by storing its UAM.
     """
-    # TODO : Pending UAM check-in (LP 355199)
-    pass
+    def __init__(self, value=None):
+        TutoriusProperty.__init__(self)
+
+        self.type = "uam"
 
 class TAddonProperty(TutoriusProperty):
     """
@@ -317,8 +337,15 @@ class TAddonListProperty(TutoriusProperty):
     See TAddonProperty
     """
     def __init__(self):
-        super(TAddonProperty, self).__init__()
+        TutoriusProperty.__init__(self)
         self.type = "addonlist"
         self.default = []
 
+    def validate(self, value):
+        if isinstance(value, list):
+            for component in value:
+                if not (isinstance(component, TPropContainer)):
+                    raise ValueError("Expected a list of TPropContainer instances inside TAddonListProperty value, got a %s" % (str(type(component))))
+            return value
+        raise ValueError("Value proposed to TAddonListProperty is not a list")
 
diff --git a/tutorius/service.py b/tutorius/service.py
new file mode 100644
index 0000000..21f0cf1
--- /dev/null
+++ b/tutorius/service.py
@@ -0,0 +1,85 @@
+from engine import Engine
+import dbus
+
+from dbustools import remote_call
+
+_DBUS_SERVICE = "org.tutorius.Service"
+_DBUS_PATH = "/org/tutorius/Service"
+_DBUS_SERVICE_IFACE = "org.tutorius.Service"
+
+class Service(dbus.service.Object):
+    """
+    Global tutorius entry point to control the whole system
+    """
+
+    def __init__(self):
+        bus = dbus.SessionBus()
+        bus_name = dbus.service.BusName(_DBUS_SERVICE, bus=bus)
+        dbus.service.Object.__init__(self, bus_name, _DBUS_PATH)
+
+        self._engine = None
+
+    def start(self):
+        """ Start the service itself
+        """
+        # For the moment there is nothing to do
+        pass
+
+
+    @dbus.service.method(_DBUS_SERVICE_IFACE,
+                          in_signature="s", out_signature="") 
+    def launch(self, tutorialID):
+        """ Launch a tutorial 
+            @param tutorialID unique tutorial identifier used to retrieve it from the disk
+        """
+        if self._engine == None:
+            self._engine = Engine()
+        self._engine.launch(tutorialID)
+
+    @dbus.service.method(_DBUS_SERVICE_IFACE,
+                          in_signature="", out_signature="") 
+    def stop(self):
+        """ Stop the current tutorial
+        """
+        self._engine.stop()
+
+    @dbus.service.method(_DBUS_SERVICE_IFACE,
+                          in_signature="", out_signature="") 
+    def pause(self):
+        """ Interrupt the current tutorial and save its state in the journal
+        """
+        self._engine.pause()
+
+class ServiceProxy:
+    """ Proxy to connect to the Service object, abstracting the DBus interface"""
+
+    def __init__(self):
+        bus = dbus.SessionBus()
+        self._object = bus.get_object(_DBUS_SERVICE,_DBUS_PATH)
+        self._service = dbus.Interface(self._object, _DBUS_SERVICE_IFACE)
+
+    def launch(self, tutorialID):
+        """ Launch a tutorial 
+            @param tutorialID unique tutorial identifier used to retrieve it from the disk
+        """
+        remote_call(self._service.launch, (tutorialID, ), block=False)
+
+    def stop(self):
+        """ Stop the current tutorial
+        """
+        remote_call(self._service.stop, (), block=False)
+
+    def pause(self):
+        """ Interrupt the current tutorial and save its state in the journal
+        """
+        remote_call(self._service.pause, (), block=False)
+
+if __name__ == "__main__":
+    import dbus.mainloop.glib
+    import gobject
+
+    loop = gobject.MainLoop()
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    s = Service()
+    loop.run()
+
diff --git a/tutorius/services.py b/tutorius/services.py
index 9ed2e50..e7b17d8 100644
--- a/tutorius/services.py
+++ b/tutorius/services.py
@@ -22,6 +22,9 @@ This module supplies services to be used by States, FSMs, Actions and Filters.
 Services provided are:
 -Access to the running activity
 -Access to the running tutorial
+
+TODO: Passing the activity reference should be done by the Probe instead
+of being a global variable.
 """
 
 
diff --git a/tutorius/store.py b/tutorius/store.py
new file mode 100644
index 0000000..480c81b
--- /dev/null
+++ b/tutorius/store.py
@@ -0,0 +1,173 @@
+# Copyright (C) 2009, Tutorius.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import urllib
+
+class StoreProxy(object):
+    """
+    Implements a communication channel with the Tutorius Store, where tutorials
+    are shared from around the world. This proxy is meant to offer a one-stop
+    shop to implement all the requests that could be made to the Store.
+    """
+
+    def get_categories(self):
+        """
+        Returns all the categories registered in the store. Categories are used to
+        classify tutorials according to a theme. (e.g. Mathematics, History, etc...)
+
+        @return The list of category names stored on the server.
+        """
+        raise NotImplementedError("get_categories() not implemented")
+
+    def get_tutorials(self, keywords=None, category=None, startIndex=0, numResults=10, sortBy='name'):
+        """
+        Returns the list of tutorials that correspond to the given search criteria.
+
+        @param keywords The list of keywords that should be matched inside the tutorial title
+                        or description. If None, the search will not filter the results
+                        according to the keywords.
+        @param category The category in which to restrict the search.
+        @param startIndex The index in the result set from which to return results. This is
+                            used to allow applications to fetch results one set at a time.
+        @param numResults The max number of results that can be returned
+        @param sortBy The field on which to sort the results
+        @return A list of tutorial meta-data that corresponds to the query
+        """
+        raise NotImplementedError("get_tutorials() not implemented")
+
+    def get_tutorial_collection(self, collection_name):
+        """
+        Returns a list of tutorials corresponding to the given collection name.
+        Collections can be groups like '5 most downloaded' or 'Top 10 ratings'.
+
+        @param collection_name The name of the collection from which we want the
+                                meta-data
+        @return A list of tutorial meta-data corresponding to the given group
+        """
+        raise NotImplementedError("get_tutorial_collection() not implemented... yet!")
+
+    def get_latest_version(self, tutorial_id_list):
+        """
+        Returns the latest version number on the server, for each tutorial ID
+        in the list.
+
+        @param tutorial_id_list The list of tutorial IDs from which we want to
+                                known the latest version number.
+        @return A dictionary having the tutorial ID as the key and the version 
+                as the value.
+        """
+        raise NotImplementedError("get_latest_version() not implemented")
+
+    def download_tutorial(self, tutorial_id, version=None):
+        """
+        Fetches the tutorial file from the server and returns the 
+
+        @param tutorial_id The tutorial that we want to get
+        @param version The version number that we want to download. If None,
+                        the latest version will be downloaded.
+        @return The downloaded file itself (an in-memory representation of the file,
+                not a path to it on the disk)
+
+        TODO : We should decide if we're saving to disk or in mem.
+        """
+        raise NotImplementedError("downloadTutorial() not implemented")
+
+    def login(self, username, password):
+        """
+        Logs in the user on the store and saves the login status in the proxy
+        state. After a successful logon, the operation requiring a login will
+        be successful.
+
+        @return True if the login was successful, False otherwise
+        """
+        raise NotImplementedError("login() not implemented yet")
+
+    def close_session(self):
+        """
+        Ends the user's session on the server and changes the state of the proxy
+        to disallow the calls to the store that requires to be logged in.
+        
+        @return True if the user was disconnected, False otherwise
+        """
+        raise NotImplementedError("close_session() not implemented yet")
+
+    def get_session_id(self):
+        """
+        Gives the current session ID cached in the Store Proxy, or returns
+        None is the user is not logged yet.
+
+        @return The current session's ID, or None if the user is not logged
+        """
+        raise NotImplementedError("get_session_id() not implemented yet")
+
+    def rate(self, value, tutorial_store_id):
+        """
+        Sends a rating for the given tutorial.
+
+        This function requires the user to be logged in.
+
+        @param value The value of the rating. It must be an integer with a value 
+                    from 1 to 5.
+        @param tutorial_store_id The ID of the tutorial that was rated
+        @return True if the rating was sent to the Store, False otherwise.
+        """
+        raise NotImplementedError("rate() not implemented")
+
+    def publish(self, tutorial):
+        """
+        Sends a tutorial to the store.
+
+        This function requires the user to be logged in.
+        
+        @param tutorial The tutorial file to be sent. Note that this is the 
+                        content itself and not the path to the file.
+        @return True if the tutorial was sent correctly, False otherwise.
+        """
+        raise NotImplemetedError("publish() not implemented")
+
+    def unpublish(self, tutorial_store_id):
+        """
+        Removes a tutorial from the server. The user in the current session
+        needs to be the creator for it to be unpublished. This will remove 
+        the file from the server and from all its collections and categories.
+
+        This function requires the user to be logged in.
+
+        @param tutorial_store_id The ID of the tutorial to be removed
+        @return True if the tutorial was properly removed from the server
+        """
+        raise NotImplementedError("unpublish() not implemeted")
+
+    def update_published_tutorial(self, tutorial_id, tutorial):
+        """
+        Sends the new content for the tutorial with the given ID.
+
+        This function requires the user to be logged in.
+
+        @param tutorial_id The ID of the tutorial to be updated
+        @param tutorial The bundled tutorial file content (not a path!)
+        @return True if the tutorial was sent and updated, False otherwise
+        """
+        raise NotImplementedError("update_published_tutorial() not implemented yet")
+
+    def register_new_user(self, user_info):
+        """
+        Creates a new user from the given user information. 
+        
+        @param user_info A structure containing all the data required to do a login.
+        @return True if the new account was created, false otherwise
+        """
+        raise NotImplementedError("register_new_user() not implemented")
diff --git a/tutorius/uam/__init__.py b/tutorius/uam/__init__.py
index 7cf5671..bcd67e1 100644
--- a/tutorius/uam/__init__.py
+++ b/tutorius/uam/__init__.py
@@ -65,7 +65,8 @@ for subscheme in [".".join([SCHEME,s]) for s in __parsers]:
 class SchemeError(Exception):
     def __init__(self, message):
         Exception.__init__(self, message)
-        self.message = message
+        ## Commenting this line as it is causing an error in the tests
+        ##self.message = message
 
 
 def parse_uri(uri):
diff --git a/tutorius/vault.py b/tutorius/vault.py
index 2893852..9215e8d 100644
--- a/tutorius/vault.py
+++ b/tutorius/vault.py
@@ -26,6 +26,7 @@ import shutil
 import tempfile
 import uuid
 import xml.dom.minidom
+from xml.dom import NotFoundErr
 import zipfile
 
 from sugar.tutorius import addon
@@ -58,6 +59,9 @@ INI_VERSION_PROPERTY = 'version'
 INI_FILENAME = "meta.ini"
 TUTORIAL_FILENAME = "tutorial.xml"
 NODE_COMPONENT = "Component"
+NODE_SUBCOMPONENT = "property"
+NODE_SUBCOMPONENTLIST = "listproperty"
+NEXT_STATE_ATTR = "next_state"
 
 class Vault(object):
     
@@ -249,7 +253,7 @@ class Vault(object):
         serializer = XMLSerializer()
 
         name = config.get(INI_METADATA_SECTION, INI_NAME_PROPERTY)
-        fsm = serializer.load_fsm(Guid)
+        fsm = serializer.load_fsm(Guid, bundle_path)
 
         tuto = Tutorial(name, fsm)
         return tuto
@@ -358,6 +362,71 @@ class XMLSerializer(Serializer):
             eventfiltersList = stateNode.appendChild(self._create_event_filters_node(state.get_event_filter_list(), doc))
         return statesList
     
+    def _create_addon_component_node(self, parent_attr_name, comp, doc):
+        """
+        Takes a component that is embedded in another component (e.g. the content
+        of a OnceWrapper) and encapsulate it in a node with the property name.
+
+        e.g.
+        <Component Class="OnceWrapper">
+            <property name="addon">
+                <Component Class="BubbleMessage" message="'Hi!'" position="[12,32]"/>
+            </property>
+        </Component>
+        
+        When reloading this node, we should look up the property name for the parent
+        in the attribute of the node, then examine the subnode to create the addon
+        object itself.
+
+        @param parent_attr_name The name of the parent's attribute for this addon
+                e.g. the OnceWrapper has the action attribute, which corresponds to a
+                    sub-action it must execute once.
+        @param comp The component node itself
+        @param doc The XML document root (only used to create the nodes)
+        @returns A NODE_SUBCOMPONENT node, with the property attribute and a sub node 
+                that represents another component.
+        """
+        subCompNode = doc.createElement(NODE_SUBCOMPONENT)
+        subCompNode.setAttribute("name", parent_attr_name)
+
+        subNode = self._create_component_node(comp, doc)
+
+        subCompNode.appendChild(subNode)
+
+        return subCompNode
+
+    def _create_addonlist_component_node(self, parent_attr_name, comp_list, doc):
+        """
+        Takes a list of components that are embedded in another component (ex. the
+        content of a ChainAction) and encapsulate them in a node with the property
+        name.
+        
+        e.g.
+        <Component Class="ChainAction">
+            <listproperty name="actions">
+                <Component Class="BubbleMessage" message="'Hi!'" position="[15,35]"/> 
+                <Component Class="DialogMessage" message="'Multi-action!'" position="[45,10]"/>
+            </listproperty>
+        </Component>
+
+        When reloading this node, we should look up the property name for the parent
+        in the the attribute of the node, then rebuild the list by appending the 
+        content of all the subnodes.
+
+        @param parent_attr_name The name of the parent component's property
+        @param comp_list A list of components that comprise the property
+        @param doc The XML document root (only for creating new nodes)
+        @returns A NODE_SUBCOMPONENTLIST node with the property attribute
+        """
+        subCompListNode = doc.createElement(NODE_SUBCOMPONENTLIST)
+        subCompListNode.setAttribute("name", parent_attr_name)
+
+        for comp in comp_list:
+            compNode = self._create_component_node(comp, doc)
+            subCompListNode.appendChild(compNode)
+
+        return subCompListNode
+
     def _create_component_node(self, comp, doc):
         """
         Takes a single component (action or eventfilter) and transforms it 
@@ -377,10 +446,10 @@ class XMLSerializer(Serializer):
         for propname in comp.get_properties():
             propval = getattr(comp, propname)
             if getattr(type(comp), propname).type == "addonlist":
-                for subval in propval:
-                    compNode.appendChild(self._create_component_node(subval, doc))
-            elif getattr(type(comp), propname).type == "addonlist":
-                compNode.appendChild(self._create_component_node(subval, doc))
+                compNode.appendChild(self._create_addonlist_component_node(propname, propval, doc))
+            elif getattr(type(comp), propname).type == "addon":
+                #import rpdb2; rpdb2.start_embedded_debugger('pass')
+                compNode.appendChild(self._create_addon_component_node(propname, propval, doc))
             else:
                 # repr instead of str, as we want to be able to eval() it into a
                 # valid object.
@@ -411,8 +480,9 @@ class XMLSerializer(Serializer):
         Create and return a xml Node from an event filters.
         """
         eventFiltersList = doc.createElement("EventFiltersList")
-        for event_f in event_filters:
-            eventFilterNode = self._create_component_node(event_f, doc)
+        for event, state in event_filters:
+            eventFilterNode = self._create_component_node(event, doc)
+            eventFilterNode.setAttribute(NEXT_STATE_ATTR, str(state))
             eventFiltersList.appendChild(eventFilterNode)
 
         return eventFiltersList
@@ -437,14 +507,36 @@ class XMLSerializer(Serializer):
         file_object.write(doc.toprettyxml())
         file_object.close()
 
-    def _load_xml_properties(self, properties_elem):
+    def _get_direct_descendants_by_tag_name(self, node, name):
         """
-        Changes a list of properties into fully instanciated properties.
+        Searches in the list of direct descendants of a node to find all the node
+        that have the given name.
         
-        @param properties_elem An XML element reprensenting a list of 
-        properties
+        This is used because the Document.getElementsByTagName() function returns the
+        list of all the descendants (whatever their distance to the start node) that
+        have that name. In the case of complex components, we absolutely need to inspect
+        a single layer of the tree at the time.
+        
+        @param node The node from which we want the direct descendants with a particular
+                    name
+        @param name The name of the node
+        @returns A list, possibly empty, of direct descendants of node that have this name 
         """
-        return []
+        return_list = []
+        for childNode in node.childNodes:
+            if childNode.nodeName == name:
+                return_list.append(childNode)
+        return return_list
+
+
+##    def _load_xml_properties(self, properties_elem):
+##        """
+##        Changes a list of properties into fully instanciated properties.
+##        
+##        @param properties_elem An XML element reprensenting a list of 
+##        properties
+##        """
+##        return []
     
     def _load_xml_event_filters(self, filters_elem):
         """
@@ -452,18 +544,59 @@ class XMLSerializer(Serializer):
         
         @param filters_elem An XML Element representing a list of event filters
         """
-        reformed_event_filters_list = []
-        event_filter_element_list = filters_elem.getElementsByTagName(NODE_COMPONENT)
+        transition_list = []
+        event_filter_element_list = self._get_direct_descendants_by_tag_name(filters_elem, NODE_COMPONENT)
         new_event_filter = None
         
         for event_filter in event_filter_element_list:
+            next_state = event_filter.getAttribute(NEXT_STATE_ATTR)
+            try:
+                event_filter.removeAttribute(NEXT_STATE_ATTR)
+            except NotFoundErr:
+                next_state = None
             new_event_filter = self._load_xml_component(event_filter)
             
             if new_event_filter is not None:
-                reformed_event_filters_list.append(new_event_filter)
+                transition_list.append((new_event_filter, next_state))
             
-        return reformed_event_filters_list
+        return transition_list
     
+    def _load_xml_subcomponents(self, node, properties):
+        """
+        Loads all the subcomponent node below the given node and inserts them with
+        the right property name inside the properties dictionnary.
+
+        @param node The parent node that contains one or many property nodes.
+        @param properties A dictionnary where the subcomponent property names
+                and the instantiated components will be stored
+        @returns Nothing. The properties dict will contain the property->comp mapping.
+        """
+        subCompList = self._get_direct_descendants_by_tag_name(node, NODE_SUBCOMPONENT)
+
+        for subComp in subCompList:
+            property_name = subComp.getAttribute("name")
+            internal_comp_node = self._get_direct_descendants_by_tag_name(subComp, NODE_COMPONENT)[0]
+            internal_comp = self._load_xml_component(internal_comp_node)
+            properties[str(property_name)] = internal_comp
+
+    def _load_xml_subcomponent_lists(self, node, properties):
+        """
+        Loads all the subcomponent lists below the given node and stores them
+        under the correct property name for that node.
+
+        @param node The node from which we want to read the subComponent lists
+        @param properties The dictionnary that will contain the mapping of prop->subCompList
+        @returns Nothing. The values are returns inside the properties dict.
+        """
+        listOf_subCompListNode = self._get_direct_descendants_by_tag_name(node, NODE_SUBCOMPONENTLIST)
+        for subCompListNode in listOf_subCompListNode:
+            property_name = subCompListNode.getAttribute("name")
+            subCompList = []
+            for subCompNode in self._get_direct_descendants_by_tag_name(subCompListNode, NODE_COMPONENT):
+                subComp = self._load_xml_component(subCompNode)
+                subCompList.append(subComp)
+            properties[str(property_name)] = subCompList
+
     def _load_xml_component(self, node):
         """
         Loads a single addon component instance from an Xml node.
@@ -473,20 +606,23 @@ class XMLSerializer(Serializer):
         @return The addon component object of the correct type according to the XML
         description
         """
-        new_action = addon.create(node.getAttribute("Class"))
-        if not new_action:
-            return None
+        class_name = node.getAttribute("Class")
+        
+        properties = {}
 
-        for attrib in node.attributes.keys():
-            if attrib == "Class": continue
-            # security note: keep sandboxed
-            setattr(new_action, attrib, eval(node.getAttribute(attrib), {}, {}))
+        for prop in node.attributes.keys():
+            if prop == "Class" : continue
+            # security : keep sandboxed
+            properties[str(prop)] = eval(node.getAttribute(prop))
 
-        # recreate complex attributes
-        for sub in node.childNodes:
-            name = getattr(new_action, sub.nodeName)
-            if name == "addon":
-                setattr(new_action, sub.getAttribute("Name"), self._load_xml_action(sub))
+        # Read the complex attributes
+        self._load_xml_subcomponents(node, properties)
+        self._load_xml_subcomponent_lists(node, properties)
+
+        new_action = addon.create(class_name, **properties)
+
+        if not new_action:
+            return None
 
         return new_action
     
@@ -497,7 +633,7 @@ class XMLSerializer(Serializer):
         @param actions_elem An XML Element representing a list of Actions
         """
         reformed_actions_list = []
-        actions_element_list = actions_elem.getElementsByTagName(NODE_COMPONENT)
+        actions_element_list = self._get_direct_descendants_by_tag_name(actions_elem, NODE_COMPONENT)
         
         for action in actions_element_list:
             new_action = self._load_xml_component(action)
@@ -558,13 +694,13 @@ class XMLSerializer(Serializer):
             
         # Load the event filters
         events = self._load_xml_event_filters(fsm_elem.getElementsByTagName("EventFiltersList")[0])
-        for event in events:
-            fsm.add_event_filter(event)
+        for event, next_state in events:
+            fsm.add_event_filter(event, next_state)
             
         return fsm
         
     
-    def load_fsm(self, guid):
+    def load_fsm(self, guid, path=None):
         """
         Load fsm from xml file whose .ini file guid match argument guid.
         """
@@ -588,7 +724,7 @@ class TutorialBundler(object):
     editor.
     """
     
-    def __init__(self,generated_guid = None):
+    def __init__(self,generated_guid = None, bundle_path=None):
         """
         Tutorial_bundler constructor. If a GUID is given in the parameter, the
         Tutorial_bundler object will be associated with it. If no GUID is given,
@@ -597,6 +733,7 @@ class TutorialBundler(object):
             
         self.Guid = generated_guid or str(uuid.uuid1())
 
+        #FIXME: Look for the bundle in the activity first (more specific)
         #Look for the file in the path if a uid is supplied
         if generated_guid:
             #General store