Index: /waeup/branches/ulif-rewrite/src/waeup/app.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/app.py	(revision 3829)
+++ /waeup/branches/ulif-rewrite/src/waeup/app.py	(revision 3830)
@@ -1,10 +1,14 @@
 import grok
 from grok import index
+from zope.component import getUtility
 from zope.interface import Interface
-from interfaces import IUniversity
-from setup import app_setup
-from viewlets import MainArea
+
+from waeup.interfaces import (IUniversity, IStudentContainer, IHostelContainer,
+                              IFacultyContainer)
+from waeup.viewlets import MainArea
 
 class University(grok.Application, grok.Container):
+    """A university.
+    """
     grok.implements(IUniversity)
 
@@ -12,6 +16,35 @@
         super(University, self).__init__(**kw)
         self.name = name
-        app_setup.setup(self)
+        self.setup()
 
+    def setup(self):
+        self["students"] = getUtility(IStudentContainer)
+        self["hostels"] = getUtility(IHostelContainer)
+        self["faculties"] = getUtility(IFacultyContainer)
+        
+class Manage(grok.EditForm):
+    """Manage the basic properties of a `University` instance.
+    """
+
+    grok.require('waeup.ManageUniversity')
+    
+    form_fields = grok.AutoFields(IUniversity)
+
+    @grok.action('Save')
+    def save(self, **data):
+        self.applyData(self.context, **data)
+        return
+    
+    @grok.action('Save and return')
+    def saveAndReturn(self, **data):
+        self.applyData(self.context, **data)
+        self.redirect(self.url(self.context))
+        return
+
+    @grok.action('Cancel')
+    def cancel(self):
+        self.redirect(self.url(self.context))
+        return
+        
 class Content(grok.Viewlet):
     grok.viewletmanager(MainArea)
