--- a/bin/curvecalc	Mon Jun 02 00:10:33 2014 +0000
+++ b/bin/curvecalc	Mon Jun 02 00:10:48 2014 +0000
@@ -44,6 +44,7 @@
 from light9.rdfdb.patch import Patch
 from light9.editchoicegtk import EditChoice, Local
 from light9.observable import Observable
+from light9.curvecalc.curveedit import serveCurveEdit
 
 class SubtermExists(ValueError):
     pass
@@ -470,24 +471,18 @@
         log.debug("quitting now because of --startup-only")
         return
 
-    from twisted.web import server, resource
-    class Hover(resource.Resource):
-        isLeaf = True
-        def render_GET(self, request):
-            if request.path == '/hoverTime':
-                results = dispatcher.send("onPlayPause")
-                times = [t for listener, t in results if t is not None]
-                if not times:
-                    request.setResponseCode(404)
-                    return "not hovering over any time"
-                with graph.currentState(
-                        tripleFilter=(session, L9['currentSong'], None)) as g:
-                    song = g.value(session, L9['currentSong'])
-                    return json.dumps({"song": song, "hoverTime" : times[0]})
-            raise NotImplementedError()
-
-    reactor.listenTCP(networking.curveCalc.port,
-                      server.Site(Hover()))
+    def hoverTimeResponse(request):
+        results = dispatcher.send("onPlayPause")
+        times = [t for listener, t in results if t is not None]
+        if not times:
+            request.setResponseCode(404)
+            return "not hovering over any time"
+        with graph.currentState(
+                tripleFilter=(session, L9['currentSong'], None)) as g:
+            song = g.value(session, L9['currentSong'])
+            return json.dumps({"song": song, "hoverTime" : times[0]})
+        
+    serveCurveEdit(networking.curveCalc.port, hoverTimeResponse)
 
 def main():
     startTime = time.time()