--- a/pvl/verkko/wsgi.py	Sun Jan 20 18:19:03 2013 +0200
+++ b/pvl/verkko/wsgi.py	Sun Jan 20 18:26:12 2013 +0200
@@ -1,51 +1,18 @@
-import werkzeug
-from werkzeug.wrappers import Request, Response
-from werkzeug.exceptions import HTTPException
+import pvl.web
 
 import logging; log = logging.getLogger('pvl.verkko.wsgi')
 
-from pvl.verkko import db as database, urls, web
+from pvl.verkko import urls, db as database
 
-class Application (object) :
-    urls = urls.urls
+class Application (pvl.web.Application) :
+    URLS  = urls.urls
 
     def __init__ (self, db) :
         """
             Initialize app with db.
         """
 
+        super(Application, self).__init__()
+
         self.db = database.Database(db)
 
-    def respond (self, request) :
-        """
-            Lookup Request -> web.Handler, params
-        """
-        
-        # bind to request
-        urls = self.urls.bind_to_environ(request)
-        
-        # lookup
-        handler, params = urls.match()
-
-        # handler instance
-        handler = handler(self, request, urls, params)
-
-        try :
-            # apply
-            return handler.respond()
-
-        finally :
-            handler.cleanup()
-
-    @Request.application
-    def __call__ (self, request) :
-        """
-            WSGI entry point, werkzeug Request -> Response
-        """
-
-        try :
-            return self.respond(request)
-        
-        except HTTPException as ex :
-            return ex
-