diff --git a/cmd/writeas/api.go b/cmd/writeas/api.go
index 230b3c8..670dba2 100644
--- a/cmd/writeas/api.go
+++ b/cmd/writeas/api.go
@@ -1,225 +1,219 @@
 package main
 
 import (
 	"fmt"
 	"github.com/atotto/clipboard"
 	"github.com/writeas/web-core/posts"
 	"github.com/writeas/writeas-cli/fileutils"
 	"go.code.as/writeas.v2"
 	"gopkg.in/urfave/cli.v1"
 	"path/filepath"
 )
 
 const (
 	defaultUserAgent = "writeas-cli v" + version
 )
 
 func client(userAgent string, tor bool) *writeas.Client {
 	var client *writeas.Client
 	if tor {
 		client = writeas.NewTorClient(torPort)
 	} else {
 		if isDev() {
 			client = writeas.NewDevClient()
 		} else {
 			client = writeas.NewClient()
 		}
 	}
 	client.UserAgent = userAgent
 
 	return client
 }
 
 func newClient(c *cli.Context, authRequired bool) (*writeas.Client, error) {
 	var client *writeas.Client
 	if isTor(c) {
 		client = writeas.NewTorClient(torPort)
 	} else {
 		if isDev() {
 			client = writeas.NewDevClient()
 		} else {
 			client = writeas.NewClient()
 		}
 	}
 	client.UserAgent = userAgent(c)
 	// TODO: load user into var shared across the app
 	u, _ := loadUser()
 	if u != nil {
 		client.SetToken(u.AccessToken)
 	} else if authRequired {
 		return nil, fmt.Errorf("Not currently logged in. Authenticate with: writeas auth <username>")
 	}
 
 	return client, nil
 }
 
 // DoFetch retrieves the Write.as post with the given friendlyID,
 // optionally via the Tor hidden service.
 func DoFetch(friendlyID, ua string, tor bool) error {
 	cl := client(ua, tor)
 
 	p, err := cl.GetPost(friendlyID)
 	if err != nil {
 		return err
 	}
 
 	if p.Title != "" {
 		fmt.Printf("# %s\n\n", string(p.Title))
 	}
 	fmt.Printf("%s\n", string(p.Content))
 	return nil
 }
 
 // DoPost creates a Write.as post, returning an error if it was
 // unsuccessful.
 func DoPost(c *cli.Context, post []byte, font string, encrypt, tor, code bool) (*writeas.Post, error) {
 	cl, _ := newClient(c, false)
 
 	pp := &writeas.PostParams{
 		Font:       getFont(code, font),
 		Collection: collection(c),
 	}
 	pp.Title, pp.Content = posts.ExtractTitle(string(post))
 	if lang := language(c, true); lang != "" {
 		pp.Language = &lang
 	}
 	p, err := cl.CreatePost(pp)
 	if err != nil {
 		return nil, fmt.Errorf("Unable to post: %v", err)
 	}
 
 	var url string
 	if p.Collection != nil {
 		url = p.Collection.URL + p.Slug
 	} else {
 		if tor {
 			url = torBaseURL
 		} else if isDev() {
 			url = devBaseURL
 		} else {
 			url = writeasBaseURL
 		}
 		url += "/" + p.ID
 		// Output URL in requested format
 		if c.Bool("md") {
 			url += ".md"
 		}
 	}
 
 	if cl.Token() == "" {
 		// Store post locally, since we're not authenticated
 		addPost(p.ID, p.Token)
 	}
 
 	// Copy URL to clipboard
 	err = clipboard.WriteAll(string(url))
 	if err != nil {
 		Errorln("writeas: Didn't copy to clipboard: %s", err)
 	} else {
 		Info(c, "Copied to clipboard.")
 	}
 
 	// Output URL
 	fmt.Printf("%s\n", url)
 
 	return p, nil
 }
 
 // DoUpdate updates the given post on Write.as.
 func DoUpdate(c *cli.Context, post []byte, friendlyID, token, font string, tor, code bool) error {
 	cl, _ := newClient(c, false)
 
-	params := writeas.PostParams{
-		ID:    friendlyID,
-		Token: token,
-	}
+	params := writeas.PostParams{}
 	params.Title, params.Content = posts.ExtractTitle(string(post))
 	if lang := language(c, false); lang != "" {
 		params.Language = &lang
 	}
 	if code || font != "" {
 		params.Font = getFont(code, font)
 	}
 
-	_, err := cl.UpdatePost(&params)
+	_, err := cl.UpdatePost(friendlyID, token, &params)
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem updating: %v", err)
 		}
 		return fmt.Errorf("Post doesn't exist, or bad edit token given.")
 	}
 
 	if tor {
 		Info(c, "Post updated via hidden service.")
 	} else {
 		Info(c, "Post updated.")
 	}
 	return nil
 }
 
 // DoDelete deletes the given post on Write.as.
 func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error {
 	cl, _ := newClient(c, false)
 
-	err := cl.DeletePost(&writeas.PostParams{
-		ID:    friendlyID,
-		Token: token,
-	})
+	err := cl.DeletePost(friendlyID, token)
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem deleting: %v", err)
 		}
 		return fmt.Errorf("Post doesn't exist, or bad edit token given.")
 	}
 
 	if tor {
 		Info(c, "Post deleted from hidden service.")
 	} else {
 		Info(c, "Post deleted.")
 	}
 	removePost(friendlyID)
 
 	return nil
 }
 
 func DoLogIn(c *cli.Context, username, password string) error {
 	cl := client(userAgent(c), isTor(c))
 
 	u, err := cl.LogIn(username, password)
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem logging in: %v", err)
 		}
 		return err
 	}
 
 	err = saveUser(u)
 	if err != nil {
 		return err
 	}
 	fmt.Printf("Logged in as %s.\n", u.User.Username)
 	return nil
 }
 
 func DoLogOut(c *cli.Context) error {
 	cl, err := newClient(c, true)
 	if err != nil {
 		return err
 	}
 
 	err = cl.LogOut()
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem logging out: %v", err)
 		}
 		return err
 	}
 
 	// Delete local user data
 	err = fileutils.DeleteFile(filepath.Join(userDataDir(), userFile))
 	if err != nil {
 		return err
 	}
 
 	return nil
 }