diff --git a/www/conservancy/static/views.py b/www/conservancy/static/views.py
index 29f1a12a2b156df22f9f7c6f65f79d8d363934af..688d5dcb2efeeb1e1bc67b8e641f5cb576eef9a6 100644
--- a/www/conservancy/static/views.py
+++ b/www/conservancy/static/views.py
@@ -25,6 +25,13 @@ def handler404(request):
 def handler500(request):
     return handler(request, '500')
 
+def fundgoal_lookup(fundraiser_sought):
+    try:
+        return FundraisingGoal.objects.get(fundraiser_code_name=fundraiser_sought)
+    except FundraisingGoal.DoesNotExist:
+     # we have no object!  do something
+        return None
+
 def index(request, *args, **kwargs):
     # return HttpResponse("Hello, static world: " + request.get_full_path())
     path = request.get_full_path()
@@ -37,18 +44,13 @@ def index(request, *args, **kwargs):
         # return HttpResponse("Sorry that's a 404: " + path)
         return handler404(request)
     template = loader.get_template(path)
-    context = RequestContext(request, kwargs)
-    return HttpResponse(template.render(context))
 
-def fundgoal_lookup(fundraiser_sought):
-    try:
-        return FundraisingGoal.objects.get(fundraiser_code_name=fundraiser_sought)
-    except FundraisingGoal.DoesNotExist:
-     # we have no object!  do something
-        return None
+    if kwargs.has_key('fundraiser_sought'):
+        kwargs = kwargs.copy()
+        kwargs['fundgoal'] = fundgoal_lookup(kwargs['fundraiser_sought'])
 
-def index_with_fundraiser_data(request, *args, **kwargs):
-    return index(request, { 'fundgoal' : fundgoal_lookup(kwargs['fundraiser_sought']) })
+    context = RequestContext(request, kwargs)
+    return HttpResponse(template.render(context))
 
 def debug(request):
     path = request.get_full_path()