diff --git a/README.md b/README.md
index 3cf4f8e9..98781037 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
 
 a google reader clone built with go on app engine and angularjs
 
+# Current build instructions:
+* Use this:
+  Building: `GOPATH=$(GOPATH) GO111MODULE=auto go build app.go`
+  Deploy: `GOPATH=$(GOPATH) gcloud beta app deploy`
+
 ## setting up a local dev environment
 
 1. Install [Python 2.7](http://www.python.org/download/releases/2.7.5/) and make sure it is in your `PATH`. (Google App Engine doesn't yet work with Python 3.)
diff --git a/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go b/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
index 8aad19ac..e0598f41 100644
--- a/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
+++ b/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"appengine"
-	"appengine/memcache"
-	"appengine/user"
-	"appengine_internal"
+	"golang.org/x/net/context"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/user"
 	"github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/appstats"
 )
@@ -84,16 +84,17 @@ type Context struct {
 	miniprofiler.Timer
 }
 
-func (c Context) Call(service, method string, in, out appengine_internal.ProtoMessage, opts *appengine_internal.CallOptions) (err error) {
+/*
+func (c Context) Call(service, method string, in, out internal.Proto.Message) (err error) {
 	if c.Timer != nil && service != "__go__" {
 		c.StepCustomTiming(service, method, fmt.Sprintf("%v\n\n%v", method, in.String()), func() {
-			err = c.Context.Call(service, method, in, out, opts)
+			err = c.Context.Call(service, method, in, out)
 		})
 	} else {
-		err = c.Context.Call(service, method, in, out, opts)
+		err = c.Context.Call(service, method, in, out)
 	}
 	return
-}
+}*/
 
 func (c Context) Step(name string, f func(Context)) {
 	if c.Timer != nil {
@@ -110,7 +111,7 @@ func (c Context) Step(name string, f func(Context)) {
 
 // NewHandler returns a profiled, appstats-aware appengine.Context.
 func NewHandler(f func(Context, http.ResponseWriter, *http.Request)) http.Handler {
-	return appstats.NewHandler(func(c appengine.Context, w http.ResponseWriter, r *http.Request) {
+	return appstats.NewHandler(func(c context.Context, w http.ResponseWriter, r *http.Request) {
 		h := miniprofiler.NewHandler(func(t miniprofiler.Timer, w http.ResponseWriter, r *http.Request) {
 			pc := Context{
 				Context: c.(appstats.Context),
diff --git a/_third_party/github.com/mjibson/appstats/appstats.go b/_third_party/github.com/mjibson/appstats/appstats.go
index 5b9b6c1f..ed457832 100644
--- a/_third_party/github.com/mjibson/appstats/appstats.go
+++ b/_third_party/github.com/mjibson/appstats/appstats.go
@@ -23,13 +23,13 @@ import (
 	"math/rand"
 	"net/http"
 	"net/url"
-	"runtime/debug"
 	"time"
 
-	"appengine"
-	"appengine/memcache"
-	"appengine/user"
-	"appengine_internal"
+	"golang.org/x/net/context"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/user"
 )
 
 var (
@@ -69,20 +69,21 @@ func DefaultShouldRecord(r *http.Request) bool {
 	return rand.Float64() < RecordFraction
 }
 
-// Context is a timing-aware appengine.Context.
+// Context is a timing-aware context.Context.
 type Context struct {
-	appengine.Context
+	context.Context
 	header http.Header
 	stats  *requestStats
 }
 
-// Call times an appengine.Context Call. Internal use only.
-func (c Context) Call(service, method string, in, out appengine_internal.ProtoMessage, opts *appengine_internal.CallOptions) error {
+// Call times an context.Context Call. Internal use only.
+/*
+func (c Context) Call(service, method string, in, out internal.Proto.Message) error {
 	c.stats.wg.Add(1)
 	defer c.stats.wg.Done()
 
 	if service == "__go__" {
-		return c.Context.Call(service, method, in, out, opts)
+		return c.Context.Call(service, method, in, out)
 	}
 
 	stat := rpcStat{
@@ -92,7 +93,7 @@ func (c Context) Call(service, method string, in, out appengine_internal.ProtoMe
 		Offset:    time.Since(c.stats.Start),
 		StackData: string(debug.Stack()),
 	}
-	err := c.Context.Call(service, method, in, out, opts)
+	err := c.Context.Call(service, method, in, out)
 	stat.Duration = time.Since(stat.Start)
 	stat.In = in.String()
 	stat.Out = out.String()
@@ -110,7 +111,7 @@ func (c Context) Call(service, method string, in, out appengine_internal.ProtoMe
 	c.stats.Cost += stat.Cost
 	c.stats.lock.Unlock()
 	return err
-}
+}*/
 
 // NewContext creates a new timing-aware context from req.
 func NewContext(req *http.Request) Context {
@@ -137,7 +138,7 @@ func NewContext(req *http.Request) Context {
 
 // WithContext enables profiling of functions without a corresponding request,
 // as in the appengine/delay package. method and path may be empty.
-func WithContext(context appengine.Context, method, path string, f func(Context)) {
+func WithContext(context context.Context, method, path string, f func(Context)) {
 	var uname string
 	var admin bool
 	if u := user.Current(context); u != nil {
@@ -170,7 +171,7 @@ func (c Context) save() {
 		Stats:  c.stats,
 	}
 	if err := gob.NewEncoder(&buf_full).Encode(&full); err != nil {
-		c.Errorf("appstats Save error: %v", err)
+		log.Errorf(c.Context, "appstats Save error: %v", err)
 		return
 	} else if buf_full.Len() > bufMaxLen {
 		// first try clearing stack traces
@@ -187,7 +188,7 @@ func (c Context) save() {
 		part.RPCStats[i].Out = ""
 	}
 	if err := gob.NewEncoder(&buf_part).Encode(&part); err != nil {
-		c.Errorf("appstats Save error: %v", err)
+		log.Errorf(c.Context, "appstats Save error: %v", err)
 		return
 	}
 
@@ -201,7 +202,7 @@ func (c Context) save() {
 		Value: buf_full.Bytes(),
 	}
 
-	c.Infof("Saved; %s: %s, %s: %s, link: %v",
+	log.Infof(c.Context, "Saved; %s: %s, %s: %s, link: %v",
 		item_part.Key,
 		byteSize(len(item_part.Value)),
 		item_full.Key,
@@ -222,12 +223,12 @@ func (c Context) URL() string {
 	return u.String()
 }
 
-func (c Context) storeContext() appengine.Context {
+func (c Context) storeContext() context.Context {
 	nc, _ := appengine.Namespace(c.Context, Namespace)
 	return nc
 }
 
-func context(r *http.Request) appengine.Context {
+func _context(r *http.Request) context.Context {
 	c := appengine.NewContext(r)
 	nc, _ := appengine.Namespace(c, Namespace)
 	return nc
@@ -235,18 +236,18 @@ func context(r *http.Request) appengine.Context {
 
 // handler is an http.Handler that records RPC statistics.
 type handler struct {
-	f func(appengine.Context, http.ResponseWriter, *http.Request)
+	f func(context.Context, http.ResponseWriter, *http.Request)
 }
 
 // NewHandler returns a new Handler that will execute f.
-func NewHandler(f func(appengine.Context, http.ResponseWriter, *http.Request)) http.Handler {
+func NewHandler(f func(context.Context, http.ResponseWriter, *http.Request)) http.Handler {
 	return handler{
 		f: f,
 	}
 }
 
 // NewHandlerFunc returns a new HandlerFunc that will execute f.
-func NewHandlerFunc(f func(appengine.Context, http.ResponseWriter, *http.Request)) http.HandlerFunc {
+func NewHandlerFunc(f func(context.Context, http.ResponseWriter, *http.Request)) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		h := handler{
 			f: f,
diff --git a/_third_party/github.com/mjibson/appstats/handler.go b/_third_party/github.com/mjibson/appstats/handler.go
index a4a0436a..46bc1732 100644
--- a/_third_party/github.com/mjibson/appstats/handler.go
+++ b/_third_party/github.com/mjibson/appstats/handler.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 	"time"
 
-	"appengine"
-	"appengine/memcache"
-	"appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/user"
 )
 
 var templates *template.Template
@@ -91,7 +91,7 @@ func index(w http.ResponseWriter, r *http.Request) {
 		keys[i] = fmt.Sprintf(keyPart, i*distance)
 	}
 
-	c := context(r)
+	c := _context(r)
 	items, err := memcache.GetMulti(c, keys)
 	if err != nil {
 		return
@@ -238,7 +238,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	qtime := roundTime(i)
 	key := fmt.Sprintf(keyFull, qtime)
 
-	c := context(r)
+	c := _context(r)
 
 	v := struct {
 		Env             map[string]string
@@ -306,7 +306,7 @@ func file(w http.ResponseWriter, r *http.Request) {
 	fname := r.URL.Query().Get("f")
 	n := r.URL.Query().Get("n")
 	lineno, _ := strconv.Atoi(n)
-	c := context(r)
+	c := _context(r)
 
 	f, err := ioutil.ReadFile(fname)
 	if err != nil {
diff --git a/_third_party/github.com/mjibson/goon/doc.go b/_third_party/github.com/mjibson/goon/doc.go
index 81a25fd7..d49e0614 100644
--- a/_third_party/github.com/mjibson/goon/doc.go
+++ b/_third_party/github.com/mjibson/goon/doc.go
@@ -88,7 +88,7 @@ datastore:
 	type Group struct {
 		Name string
 	}
-	c := appengine.NewContext(r)
+	c := r.NewContext()
 	g := &Group{Name: "name"}
 	k := datastore.NewIncompleteKey(c, "Group", nil)
 	err := datastore.Put(c, k, g)
@@ -110,7 +110,7 @@ datastore:
 	type Group struct {
 		Name string
 	}
-	c := appengine.NewContext(r)
+	c := r.NewContext()
 	g := &Group{}
 	k := datastore.NewKey(c, "Group", "", 1, nil)
 	err := datastore.Get(c, k, g)
diff --git a/_third_party/github.com/mjibson/goon/entity.go b/_third_party/github.com/mjibson/goon/entity.go
index a9c46cd2..46d5403f 100644
--- a/_third_party/github.com/mjibson/goon/entity.go
+++ b/_third_party/github.com/mjibson/goon/entity.go
@@ -26,8 +26,8 @@ import (
 	"sync"
 	"time"
 
-	"appengine"
-	"appengine/datastore"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/datastore"
 )
 
 type fieldInfo struct {
diff --git a/_third_party/github.com/mjibson/goon/goon.go b/_third_party/github.com/mjibson/goon/goon.go
index 087c6e84..b6886859 100644
--- a/_third_party/github.com/mjibson/goon/goon.go
+++ b/_third_party/github.com/mjibson/goon/goon.go
@@ -26,15 +26,18 @@ import (
 	"sync"
 	"time"
 
-	"appengine"
-	"appengine/datastore"
-	"appengine/memcache"
+	"golang.org/x/net/context"
+
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/memcache"
 )
 
 var (
-	// LogErrors issues appengine.Context.Errorf on any error.
+	// LogErrors issues context.Context.Errorf on any error.
 	LogErrors = true
-	// LogTimeoutErrors issues appengine.Context.Warningf on memcache timeout errors.
+	// LogTimeoutErrors issues context.Context.Warningf on memcache timeout errors.
 	LogTimeoutErrors = false
 
 	// MemcachePutTimeoutThreshold is the number of bytes at which the memcache
@@ -53,7 +56,7 @@ var (
 
 // Goon holds the app engine context and the request memory cache.
 type Goon struct {
-	Context       appengine.Context
+	Context       context.Context
 	cache         map[string]interface{}
 	cacheLock     sync.RWMutex // protect the cache from concurrent goroutines to speed up RPC access
 	inTransaction bool
@@ -75,9 +78,9 @@ func NewGoon(r *http.Request) *Goon {
 	return FromContext(appengine.NewContext(r))
 }
 
-// FromContext creates a new Goon object from the given appengine Context.
+// FromContext creates a new Goon object from the given context Context.
 // Useful with profiling packages like appstats.
-func FromContext(c appengine.Context) *Goon {
+func FromContext(c context.Context) *Goon {
 	return &Goon{
 		Context:          c,
 		cache:            make(map[string]interface{}),
@@ -91,15 +94,15 @@ func (g *Goon) error(err error) {
 	}
 	_, filename, line, ok := runtime.Caller(1)
 	if ok {
-		g.Context.Errorf("goon - %s:%d - %v", filepath.Base(filename), line, err)
+		log.Errorf(g.Context, "goon - %s:%d - %v", filepath.Base(filename), line, err)
 	} else {
-		g.Context.Errorf("goon - %v", err)
+		log.Errorf(g.Context, "goon - %v", err)
 	}
 }
 
 func (g *Goon) timeoutError(err error) {
 	if LogTimeoutErrors {
-		g.Context.Warningf("goon memcache timeout: %v", err)
+		log.Warningf(g.Context, "goon memcache timeout: %v", err)
 	}
 }
 
@@ -158,7 +161,7 @@ func (g *Goon) KeyError(src interface{}) (*datastore.Key, error) {
 // https://developers.google.com/appengine/docs/go/datastore/reference#RunInTransaction
 func (g *Goon) RunInTransaction(f func(tg *Goon) error, opts *datastore.TransactionOptions) error {
 	var ng *Goon
-	err := datastore.RunInTransaction(g.Context, func(tc appengine.Context) error {
+	err := datastore.RunInTransaction(g.Context, func(tc context.Context) error {
 		ng = &Goon{
 			Context:          tc,
 			inTransaction:    true,
@@ -346,7 +349,8 @@ func (g *Goon) putMemcache(srcs []interface{}, exists []byte) error {
 	}
 	errc := make(chan error)
 	go func() {
-		errc <- memcache.SetMulti(appengine.Timeout(g.Context, memcacheTimeout), items)
+		c, _ := context.WithTimeout(g.Context, memcacheTimeout)
+		errc <- memcache.SetMulti(c, items)
 	}()
 	g.putMemoryMulti(srcs, exists)
 	err := <-errc
@@ -440,7 +444,8 @@ func (g *Goon) GetMulti(dst interface{}) error {
 
 	multiErr, any := make(appengine.MultiError, len(keys)), false
 
-	memvalues, err := memcache.GetMulti(appengine.Timeout(g.Context, MemcacheGetTimeout), memkeys)
+	c, _ := context.WithTimeout(g.Context, MemcacheGetTimeout)
+	memvalues, err := memcache.GetMulti(c, memkeys)
 	if appengine.IsTimeoutError(err) {
 		g.timeoutError(err)
 		err = nil
diff --git a/_third_party/github.com/mjibson/goon/goon_test.go b/_third_party/github.com/mjibson/goon/goon_test.go
index d0f03e82..d0f3fe73 100644
--- a/_third_party/github.com/mjibson/goon/goon_test.go
+++ b/_third_party/github.com/mjibson/goon/goon_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"appengine"
-	"appengine/aetest"
-	"appengine/datastore"
-	"appengine/memcache"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/aetest"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/memcache"
 )
 
 // *[]S, *[]*S, *[]I, []S, []*S, []I
diff --git a/_third_party/github.com/mjibson/goon/query.go b/_third_party/github.com/mjibson/goon/query.go
index 1b4acca9..bebc90ec 100644
--- a/_third_party/github.com/mjibson/goon/query.go
+++ b/_third_party/github.com/mjibson/goon/query.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"appengine/datastore"
+	"google.golang.org/appengine/v2/datastore"
 )
 
 // Count returns the number of results for the query.
diff --git a/admin.go b/admin.go
index 4f9f5c83..b247658f 100644
--- a/admin.go
+++ b/admin.go
@@ -24,8 +24,9 @@ import (
 	"strings"
 	"time"
 
-	"appengine/datastore"
-	"appengine/memcache"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/memcache"
 
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
@@ -90,28 +91,13 @@ func AdminFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 	gn.GetMulti(stories)
-	lk := gn.Key(&Log{Parent: fk, Id: time.Now().Add(-time.Hour * 6).UnixNano()})
-	q = datastore.NewQuery(lk.Kind()).KeysOnly()
-	q = q.Ancestor(fk)
-	q = q.Filter("__key__ >", lk)
-	keys, _ = gn.GetAll(q, nil)
-	logs := make([]*Log, len(keys))
-	for j, key := range keys {
-		logs[j] = &Log{
-			Id:     key.IntID(),
-			Parent: fk,
-		}
-	}
-	gn.GetMulti(logs)
 
 	templates.ExecuteTemplate(w, "admin-feed.html", struct {
 		Feed    *Feed
-		Logs    []*Log
 		Stories []*Story
 		Now     time.Time
 	}{
 		&f,
-		logs,
 		stories,
 		time.Now(),
 	})
@@ -175,8 +161,7 @@ func AdminUser(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	it := gn.Run(q)
 	var u User
 	ud := UserData{Id: "data"}
-	var h []Log
-	k, err := it.Next(&u)
+	_, err := it.Next(&u)
 	if err != nil {
 		serveError(w, err)
 		return
@@ -199,18 +184,14 @@ func AdminUser(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 			serveError(w, err)
 			return
 		}
-		c.Infof("opml updated")
+		log.Infof(c, "opml updated")
 	}
-	q = datastore.NewQuery(gn.Kind(&Log{})).Ancestor(k)
-	_, err = gn.GetAll(q, &h)
 	if err := templates.ExecuteTemplate(w, "admin-user.html", struct {
 		User User
 		Data UserData
-		Log  []Log
 	}{
 		u,
 		ud,
-		h,
 	}); err != nil {
 		serveError(w, err)
 	}
diff --git a/app/.gcloudignore b/app/.gcloudignore
new file mode 100644
index 00000000..199e6d9f
--- /dev/null
+++ b/app/.gcloudignore
@@ -0,0 +1,25 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+# Test binary, build with `go test -c`
+*.test
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
\ No newline at end of file
diff --git a/app/app.go b/app/app.go
index e23c23cb..89df3e49 100644
--- a/app/app.go
+++ b/app/app.go
@@ -1,15 +1,39 @@
-package app
+package main
 
+/*
 import (
+	"log"
+	"os"
 	"net/http"
-
+	"google.golang.org/appengine"
 	"github.com/mjibson/goread/_third_party/github.com/gorilla/mux"
-
 	app "github.com/mjibson/goread"
 )
 
-func init() {
+func main() {
 	router := mux.NewRouter()
 	app.RegisterHandlers(router)
 	http.Handle("/", router)
+
+	port := os.Getenv("PORT")
+	if port == "" {
+		port = "8080"
+		log.Printf("Defaulting to port %s", port)
+	}
+
+	log.Printf("Listening on port %s", port)
+	if err := http.ListenAndServe(":"+port, nil); err != nil {
+		log.Fatal(err)
+	}
+}
+*/
+
+import (
+  "google.golang.org/appengine/v2"
+  _ "github.com/mjibson/goread"
+  _ "github.com/mjibson/goread/_third_party/github.com/mjibson/appstats"
+)
+
+func main() {
+  appengine.Main()
 }
diff --git a/app/app.sample.yaml b/app/app.sample.yaml
index 6d689217..8b5a49e8 100644
--- a/app/app.sample.yaml
+++ b/app/app.sample.yaml
@@ -1,7 +1,5 @@
-application: go-read
-version: 1
-runtime: go
-api_version: go1
+runtime: go116
+app_engine_apis: true
 
 automatic_scaling:
   min_idle_instances: 1
@@ -26,34 +24,33 @@ handlers:
 - url: /index.html
   static_files: static/index.html
   upload: static/index.html
-  application_readable: true
 
 - url: /static
   static_dir: static
 
 - url: /login/google
   login: required
-  script: _go_app
+  script: auto
   secure: always
 
 - url: /user/.*
   login: required
-  script: _go_app
+  script: auto
   secure: always
 
 - url: /task/.*
   login: admin
-  script: _go_app
+  script: auto
   secure: always
 
 - url: /admin/.*
   login: admin
-  script: _go_app
+  script: auto
   secure: always
 
 - url: /push
-  script: _go_app
+  script: auto
 
 - url: /.*
-  script: _go_app
+  script: auto
   secure: always
diff --git a/app/templates/admin-feed.html b/app/templates/admin-feed.html
index 66e5d90c..51405ea5 100644
--- a/app/templates/admin-feed.html
+++ b/app/templates/admin-feed.html
@@ -25,17 +25,6 @@
 	<tr><td><a href="{{.Feed.Hub}}/subscription-details?hub.callback={{.Feed.PubSubURL}}&hub.topic={{.Feed.Url}}">pubsub</a></td></tr>
 </table>
 
-logs:
-<ul>
-{{range .Logs}}
-	<li>
-		{{nanotime .Id | since}}
-		{{nanotime .Id}}
-		{{.Text}}
-	</li>
-{{end}}
-</ul>
-
 stories:
 <ul>
 {{range .Stories}}
diff --git a/app/templates/admin-user.html b/app/templates/admin-user.html
index e299f6e8..33f1c6ab 100644
--- a/app/templates/admin-user.html
+++ b/app/templates/admin-user.html
@@ -25,14 +25,5 @@
 </textarea>
 <br><input type="submit" value="save">
 </form>
-<table>
-{{range .Log}}
-	<tr>
-		<td>{{nanotime .Id | since}}</td>
-		<td>{{nanotime .Id}}</td>
-		<td>{{.Text}}</td>
-	</tr>
-{{end}}
-</table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/charge.go b/charge.go
index 6817ef80..5da2d398 100644
--- a/charge.go
+++ b/charge.go
@@ -27,10 +27,9 @@ import (
 
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
-
-	"appengine/datastore"
-	"appengine/urlfetch"
-	"appengine/user"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/user"
 )
 
 type Plan struct {
@@ -112,7 +111,7 @@ func Charge(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		} else {
 			serveError(w, fmt.Errorf("Error"))
 		}
-		c.Errorf("status: %v, %s", resp.StatusCode, b)
+		log.Errorf(c, "status: %v, %s", resp.StatusCode, b)
 		return
 	}
 	uc, err = setCharge(c, resp)
@@ -171,7 +170,7 @@ func Account(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 			if resp, err := stripe(c, "GET", "customers/"+uc.Customer, ""); err == nil {
 				if nuc, err := setCharge(c, resp); err == nil {
 					uc = nuc
-					c.Infof("updated user charge %v", cu.ID)
+					log.Infof(c, "updated user charge %v", cu.ID)
 				}
 			}
 		}
@@ -208,8 +207,8 @@ func doUncheckout(c mpg.Context) (*UserCharge, error) {
 	if err != nil {
 		return nil, err
 	} else if resp.StatusCode != http.StatusOK {
-		c.Errorf("%s", resp.Body)
-		c.Errorf("stripe delete error, but proceeding")
+		log.Errorf(c, "%s", resp.Body)
+		log.Errorf(c, "stripe delete error, but proceeding")
 	}
 	if err := gn.RunInTransaction(func(gn *goon.Goon) error {
 		if err := gn.Get(&u); err != nil && err != datastore.ErrNoSuchEntity {
@@ -231,12 +230,8 @@ func doUncheckout(c mpg.Context) (*UserCharge, error) {
 }
 
 func stripe(c mpg.Context, method, urlStr, body string) (*http.Response, error) {
-	cl := &http.Client{
-		Transport: &urlfetch.Transport{
-			Context:  c,
-			Deadline: time.Minute,
-		},
-	}
+	cl, cf := createHttpClient(c, time.Minute)
+	defer cf()
 	req, err := http.NewRequest(method, fmt.Sprintf("https://api.stripe.com/v1/%s", urlStr), strings.NewReader(body))
 	if err != nil {
 		return nil, err
diff --git a/dev.go b/dev.go
index 7d6647d8..4412303e 100644
--- a/dev.go
+++ b/dev.go
@@ -24,8 +24,9 @@ import (
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
-	"appengine/datastore"
-	"appengine/user"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/user"
 )
 
 func ClearRead(c mpg.Context, w http.ResponseWriter, r *http.Request) {
@@ -38,7 +39,7 @@ func ClearRead(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	u := &User{Id: cu.ID}
 	ud := &UserData{Id: "data", Parent: gn.Key(u)}
 	if err := gn.Get(u); err != nil {
-		c.Errorf("err: %v", err.Error())
+		log.Errorf(c, "err: %v", err.Error())
 		return
 	}
 	gn.Get(ud)
@@ -61,7 +62,7 @@ func ClearFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		defer func() { done <- true }()
 		ud := &UserData{Id: "data", Parent: gn.Key(u)}
 		if err := gn.Get(u); err != nil {
-			c.Errorf("user del err: %v", err.Error())
+			log.Errorf(c, "user del err: %v", err.Error())
 			return
 		}
 		gn.Get(ud)
@@ -69,21 +70,21 @@ func ClearFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		ud.Read = nil
 		ud.Opml = nil
 		gn.PutMulti([]interface{}{u, ud})
-		c.Infof("%v cleared", u.Email)
+		log.Infof(c, "%v cleared", u.Email)
 	}()
 	del := func(kind string) {
 		defer func() { done <- true }()
 		q := datastore.NewQuery(kind).KeysOnly()
 		keys, err := gn.GetAll(q, nil)
 		if err != nil {
-			c.Errorf("err: %v", err.Error())
+			log.Errorf(c, "err: %v", err.Error())
 			return
 		}
 		if err := gn.DeleteMulti(keys); err != nil {
-			c.Errorf("err: %v", err.Error())
+			log.Errorf(c, "err: %v", err.Error())
 			return
 		}
-		c.Infof("%v deleted", kind)
+		log.Infof(c, "%v deleted", kind)
 	}
 	types := []interface{}{
 		&Feed{},
diff --git a/main.go b/main.go
index f8b3c8a9..526f767a 100644
--- a/main.go
+++ b/main.go
@@ -32,8 +32,9 @@ import (
 	"github.com/mjibson/goread/_third_party/github.com/gorilla/mux"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
-	"appengine"
-	"appengine/datastore"
+	"golang.org/x/net/context"
+	"google.golang.org/appengine/v2/datastore"
+	alog "google.golang.org/appengine/v2/log"
 )
 
 var (
@@ -62,6 +63,10 @@ func init() {
 
 	miniprofiler.ToggleShortcut = "Alt+C"
 	miniprofiler.Position = "bottomleft"
+
+	router := mux.NewRouter()
+	RegisterHandlers(router)
+	http.Handle("/", router)
 }
 
 func RegisterHandlers(r *mux.Router) {
@@ -154,7 +159,7 @@ func Main(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		w.Write(mobileIndex)
 	} else {
 		if err := templates.ExecuteTemplate(w, "base.html", includes(c, w, r)); err != nil {
-			c.Errorf("%v", err)
+			alog.Errorf(c, "%v", err)
 			serveError(w, err)
 		}
 	}
@@ -163,7 +168,7 @@ func Main(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 func addFeed(c mpg.Context, userid string, outline *OpmlOutline) error {
 	gn := goon.FromContext(c)
 	o := outline.Outline[0]
-	c.Infof("adding feed %v to user %s", o.XmlUrl, userid)
+	alog.Infof(c, "adding feed %v to user %s", o.XmlUrl, userid)
 	fu, ferr := url.Parse(o.XmlUrl)
 	if ferr != nil {
 		return ferr
@@ -208,7 +213,7 @@ func addFeed(c mpg.Context, userid string, outline *OpmlOutline) error {
 	return nil
 }
 
-func mergeUserOpml(c appengine.Context, ud *UserData, outlines ...*OpmlOutline) error {
+func mergeUserOpml(c context.Context, ud *UserData, outlines ...*OpmlOutline) error {
 	var fs Opml
 	json.Unmarshal(ud.Opml, &fs)
 	urls := make(map[string]bool)
diff --git a/tasks.go b/tasks.go
index 2c9e9feb..7c3b2fea 100644
--- a/tasks.go
+++ b/tasks.go
@@ -31,15 +31,17 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/mjibson/goread/_third_party/code.google.com/p/go-charset/charset"
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
-	"appengine"
-	"appengine/blobstore"
-	"appengine/datastore"
-	"appengine/taskqueue"
-	"appengine/urlfetch"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/blobstore"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/taskqueue"
 )
 
 func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
@@ -54,7 +56,7 @@ func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	if s, err := strconv.Atoi(r.FormValue("skip")); err == nil {
 		skip = s
 	}
-	c.Debugf("reader import for %v, skip %v", userid, skip)
+	log.Debugf(c, "reader import for %v, skip %v", userid, skip)
 
 	d := xml.NewDecoder(blobstore.NewReader(c, appengine.BlobKey(bk)))
 	d.CharsetReader = charset.NewReader
@@ -63,7 +65,7 @@ func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	err := d.Decode(&opml)
 	if err != nil {
 		del()
-		c.Warningf("gob decode failed: %v", err.Error())
+		log.Warningf(c, "gob decode failed: %v", err.Error())
 		return
 	}
 
@@ -101,10 +103,10 @@ func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		go func(i int) {
 			o := userOpml[i].Outline[0]
 			if err := addFeed(c, userid, userOpml[i]); err != nil {
-				c.Warningf("opml import error: %v", err.Error())
+				log.Warningf(c, "opml import error: %v", err.Error())
 				// todo: do something here?
 			}
-			c.Debugf("opml import: %s, %s", o.Title, o.XmlUrl)
+			log.Debugf(c, "opml import: %s, %s", o.Title, o.XmlUrl)
 			wg.Done()
 		}(i)
 	}
@@ -120,7 +122,7 @@ func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		return err
 	}, nil); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		c.Errorf("ude update error: %v", err.Error())
+		log.Errorf(c, "ude update error: %v", err.Error())
 		return
 	}
 
@@ -133,7 +135,7 @@ func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		taskqueue.Add(c, task, "import-reader")
 	} else {
 		del()
-		c.Infof("opml import done: %v", userid)
+		log.Infof(c, "opml import done: %v", userid)
 	}
 }
 
@@ -144,7 +146,7 @@ func SubscribeCallback(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	furl := r.FormValue("feed")
 	b, _ := base64.URLEncoding.DecodeString(furl)
 	f := Feed{Url: string(b)}
-	c.Infof("url: %v", f.Url)
+	log.Infof(c, "url: %v", f.Url)
 	if err := gn.Get(&f); err != nil {
 		http.Error(w, "", http.StatusNotFound)
 		return
@@ -157,51 +159,33 @@ func SubscribeCallback(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(r.FormValue("hub.challenge")))
 		i, _ := strconv.Atoi(r.FormValue("hub.lease_seconds"))
 		f.Subscribed = time.Now().Add(time.Second * time.Duration(i))
-		gn.PutMulti([]interface{}{&f, &Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   "SubscribeCallback - subscribed - " + f.Subscribed.String(),
-		}})
-		c.Debugf("subscribed: %v - %v", f.Url, f.Subscribed)
+		gn.Put(&f)
+		log.Debugf(c, "subscribed: %v - %v", f.Url, f.Subscribed)
 		return
 	} else if !f.NotViewed() {
-		c.Infof("push: %v", f.Url)
-		gn.Put(&Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   "SubscribeCallback - push update",
-		})
+		log.Infof(c, "push: %v", f.Url)
 		defer r.Body.Close()
 		b, _ := ioutil.ReadAll(r.Body)
 		nf, ss, err := ParseFeed(c, r.Header.Get("Content-Type"), f.Url, f.Url, b)
 		if err != nil {
-			c.Errorf("parse error: %v", err)
+			log.Errorf(c, "parse error: %v", err)
 			return
 		}
 		if err := updateFeed(c, f.Url, nf, ss, false, true, false); err != nil {
-			c.Errorf("push error: %v", err)
+			log.Errorf(c, "push error: %v", err)
 		}
 	} else {
-		c.Infof("not viewed")
+		log.Infof(c, "not viewed")
 	}
 }
 
 // Task used to subscribe a feed to push.
 func SubscribeFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
-	start := time.Now()
 	gn := goon.FromContext(c)
 	f := Feed{Url: r.FormValue("feed")}
-	fk := gn.Key(&f)
 	s := ""
-	defer func() {
-		gn.Put(&Log{
-			Parent: fk,
-			Id:     time.Now().UnixNano(),
-			Text:   "SubscribeFeed - start " + start.String() + " - f.sub " + f.Subscribed.String() + " - " + s,
-		})
-	}()
 	if err := gn.Get(&f); err != nil {
-		c.Errorf("%v: %v", err, f.Url)
+		log.Errorf(c, "%v: %v", err, f.Url)
 		serveError(w, err)
 		s += "err"
 		return
@@ -218,25 +202,21 @@ func SubscribeFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	u.Add("hub.topic", fu.String())
 	req, err := http.NewRequest("POST", f.Hub, strings.NewReader(u.Encode()))
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	cl := &http.Client{
-		Transport: &urlfetch.Transport{
-			Context:  c,
-			Deadline: time.Minute,
-		},
-	}
+	cl, cf := createHttpClient(c, time.Minute)
+	defer cf()
 	resp, err := cl.Do(req)
 	if err != nil {
-		c.Errorf("req error: %v", err)
+		log.Errorf(c, "req error: %v", err)
 	} else if resp.StatusCode != http.StatusNoContent {
 		f.Subscribed = time.Now().Add(time.Hour * 48)
 		gn.Put(&f)
 		if resp.StatusCode != http.StatusConflict {
-			c.Errorf("resp: %v - %v", f.Url, resp.Status)
-			c.Errorf("%s", resp.Body)
+			log.Errorf(c, "resp: %v - %v", f.Url, resp.Status)
+			log.Errorf(c, "%s", resp.Body)
 		}
 		s += "resp err"
 	} else {
-		c.Infof("subscribed: %v", f.Url)
+		log.Infof(c, "subscribed: %v", f.Url)
 		s += "success"
 	}
 }
@@ -244,7 +224,9 @@ func SubscribeFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 func UpdateFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	q := datastore.NewQuery("F").KeysOnly().Filter("n <=", time.Now())
 	q = q.Limit(10 * 60 * 2) // 10/s queue, 2 min cron
-	it := q.Run(appengine.Timeout(c, time.Minute))
+	c1, cf := context.WithTimeout(c, time.Minute)
+	defer cf()
+	it := q.Run(c1)
 	tc := make(chan *taskqueue.Task)
 	done := make(chan bool)
 	i := 0
@@ -255,7 +237,7 @@ func UpdateFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		if err == datastore.Done {
 			break
 		} else if err != nil {
-			c.Errorf("next error: %v", err.Error())
+			log.Errorf(c, "next error: %v", err.Error())
 			break
 		}
 		tc <- taskqueue.NewPOSTTask(u, url.Values{
@@ -265,7 +247,7 @@ func UpdateFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	}
 	close(tc)
 	<-done
-	c.Infof("updating %d feeds", i)
+	log.Infof(c, "updating %d feeds", i)
 }
 
 func fetchFeed(c mpg.Context, origUrl, fetchUrl string) (*Feed, []*Story, error) {
@@ -290,12 +272,8 @@ func fetchFeed(c mpg.Context, origUrl, fetchUrl string) (*Feed, []*Story, error)
 		}
 	}
 
-	cl := &http.Client{
-		Transport: &urlfetch.Transport{
-			Context:  c,
-			Deadline: time.Minute,
-		},
-	}
+	cl, cf := createHttpClient(c, time.Minute)
+	defer cf()
 	if resp, err := cl.Get(fetchUrl); err == nil && resp.StatusCode == http.StatusOK {
 		const sz = 1 << 21
 		reader := &io.LimitedReader{R: resp.Body, N: sz}
@@ -323,10 +301,10 @@ func fetchFeed(c mpg.Context, origUrl, fetchUrl string) (*Feed, []*Story, error)
 		}
 		return ParseFeed(c, resp.Header.Get("Content-Type"), origUrl, fetchUrl, b)
 	} else if err != nil {
-		c.Warningf("fetch feed error: %v", err)
+		log.Warningf(c, "fetch feed error: %v", err)
 		return nil, nil, fmt.Errorf("Could not fetch feed")
 	} else {
-		c.Warningf("fetch feed error: status code: %s", resp.Status)
+		log.Warningf(c, "fetch feed error: status code: %s", resp.Status)
 		return nil, nil, fmt.Errorf("Bad response code from server")
 	}
 }
@@ -337,11 +315,7 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 	if err := gn.Get(&f); err != nil {
 		return fmt.Errorf("feed not found: %s", url)
 	}
-	gn.Put(&Log{
-		Parent: gn.Key(&f),
-		Id:     time.Now().UnixNano(),
-		Text:   "feed update",
-	})
+	log.Infof(c, "feed update: %s", url)
 
 	// Compare the feed's listed update to the story's update.
 	// Note: these may not be accurate, hence, only compare them to each other,
@@ -362,14 +336,14 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 	}
 
 	if hasUpdated && isFeedUpdated && !updateAll && !fromSub {
-		c.Infof("feed %s already updated to %v, putting", url, feed.Updated)
+		log.Infof(c, "feed %s already updated to %v, putting", url, feed.Updated)
 		f.Updated = time.Now()
 		scheduleNextUpdate(c, &f)
 		gn.Put(&f)
 		return nil
 	}
 
-	c.Debugf("hasUpdate: %v, isFeedUpdated: %v, storyDate: %v, stories: %v", hasUpdated, isFeedUpdated, storyDate, len(stories))
+	log.Debugf(c, "hasUpdate: %v, isFeedUpdated: %v, storyDate: %v, stories: %v", hasUpdated, isFeedUpdated, storyDate, len(stories))
 	puts := []interface{}{&f}
 
 	// find non existant stories
@@ -380,7 +354,7 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 	}
 	err := gn.GetMulti(getStories)
 	if _, ok := err.(appengine.MultiError); err != nil && !ok {
-		c.Errorf("GetMulti error: %v", err)
+		log.Errorf(c, "GetMulti error: %v", err)
 		return err
 	}
 	var updateStories []*Story
@@ -397,7 +371,7 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 			updateStories = append(updateStories, stories[i])
 		}
 	}
-	c.Debugf("%v update stories", len(updateStories))
+	log.Debugf(c, "%v update stories", len(updateStories))
 
 	for _, s := range updateStories {
 		puts = append(puts, s)
@@ -415,12 +389,12 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 			sc.Content = s.content
 		}
 		if _, err := gn.Put(&sc); err != nil {
-			c.Errorf("put sc err: %v", err)
+			log.Errorf(c, "put sc err: %v", err)
 			return err
 		}
 	}
 
-	c.Debugf("putting %v entities", len(puts))
+	log.Debugf(c, "putting %v entities", len(puts))
 	if len(puts) > 1 {
 		updateAverage(&f, f.Date, len(puts)-1)
 		f.Date = time.Now()
@@ -436,34 +410,29 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 		}
 	}
 	delay := f.NextUpdate.Sub(time.Now())
-	c.Infof("next update scheduled for %v from now", delay-delay%time.Second)
+	log.Infof(c, "next update scheduled for %v from now", delay-delay%time.Second)
 	_, err = gn.PutMulti(puts)
 	if err != nil {
-		c.Errorf("update put err: %v", err)
+		log.Errorf(c, "update put err: %v", err)
 	}
 	return err
 }
 
 func UpdateFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
-	gn := goon.FromContext(appengine.Timeout(c, time.Minute))
+	c1, cf := context.WithTimeout(c, time.Minute)
+	defer cf()
+	gn := goon.FromContext(c1)
 	url := r.FormValue("feed")
 	if url == "" {
-		c.Errorf("empty update feed")
+		log.Errorf(c, "empty update feed")
 		return
 	}
-	c.Debugf("update feed %s", url)
+	log.Debugf(c, "update feed %s", url)
 	last := len(r.FormValue("last")) > 0
 	f := Feed{Url: url}
 	s := ""
-	defer func() {
-		gn.Put(&Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   "UpdateFeed - " + s,
-		})
-	}()
 	if err := gn.Get(&f); err == datastore.ErrNoSuchEntity {
-		c.Errorf("no such entity - " + url)
+		log.Errorf(c, "no such entity - "+url)
 		s += "NSE"
 		return
 	} else if err != nil {
@@ -472,7 +441,7 @@ func UpdateFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	} else if last {
 		// noop
 	} else if time.Now().Before(f.NextUpdate) {
-		c.Errorf("feed %v already updated: %v", url, f.NextUpdate)
+		log.Errorf(c, "feed %v already updated: %v", url, f.NextUpdate)
 		s += "already updated"
 		return
 	}
@@ -489,7 +458,7 @@ func UpdateFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		}
 		f.NextUpdate = time.Now().Add(time.Hour * time.Duration(v))
 		gn.Put(&f)
-		c.Warningf("error with %v (%v), bump next update to %v, %v", url, f.Errors, f.NextUpdate, err)
+		log.Warningf(c, "error with %v (%v), bump next update to %v, %v", url, f.Errors, f.NextUpdate, err)
 	}
 
 	if feed, stories, err := fetchFeed(c, f.Url, f.Url); err == nil {
@@ -507,7 +476,7 @@ func UpdateFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 func UpdateFeedLast(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	gn := goon.FromContext(c)
 	url := r.FormValue("feed")
-	c.Debugf("update feed last %s", url)
+	log.Debugf(c, "update feed last %s", url)
 	f := Feed{Url: url}
 	if err := gn.Get(&f); err != nil {
 		return
@@ -517,7 +486,8 @@ func UpdateFeedLast(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func DeleteBlobs(c mpg.Context, w http.ResponseWriter, r *http.Request) {
-	ctx := appengine.Timeout(c, time.Minute)
+	ctx, cf := context.WithTimeout(c, time.Minute)
+	defer cf()
 	q := datastore.NewQuery("__BlobInfo__").KeysOnly()
 	it := q.Run(ctx)
 	wg := sync.WaitGroup{}
@@ -529,7 +499,7 @@ func DeleteBlobs(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 			if err == datastore.Done {
 				break
 			} else if err != nil {
-				c.Errorf("err: %v", err)
+				log.Errorf(c, "err: %v", err)
 				continue
 			}
 			bk = append(bk, appengine.BlobKey(k.StringID()))
@@ -539,10 +509,10 @@ func DeleteBlobs(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		}
 		go func(bk []appengine.BlobKey) {
 			something = true
-			c.Errorf("deleteing %v blobs", len(bk))
+			log.Errorf(c, "deleteing %v blobs", len(bk))
 			err := blobstore.DeleteMulti(ctx, bk)
 			if err != nil {
-				c.Errorf("blobstore delete err: %v", err)
+				log.Errorf(c, "blobstore delete err: %v", err)
 			}
 			wg.Done()
 		}(bk)
@@ -555,7 +525,8 @@ func DeleteBlobs(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func DeleteOldFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
-	ctx := appengine.Timeout(c, time.Minute)
+	ctx, cf := context.WithTimeout(c, time.Minute)
+	defer cf()
 	gn := goon.FromContext(c)
 	q := datastore.NewQuery(gn.Kind(&Feed{})).Filter("n=", timeMax).KeysOnly()
 	if cur, err := datastore.DecodeCursor(r.FormValue("c")); err == nil {
@@ -567,11 +538,11 @@ func DeleteOldFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	for i := 0; i < 10000 && len(tasks) < 100; i++ {
 		k, err := it.Next(nil)
 		if err == datastore.Done {
-			c.Criticalf("done")
+			log.Criticalf(c, "done")
 			done = true
 			break
 		} else if err != nil {
-			c.Errorf("err: %v", err)
+			log.Errorf(c, "err: %v", err)
 			continue
 		}
 		values := make(url.Values)
@@ -579,9 +550,9 @@ func DeleteOldFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		tasks = append(tasks, taskqueue.NewPOSTTask("/tasks/delete-old-feed", values))
 	}
 	if len(tasks) > 0 {
-		c.Errorf("deleting %v feeds", len(tasks))
+		log.Errorf(c, "deleting %v feeds", len(tasks))
 		if _, err := taskqueue.AddMulti(c, tasks, ""); err != nil {
-			c.Errorf("err: %v", err)
+			log.Errorf(c, "err: %v", err)
 		}
 	}
 	if !done {
@@ -590,18 +561,19 @@ func DeleteOldFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 			values.Add("c", cur.String())
 			taskqueue.Add(c, taskqueue.NewPOSTTask("/tasks/delete-old-feeds", values), "")
 		} else {
-			c.Errorf("err: %v", err)
+			log.Errorf(c, "err: %v", err)
 		}
 	}
 }
 
 func DeleteOldFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
-	ctx := appengine.Timeout(c, time.Minute)
+	ctx, cf := context.WithTimeout(c, time.Minute)
+	defer cf()
 	g := goon.FromContext(ctx)
 	oldDate := time.Now().Add(-time.Hour * 24 * 90)
 	feed := Feed{Url: r.FormValue("f")}
 	if err := g.Get(&feed); err != nil {
-		c.Criticalf("err: %v", err)
+		log.Criticalf(c, "err: %v", err)
 		return
 	}
 	if feed.LastViewed.After(oldDate) {
@@ -610,26 +582,26 @@ func DeleteOldFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	q := datastore.NewQuery(g.Kind(&Story{})).Ancestor(g.Key(&feed)).KeysOnly()
 	keys, err := q.GetAll(ctx, nil)
 	if err != nil {
-		c.Criticalf("err: %v", err)
+		log.Criticalf(c, "err: %v", err)
 		return
 	}
 	q = datastore.NewQuery(g.Kind(&StoryContent{})).Ancestor(g.Key(&feed)).KeysOnly()
 	sckeys, err := q.GetAll(ctx, nil)
 	if err != nil {
-		c.Criticalf("err: %v", err)
+		log.Criticalf(c, "err: %v", err)
 		return
 	}
 	keys = append(keys, sckeys...)
-	c.Infof("delete: %v - %v", feed.Url, len(keys))
+	log.Infof(c, "delete: %v - %v", feed.Url, len(keys))
 	feed.NextUpdate = timeMax.Add(time.Hour)
 	if _, err := g.Put(&feed); err != nil {
-		c.Criticalf("put err: %v", err)
+		log.Criticalf(c, "put err: %v", err)
 	}
 	if len(keys) == 0 {
 		return
 	}
 	err = g.DeleteMulti(keys)
 	if err != nil {
-		c.Criticalf("err: %v", err)
+		log.Criticalf(c, "err: %v", err)
 	}
 }
diff --git a/types.go b/types.go
index 0409df5f..11b965e2 100644
--- a/types.go
+++ b/types.go
@@ -27,10 +27,12 @@ import (
 
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
-	"appengine"
-	"appengine/datastore"
-	"appengine/taskqueue"
-	"appengine/user"
+	"golang.org/x/net/context"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/taskqueue"
+	"google.golang.org/appengine/v2/user"
 )
 
 type User struct {
@@ -100,7 +102,7 @@ type UserStar struct {
 	Created time.Time      `datastore:"c"`
 }
 
-func starKey(c appengine.Context, feed, story string) *UserStar {
+func starKey(c context.Context, feed, story string) *UserStar {
 	cu := user.Current(c)
 	gn := goon.FromContext(c)
 	u := User{Id: cu.ID}
@@ -140,21 +142,16 @@ type Feed struct {
 	NoAds      bool          `datastore:"o,noindex" json:"-"`
 }
 
-func (f *Feed) Subscribe(c appengine.Context) {
+func (f *Feed) Subscribe(c context.Context) {
 	if !f.IsSubscribed() {
-		gn := goon.FromContext(c)
-		gn.Put(&Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   fmt.Sprintf("Subscribe %v", f.Subscribed.String()),
-		})
+		log.Infof(c, "Subscribe %v", f.Subscribed.String())
 		t := taskqueue.NewPOSTTask(routeUrl("subscribe-feed"), url.Values{
 			"feed": {f.Url},
 		})
 		if _, err := taskqueue.Add(c, t, "update-manual"); err != nil {
-			c.Errorf("taskqueue error: %v", err.Error())
+			log.Errorf(c, "taskqueue error: %v", err.Error())
 		} else {
-			c.Warningf("subscribe feed: %v", f.Url)
+			log.Warningf(c, "subscribe feed: %v", f.Url)
 		}
 	}
 }
diff --git a/user.go b/user.go
index fd4063e2..4796e199 100644
--- a/user.go
+++ b/user.go
@@ -33,17 +33,20 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/mjibson/goread/_third_party/code.google.com/p/go-charset/charset"
 	_ "github.com/mjibson/goread/_third_party/code.google.com/p/go-charset/data"
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 	"github.com/mjibson/goread/sanitizer"
 
-	"appengine"
-	"appengine/blobstore"
-	"appengine/datastore"
-	"appengine/taskqueue"
-	"appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/blobstore"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/taskqueue"
+	"google.golang.org/appengine/v2/user"
 )
 
 func LoginGoogle(c mpg.Context, w http.ResponseWriter, r *http.Request) {
@@ -155,7 +158,7 @@ func ImportOpml(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	if err := d.Decode(&opml); err != nil {
 		del()
 		serveError(w, err)
-		c.Errorf("opml error: %v", err.Error())
+		log.Errorf(c, "opml error: %v", err.Error())
 		return
 	}
 
@@ -176,7 +179,7 @@ func AddSubscription(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		},
 	}
 	if err := addFeed(c, cu.ID, o); err != nil {
-		c.Errorf("add sub error (%s): %s", url, err.Error())
+		log.Errorf(c, "add sub error (%s): %s", url, err.Error())
 		serveError(w, err)
 		return
 	}
@@ -185,15 +188,11 @@ func AddSubscription(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	ud := UserData{Id: "data", Parent: gn.Key(&User{Id: cu.ID})}
 	gn.Get(&ud)
 	if err := mergeUserOpml(c, &ud, o); err != nil {
-		c.Errorf("add sub error opml (%v): %v", url, err)
+		log.Errorf(c, "add sub error opml (%v): %v", url, err)
 		serveError(w, err)
 		return
 	}
-	gn.PutMulti([]interface{}{&ud, &Log{
-		Parent: ud.Parent,
-		Id:     time.Now().UnixNano(),
-		Text:   fmt.Sprintf("add sub: %v", url),
-	}})
+	log.Infof(c, "add sub: %v", url)
 	if r.Method == "GET" {
 		http.Redirect(w, r, routeUrl("main"), http.StatusFound)
 	}
@@ -213,12 +212,8 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		serveError(w, err)
 		return
 	}
-	l := &Log{
-		Parent: ud.Parent,
-		Id:     time.Now().UnixNano(),
-		Text:   "list feeds",
-	}
-	l.Text += fmt.Sprintf(", len opml %v", len(ud.Opml))
+	l := "list feeds"
+	l += fmt.Sprintf(", len opml %v", len(ud.Opml))
 	putU := false
 	putUD := false
 	fixRead := false
@@ -226,7 +221,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		u.Read = time.Now().Add(-oldDuration)
 		putU = true
 		fixRead = true
-		l.Text += ", u.Read"
+		l += ", u.Read"
 	}
 	trialRemaining := 0
 	if STRIPE_KEY != "" && ud.Opml != nil && u.Account == AFree && u.Until.Before(time.Now()) {
@@ -254,7 +249,9 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	opmlMap := make(map[string]*OpmlOutline)
 	var merr error
 	c.Step("fetch feeds", func(c mpg.Context) {
-		gn := goon.FromContext(appengine.Timeout(c, time.Minute))
+		ctx, cf := context.WithTimeout(c, time.Minute)
+		defer cf()
+		gn := goon.FromContext(ctx)
 		for _, outline := range uf.Outline {
 			if outline.XmlUrl == "" {
 				for _, so := range outline.Outline {
@@ -290,7 +287,9 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 				c.Step(f.Title, func(c mpg.Context) {
 					defer wg.Done()
 					var stories []*Story
-					gn := goon.FromContext(appengine.Timeout(c, time.Minute))
+					ctx, cf := context.WithTimeout(c, time.Minute)
+					defer cf()
+					gn := goon.FromContext(ctx)
 
 					if !f.Date.Before(u.Read) {
 						fk := gn.Key(f)
@@ -306,7 +305,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 						gn.GetMulti(stories)
 					}
 					if f.Link != opmlMap[f.Url].HtmlUrl {
-						l.Text += fmt.Sprintf(", link: %v -> %v", opmlMap[f.Url].HtmlUrl, f.Link)
+						l += fmt.Sprintf(", link: %v -> %v", opmlMap[f.Url].HtmlUrl, f.Link)
 						updatedLinks = true
 						opmlMap[f.Url].HtmlUrl = f.Link
 					}
@@ -408,7 +407,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 				gob.NewEncoder(&b).Encode(&read)
 				ud.Read = b.Bytes()
 				putUD = true
-				l.Text += ", fix read"
+				l += ", fix read"
 			}
 		})
 	}
@@ -424,7 +423,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		fl[k] = newStories
 	}
 	if numStories == 0 {
-		l.Text += ", clear read"
+		l += ", clear read"
 		fixRead = false
 		if ud.Read != nil {
 			putUD = true
@@ -436,7 +435,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 				last = v.Date
 			}
 		}
-		c.Infof("nothing here, move up: %v -> %v", u.Read, last)
+		log.Infof(c, "nothing here, move up: %v -> %v", u.Read, last)
 		if u.Read.Before(last) {
 			putU = true
 			u.Read = last
@@ -447,21 +446,21 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		if o, err := json.Marshal(&uf); err == nil {
 			ud.Opml = o
 			putUD = true
-			l.Text += ", update links"
+			l += ", update links"
 		} else {
-			c.Errorf("json UL err: %v, %v", err, uf)
+			log.Errorf(c, "json UL err: %v, %v", err, uf)
 		}
 	}
 	if putU {
 		gn.Put(u)
-		l.Text += ", putU"
+		l += ", putU"
 	}
 	if putUD {
 		gn.Put(ud)
-		l.Text += ", putUD"
+		l += ", putUD"
 	}
-	l.Text += fmt.Sprintf(", len opml %v", len(ud.Opml))
-	gn.Put(l)
+	l += fmt.Sprintf(", len opml %v", len(ud.Opml))
+	log.Infof(c, l)
 	c.Step("json marshal", func(c mpg.Context) {
 		gn := goon.FromContext(c)
 		o := struct {
@@ -485,13 +484,13 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		}
 		b, err := json.Marshal(o)
 		if err != nil {
-			c.Errorf("cleaning")
+			log.Errorf(c, "cleaning")
 			for _, v := range fl {
 				for _, s := range v {
 					n := sanitizer.CleanNonUTF8(s.Summary)
 					if n != s.Summary {
 						s.Summary = n
-						c.Errorf("cleaned %v", s.Id)
+						log.Errorf(c, "cleaned %v", s.Id)
 						gn.Put(s)
 					}
 				}
@@ -645,21 +644,17 @@ func UploadOpml(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	ud := UserData{Id: "data", Parent: gn.Key(&u)}
 	if err := gn.Get(&ud); err != nil {
 		serveError(w, err)
-		c.Errorf("get err: %v", err)
+		log.Errorf(c, "get err: %v", err)
 		return
 	}
 	if b, err := json.Marshal(&opml); err != nil {
 		serveError(w, err)
-		c.Errorf("json err: %v", err)
+		log.Errorf(c, "json err: %v", err)
 		return
 	} else {
-		l := Log{
-			Parent: ud.Parent,
-			Id:     time.Now().UnixNano(),
-			Text:   fmt.Sprintf("upload opml: %v -> %v", len(ud.Opml), len(b)),
-		}
+		log.Infof(c, "upload opml: %v -> %v", len(ud.Opml), len(b))
 		ud.Opml = b
-		if _, err := gn.PutMulti([]interface{}{&ud, &l}); err != nil {
+		if _, err := gn.Put(&ud); err != nil {
 			serveError(w, err)
 			return
 		}
@@ -682,7 +677,7 @@ func backupOPML(c mpg.Context) {
 		gz.Close()
 		uo.Compressed = buf.Bytes()
 	} else {
-		c.Errorf("gz err: %v", err)
+		log.Errorf(c, "gz err: %v", err)
 		uo.Opml = ud.Opml
 	}
 	gn.Put(&uo)
@@ -727,11 +722,8 @@ func SaveOptions(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 			return nil
 		}
 		u.Options = r.FormValue("options")
-		_, err := gn.PutMulti([]interface{}{&u, &Log{
-			Parent: gn.Key(&u),
-			Id:     time.Now().UnixNano(),
-			Text:   fmt.Sprintf("save options: %v", len(u.Options)),
-		}})
+		_, err := gn.Put(&u)
+		log.Infof(c, "save options: %v", len(u.Options))
 		return err
 	}, nil)
 }
@@ -798,7 +790,7 @@ func GetFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 
 func DeleteAccount(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	if _, err := doUncheckout(c); err != nil {
-		c.Errorf("uncheckout err: %v", err)
+		log.Errorf(c, "uncheckout err: %v", err)
 	}
 	cu := user.Current(c)
 	gn := goon.FromContext(c)
@@ -833,7 +825,7 @@ func SetStar(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		us.Created = time.Now()
 		_, err := gn.Put(us)
 		if err != nil {
-			c.Errorf("star put err: %v", err)
+			log.Errorf(c, "star put err: %v", err)
 			serveError(w, err)
 		}
 	}
diff --git a/utils.go b/utils.go
index 7e600def..4993b0e5 100644
--- a/utils.go
+++ b/utils.go
@@ -42,13 +42,25 @@ import (
 	"github.com/mjibson/goread/rss"
 	"github.com/mjibson/goread/sanitizer"
 
-	"appengine"
-	"appengine/memcache"
-	"appengine/taskqueue"
-	"appengine/urlfetch"
-	"appengine/user"
+	"golang.org/x/net/context"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/taskqueue"
+	"google.golang.org/appengine/v2/urlfetch"
+	"google.golang.org/appengine/v2/user"
 )
 
+func createHttpClient(c context.Context, t time.Duration) (*http.Client, context.CancelFunc) {
+	c1, cf := context.WithTimeout(c, t)
+	cl := &http.Client{
+		Transport: &urlfetch.Transport{
+			Context: c1,
+		},
+	}
+	return cl, cf
+}
+
 func serveError(w http.ResponseWriter, err error) {
 	http.Error(w, err.Error(), http.StatusInternalServerError)
 }
@@ -334,7 +346,7 @@ var dateFormats = []string{
 
 const dateFormatCount = 500
 
-func parseDate(c appengine.Context, feed *Feed, ds ...string) (t time.Time, err error) {
+func parseDate(c context.Context, feed *Feed, ds ...string) (t time.Time, err error) {
 	for _, d := range ds {
 		d = strings.TrimSpace(d)
 		if d == "" {
@@ -388,7 +400,7 @@ func nilCharsetReader(cs string, input io.Reader) (io.Reader, error) {
 	return input, nil
 }
 
-func ParseFeed(c appengine.Context, contentType, origUrl, fetchUrl string, body []byte) (*Feed, []*Story, error) {
+func ParseFeed(c context.Context, contentType, origUrl, fetchUrl string, body []byte) (*Feed, []*Story, error) {
 	cr := defaultCharsetReader
 	if !bytes.EqualFold(body[:len(xml.Header)], []byte(xml.Header)) {
 		enc, err := encodingReader(body, contentType)
@@ -414,16 +426,16 @@ func ParseFeed(c appengine.Context, contentType, origUrl, fetchUrl string, body
 		feed, stories, rdferr = parseRDF(c, body, cr)
 	}
 	if feed == nil {
-		c.Warningf("atom parse error: %s", atomerr.Error())
-		c.Warningf("xml parse error: %s", rsserr.Error())
-		c.Warningf("rdf parse error: %s", rdferr.Error())
+		log.Warningf(c, "atom parse error: %s", atomerr.Error())
+		log.Warningf(c, "xml parse error: %s", rsserr.Error())
+		log.Warningf(c, "rdf parse error: %s", rdferr.Error())
 		return nil, nil, fmt.Errorf("Could not parse feed data")
 	}
 	feed.Url = origUrl
 	return parseFix(c, feed, stories, fetchUrl)
 }
 
-func parseAtom(c appengine.Context, body []byte, charsetReader func(string, io.Reader) (io.Reader, error)) (*Feed, []*Story, error) {
+func parseAtom(c context.Context, body []byte, charsetReader func(string, io.Reader) (io.Reader, error)) (*Feed, []*Story, error) {
 	var f Feed
 	var s []*Story
 	var err error
@@ -492,7 +504,7 @@ func parseAtom(c appengine.Context, body []byte, charsetReader func(string, io.R
 	return &f, s, nil
 }
 
-func parseRSS(c appengine.Context, body []byte, charsetReader func(string, io.Reader) (io.Reader, error)) (*Feed, []*Story, error) {
+func parseRSS(c context.Context, body []byte, charsetReader func(string, io.Reader) (io.Reader, error)) (*Feed, []*Story, error) {
 	var f Feed
 	var s []*Story
 	r := rss.Rss{}
@@ -506,7 +518,7 @@ func parseRSS(c appengine.Context, body []byte, charsetReader func(string, io.Re
 	if t, err := parseDate(c, &f, r.LastBuildDate, r.PubDate); err == nil {
 		f.Updated = t
 	} else {
-		c.Warningf("no rss feed date: %v", f.Link)
+		log.Warningf(c, "no rss feed date: %v", f.Link)
 	}
 	f.Link = r.BaseLink()
 	f.Hub = r.Hub()
@@ -548,7 +560,7 @@ func parseRSS(c appengine.Context, body []byte, charsetReader func(string, io.Re
 	return &f, s, nil
 }
 
-func parseRDF(c appengine.Context, body []byte, charsetReader func(string, io.Reader) (io.Reader, error)) (*Feed, []*Story, error) {
+func parseRDF(c context.Context, body []byte, charsetReader func(string, io.Reader) (io.Reader, error)) (*Feed, []*Story, error) {
 	var f Feed
 	var s []*Story
 	rd := rdf.RDF{}
@@ -600,7 +612,7 @@ func atomTitle(t *atom.Text) string {
 	return textTitle(t.Body)
 }
 
-func findBestAtomLink(c appengine.Context, links []atom.Link) string {
+func findBestAtomLink(c context.Context, links []atom.Link) string {
 	getScore := func(l atom.Link) int {
 		switch {
 		case l.Rel == "hub":
@@ -631,7 +643,7 @@ func findBestAtomLink(c appengine.Context, links []atom.Link) string {
 	return bestlink
 }
 
-func parseFix(c appengine.Context, f *Feed, ss []*Story, fetchUrl string) (*Feed, []*Story, error) {
+func parseFix(c context.Context, f *Feed, ss []*Story, fetchUrl string) (*Feed, []*Story, error) {
 	g := goon.FromContext(c)
 	f.Checked = time.Now()
 	fk := g.Key(f)
@@ -645,7 +657,7 @@ func parseFix(c appengine.Context, f *Feed, ss []*Story, fetchUrl string) (*Feed
 	}
 	base, err := url.Parse(f.Link)
 	if err != nil {
-		c.Warningf("unable to parse link: %v", f.Link)
+		log.Warningf(c, "unable to parse link: %v", f.Link)
 	}
 
 	var nss []*Story
@@ -670,7 +682,7 @@ func parseFix(c appengine.Context, f *Feed, ss []*Story, fetchUrl string) (*Feed
 			} else if s.Title != "" {
 				s.Id = s.Title
 			} else {
-				c.Errorf("story has no id: %v", s)
+				log.Errorf(c, "story has no id: %v", s)
 				continue
 			}
 		}
@@ -688,13 +700,13 @@ func parseFix(c appengine.Context, f *Feed, ss []*Story, fetchUrl string) (*Feed
 			if err == nil {
 				s.Link = link.String()
 			} else {
-				c.Warningf("unable to resolve link: %v", s.Link)
+				log.Warningf(c, "unable to resolve link: %v", s.Link)
 			}
 		}
 		const keySize = 500
 		sk := g.Key(s)
 		if kl := len(sk.String()); kl > keySize {
-			c.Warningf("key too long: %v, %v, %v", kl, f.Url, s.Id)
+			log.Warningf(c, "key too long: %v, %v, %v", kl, f.Url, s.Id)
 			continue
 		}
 		su, serr := url.Parse(s.Link)
@@ -711,7 +723,7 @@ func parseFix(c appengine.Context, f *Feed, ss []*Story, fetchUrl string) (*Feed
 	return f, nss, nil
 }
 
-func loadImage(c appengine.Context, f *Feed) {
+func loadImage(c context.Context, f *Feed) {
 	if f.ImageDate.After(time.Now()) {
 		return
 	}
@@ -770,7 +782,7 @@ const notViewedDisabled = oldDuration + time.Hour*24*7
 
 var timeMax time.Time = time.Date(3000, time.January, 1, 0, 0, 0, 0, time.UTC)
 
-func scheduleNextUpdate(c appengine.Context, f *Feed) {
+func scheduleNextUpdate(c context.Context, f *Feed) {
 	loadImage(c, f)
 	if f.NotViewed() {
 		f.NextUpdate = timeMax
@@ -822,7 +834,7 @@ func taskSender(c mpg.Context, queue string, tc chan *taskqueue.Task, done chan
 	tasks := make([]*taskqueue.Task, 0, taskLimit)
 	send := func() {
 		taskqueue.AddMulti(c, tasks, queue)
-		c.Infof("added %v tasks", len(tasks))
+		log.Infof(c, "added %v tasks", len(tasks))
 		tasks = tasks[0:0]
 	}
 	for t := range tc {