diff --git a/trunk/yolanda/controllers/index.py b/trunk/yolanda/controllers/index.py
index 7c8d14a..7c7b216 100644
--- a/trunk/yolanda/controllers/index.py
+++ b/trunk/yolanda/controllers/index.py
@@ -8,8 +8,13 @@ class IndexController(BaseController):
 
     def index(self):
 
-        raise(RuntimeError)
-        c.tagcloud = model.DC_Subject.query.all()
+        tags = {}
+        for tag in model.DC_Subject.query.all():
+            if tag.name in tags.keys():
+                tags[tag.name]+=1
+            else:
+                tags[tag.name] = 1
+        c.tagcloud = tags
 
         return render('/xhtml/index.mako')
 
diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako
index ce49969..20e9ff1 100644
--- a/trunk/yolanda/templates/xhtml/base.mako
+++ b/trunk/yolanda/templates/xhtml/base.mako
@@ -81,10 +81,10 @@ method="post">
         <h1>Tagcloud</h1>
 
             <ul>
-            % for tag in c.tagcloud:
+            % for name, count in c.tagcloud.items():
 
                 <li>
-                    <a href="" class="tag4">${tag.name}</a>
+                    <a href="" class="tag4">${name} ${count}</a>
                 </li>
 
             % endfor