diff --git a/contrib/buzz/buzz_appengine.py b/contrib/buzz/buzz_appengine.py
new file mode 100644
index 0000000..68a514b
--- /dev/null
+++ b/contrib/buzz/buzz_appengine.py
@@ -0,0 +1,109 @@
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.appengine.api import users
+from google.appengine.ext import db
+
+import apiclient.ext.appengine
+import logging
+import settings
+import simple_buzz_wrapper
+
+
+class Flow(db.Model):
+  flow = apiclient.ext.appengine.FlowThreeLeggedProperty()
+
+
+class Credentials(db.Model):
+  credentials = apiclient.ext.appengine.OAuthCredentialsProperty()
+
+
+def oauth_required(handler_method):
+  """A decorator to require that a user has gone through the OAuth dance before accessing a handler.
+  
+  To use it, decorate your get() method like this:
+    @oauth_required
+    def get(self):
+      buzz_wrapper = oauth_handlers.build_buzz_wrapper_for_current_user()
+      user_profile_data = buzz_wrapper.get_profile()
+      self.response.out.write('Hello, ' + user_profile_data.displayName)
+  
+  We will redirect the user to the OAuth endpoint and afterwards the OAuth
+  will send the user back to the DanceFinishingHandler that you have configured.
+  This should only used for GET requests since any payload in a POST request
+  will be lost. Any parameters in the original URL will be preserved.
+  """
+  def check_oauth_credentials(self, *args):
+    if self.request.method != 'GET':
+      raise webapp.Error('The check_oauth decorator can only be used for GET '
+                         'requests')
+
+    # Is this a request from the OAuth system after finishing the OAuth dance?
+    if self.request.get('oauth_verifier'):
+      user = users.get_current_user()
+      logging.debug('Finished OAuth dance for: %s' % user.email())
+
+      f = Flow.get_by_key_name(user.user_id())
+      if f:
+        credentials = f.flow.step2_exchange(self.request.params)
+        c = Credentials(key_name=user.user_id(), credentials=credentials)
+        c.put()
+        
+        # We delete the flow so that a malicious actor can't pretend to be the OAuth service
+        # and replace a valid token with an invalid token
+        f.delete()
+      handler_method(self, *args)
+      return 
+
+    # Find out who the user is. If we don't know who you are then we can't 
+    # look up your OAuth credentials thus we must ensure the user is logged in.
+    user = users.get_current_user()
+    if not user:
+      self.redirect(users.create_login_url(self.request.uri))
+      return
+    
+    # Now that we know who the user is look up their OAuth credentials
+    # if we don't find the credentials then send them through the OAuth dance
+    if not Credentials.get_by_key_name(user.user_id()):
+      # TODO(ade) make this more configurable using settings.py
+      # Domain, and scope should be configurable
+      p = apiclient.discovery.build("buzz", "v1")
+      flow = apiclient.oauth.FlowThreeLegged(p.auth_discovery(),
+                     consumer_key=settings.CONSUMER_KEY,
+                     consumer_secret=settings.CONSUMER_SECRET,
+                     user_agent='google-api-client-python-buzz-webapp/1.0',
+                     domain='anonymous',
+                     scope='https://www.googleapis.com/auth/buzz',
+                     xoauth_displayname=settings.DISPLAY_NAME)
+
+      # The OAuth system needs to send the user right back here so that they
+      # get to the page they originally intended to visit.
+      oauth_return_url = self.request.uri
+      authorize_url = flow.step1_get_authorize_url(oauth_return_url)
+      
+      f = Flow(key_name=user.user_id(), flow=flow)
+      f.put()
+      
+      self.redirect(authorize_url)
+      return
+    
+    # If the user already has a token then call the wrapped handler
+    handler_method(self, *args)
+  return check_oauth_credentials
+
+def build_buzz_wrapper_for_current_user():
+  user = users.get_current_user()
+  credentials = Credentials.get_by_key_name(user.user_id()).credentials
+  return simple_buzz_wrapper.SimpleBuzzWrapper(api_key=settings.API_KEY, 
+                                                 credentials=credentials)
\ No newline at end of file
diff --git a/contrib/buzz/buzz_gae_client.py b/contrib/buzz/buzz_gae_client.py
deleted file mode 100644
index c5954c2..0000000
--- a/contrib/buzz/buzz_gae_client.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/python2.4
-#
-# Copyright 2010 Google Inc. All Rights Reserved.
-
-__author__ = 'ade@google.com (Ade Oshineye)'
-
-import apiclient.discovery
-import logging
-import oauth_wrap
-import oauth2 as oauth
-import urllib
-import urlparse
-
-try:
-  from urlparse import parse_qs, parse_qsl
-except ImportError:
-  from cgi import parse_qs, parse_qsl
-
-# TODO(ade) Replace user-agent with something specific
-HEADERS = {
-  'user-agent': 'gdata-python-v3-sample-client/0.1',
-  'content-type': 'application/x-www-form-urlencoded'
-  }
-
-REQUEST_TOKEN_URL = 'https://www.google.com/accounts/OAuthGetRequestToken?domain=anonymous&scope=https://www.googleapis.com/auth/buzz'
-AUTHORIZE_URL = 'https://www.google.com/buzz/api/auth/OAuthAuthorizeToken?domain=anonymous&scope=https://www.googleapis.com/auth/buzz'
-ACCESS_TOKEN_URL = 'https://www.google.com/accounts/OAuthGetAccessToken'
-
-
-class Error(Exception):
-  """Base error for this module."""
-  pass
-
-
-class RequestError(Error):
-  """Request returned failure or unexpected data."""
-  pass
-
-
-# TODO(ade) This class is really a BuzzGaeBuilder. Rename it.
-class BuzzGaeClient(object):
-  def __init__(self, consumer_key='anonymous', consumer_secret='anonymous', api_key=None):
-    self.consumer = oauth.Consumer(consumer_key, consumer_secret)
-    self.consumer_key = consumer_key
-    self.consumer_secret = consumer_secret
-    self.api_key = api_key
-
-  def _make_post_request(self, client, url, parameters):
-    resp, content = client.request(url, 'POST', headers=HEADERS,
-        body=urllib.urlencode(parameters, True))
-
-    if resp['status'] != '200':
-      logging.warn('Request: %s failed with status: %s. Content was: %s' % (url, resp['status'], content))
-      raise RequestError('Invalid response %s.' % resp['status'])
-    return resp, content
-
-  def get_request_token(self, callback_url, display_name = None):
-    parameters = {
-      'oauth_callback': callback_url
-      }
-
-    if display_name is not None:
-      parameters['xoauth_displayname'] = display_name
-
-    client = oauth.Client(self.consumer)
-    resp, content = self._make_post_request(client, REQUEST_TOKEN_URL, parameters)
-
-    request_token = dict(parse_qsl(content))
-    return request_token
-
-  def generate_authorisation_url(self, request_token):
-    """Returns the URL the user should be redirected to in other to gain access to their account."""
-    
-    base_url = urlparse.urlparse(AUTHORIZE_URL)
-    query = parse_qs(base_url.query)
-    query['oauth_token'] = request_token['oauth_token']
-
-    logging.info(urllib.urlencode(query, True))
-
-    url = (base_url.scheme, base_url.netloc, base_url.path, base_url.params,
-      urllib.urlencode(query, True), base_url.fragment)
-    authorisation_url = urlparse.urlunparse(url)
-    return authorisation_url
-
-  def upgrade_to_access_token(self, request_token, oauth_verifier):
-    token = oauth.Token(request_token['oauth_token'],
-    request_token['oauth_token_secret'])
-    token.set_verifier(oauth_verifier)
-    client = oauth.Client(self.consumer, token)
-
-    parameters = {}
-    resp, content = self._make_post_request(client, ACCESS_TOKEN_URL, parameters)
-    access_token = dict(parse_qsl(content))
-
-    d = {
-      'consumer_key' : self.consumer_key,
-      'consumer_secret' : self.consumer_secret
-      }
-    d.update(access_token)
-    return d
-
-  def build_api_client(self, oauth_params=None):
-    if oauth_params is not None:
-      http = oauth_wrap.get_authorised_http(oauth_params)
-      return apiclient.discovery.build('buzz', 'v1', http=http, developerKey=self.api_key)
-    else:
-      return apiclient.discovery.build('buzz', 'v1', developerKey=self.api_key)
diff --git a/contrib/buzz/simple_buzz_wrapper.py b/contrib/buzz/simple_buzz_wrapper.py
deleted file mode 100644
index a82b57c..0000000
--- a/contrib/buzz/simple_buzz_wrapper.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python2.4
-#
-# Copyright 2010 Google Inc. All Rights Reserved.
-
-__author__ = 'ade@google.com (Ade Oshineye)'
-
-import buzz_gae_client
-import logging
-
-class SimpleBuzzWrapper(object):
-  "Simple client that exposes the bare minimum set of common Buzz operations"
-
-  def __init__(self, api_key=None, consumer_key='anonymous', consumer_secret='anonymous',
-    oauth_token=None, oauth_token_secret=None):
-    
-    self.builder = buzz_gae_client.BuzzGaeClient(consumer_key, consumer_secret, api_key=api_key)
-    if oauth_token and oauth_token_secret:
-      logging.debug('Using api_client with authorisation')
-      oauth_params_dict = {}
-      oauth_params_dict['consumer_key'] = consumer_key
-      oauth_params_dict['consumer_secret'] = consumer_secret
-      oauth_params_dict['oauth_token'] = oauth_token
-      oauth_params_dict['oauth_token_secret'] = oauth_token_secret
-      self.api_client = self.builder.build_api_client(oauth_params=oauth_params_dict)
-    else:
-      logging.debug('Using api_client that doesn\'t have authorisation')
-      self.api_client = self.builder.build_api_client()
-
-  def search(self, query, user_token=None, max_results=10):
-    if query is None or query.strip() is '':
-      return None
-
-    json = self.api_client.activities().search(q=query, max_results=max_results).execute()
-    if json.has_key('items'):
-      return json['items']
-    return []
-
-  def post(self, message_body, user_id='@me'):
-    if message_body is None or message_body.strip() is '':
-      return None
-
-    activities = self.api_client.activities()
-    logging.info('Retrieved activities for: %s' % user_id)
-    activity = activities.insert(userId=user_id, body={
-      'data' : {
-        'title': message_body,
-        'object': {
-          'content': message_body,
-          'type': 'note'}
-       }
-    }
-                                 ).execute()
-    url = activity['links']['alternate'][0]['href']
-    logging.info('Just created: %s' % url)
-    return url
-
-  def get_profile(self, user_id='@me'):
-    user_profile_data = self.api_client.people().get(userId=user_id).execute()
-    return user_profile_data
-
diff --git a/contrib/buzz/simple_wrapper.py b/contrib/buzz/simple_wrapper.py
new file mode 100644
index 0000000..eb12f85
--- /dev/null
+++ b/contrib/buzz/simple_wrapper.py
@@ -0,0 +1,54 @@
+#!/usr/bin/python2.4
+#
+# Copyright 2010 Google Inc. All Rights Reserved.
+
+__author__ = 'ade@google.com (Ade Oshineye)'
+
+import apiclient.discovery
+import httplib2
+import logging
+
+class SimpleWrapper(object):
+  "Simple client that exposes the bare minimum set of common Buzz operations"
+
+  def __init__(self, api_key=None, credentials=None):
+    if credentials:
+      logging.debug('Using api_client with credentials')
+      http = httplib2.Http()
+      http = credentials.authorize(http)
+      self.api_client = apiclient.discovery.build('buzz', 'v1', http=http, developerKey=api_key)
+    else:
+      logging.debug('Using api_client that doesn\'t have credentials')
+      self.api_client = apiclient.discovery.build('buzz', 'v1', developerKey=api_key)
+
+  def search(self, query, user_token=None, max_results=10):
+    if query is None or query.strip() is '':
+      return None
+
+    json = self.api_client.activities().search(q=query, max_results=max_results).execute()
+    if json.has_key('items'):
+      return json['items']
+    return []
+
+  def post(self, message_body, user_id='@me'):
+    if message_body is None or message_body.strip() is '':
+      return None
+
+    activities = self.api_client.activities()
+    logging.info('Retrieved activities for: %s' % user_id)
+    activity = activities.insert(userId=user_id, body={
+      'data' : {
+        'title': message_body,
+        'object': {
+          'content': message_body,
+          'type': 'note'}
+       }
+    }
+                                 ).execute()
+    url = activity['links']['alternate'][0]['href']
+    logging.info('Just created: %s' % url)
+    return url
+
+  def get_profile(self, user_id='@me'):
+    user_profile_data = self.api_client.people().get(userId=user_id).execute()
+    return user_profile_data