diff --git a/api/api.go b/api/api.go
index 4540182..f4999b1 100644
--- a/api/api.go
+++ b/api/api.go
@@ -1,288 +1,296 @@
 package api
 
 import (
 	"fmt"
 
 	"github.com/atotto/clipboard"
 	writeas "github.com/writeas/go-writeas/v2"
 	"github.com/writeas/web-core/posts"
 	"github.com/writeas/writeas-cli/config"
 	"github.com/writeas/writeas-cli/log"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 func client(c *cli.Context, userAgent string, tor bool) (*writeas.Client, error) {
 	var client *writeas.Client
 	var clientConfig writeas.Config
 	cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	if err != nil {
 		return nil, fmt.Errorf("Failed to load configuration file: %v", err)
 	}
 	if c.GlobalString("host") != "" {
 		clientConfig.URL = c.GlobalString("host") + "/api"
 	} else if cfg.Default.Host != "" {
 		clientConfig.URL = cfg.Default.Host + "/api"
 	} else if config.IsDev() {
 		clientConfig.URL = config.DevBaseURL + "/api"
 	} else {
 		clientConfig.URL = config.WriteasBaseURL + "/api"
 	}
 	if tor {
 		clientConfig.URL = config.TorBaseURL
 		clientConfig.TorPort = TorPort
 	}
 
 	client = writeas.NewClientWith(clientConfig)
 	client.UserAgent = userAgent
 
 	return client, nil
 }
 
 func NewClient(c *cli.Context, authRequired bool) (*writeas.Client, error) {
 	var client *writeas.Client
 	var clientConfig writeas.Config
 	cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	if err != nil {
 		return nil, fmt.Errorf("Failed to load configuration file: %v", err)
 	}
 	if c.GlobalString("host") != "" {
 		clientConfig.URL = c.GlobalString("host") + "/api"
 	} else if cfg.Default.Host != "" {
 		clientConfig.URL = cfg.Default.Host + "/api"
 	} else if config.IsDev() {
 		clientConfig.URL = config.DevBaseURL + "/api"
 	} else {
 		clientConfig.URL = config.WriteasBaseURL + "/api"
 	}
 	if config.IsTor(c) {
 		clientConfig.URL = config.TorBaseURL
 		clientConfig.TorPort = TorPort
 	}
 
 	client = writeas.NewClientWith(clientConfig)
 	client.UserAgent = config.UserAgent(c)
 	// TODO: load user into var shared across the app
 	u, _ := config.LoadUser(c)
 	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(c *cli.Context, friendlyID, ua string, tor bool) error {
 	cl, err := client(c, ua, tor)
 	if err != nil {
 		return err
 	}
 
 	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
 }
 
 // DoFetchPosts retrieves all remote posts for the
 // authenticated user
 func DoFetchPosts(c *cli.Context) ([]writeas.Post, error) {
 	cl, err := NewClient(c, true)
 	if err != nil {
 		return nil, err
 	}
 
 	posts, err := cl.GetUserPosts()
 	if err != nil {
 		return nil, err
 	}
 
 	return *posts, 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:       config.GetFont(code, font),
 		Collection: config.Collection(c),
 	}
 	pp.Title, pp.Content = posts.ExtractTitle(string(post))
 	if lang := config.Language(c, true); lang != "" {
 		pp.Language = &lang
 	}
 	p, err := cl.CreatePost(pp)
 	if err != nil {
 		return nil, fmt.Errorf("Unable to post: %v", err)
 	}
 
+	cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+	if err != nil {
+		return nil, fmt.Errorf("Couldn't check for config file: %v", err)
+	}
 	var url string
 	if p.Collection != nil {
 		url = p.Collection.URL + p.Slug
 	} else {
-		if tor {
-			url = config.TorBaseURL
+		if c.GlobalString("host") != "" {
+			url = c.GlobalString("host")
+		} else if cfg.Default.Host != "" {
+			url = cfg.Default.Host
 		} else if config.IsDev() {
 			url = config.DevBaseURL
+		} else if tor {
+			url = config.TorBaseURL
 		} else {
 			url = config.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(c, p.ID, p.Token)
 	}
 
 	// Copy URL to clipboard
 	err = clipboard.WriteAll(string(url))
 	if err != nil {
 		log.Errorln("writeas: Didn't copy to clipboard: %s", err)
 	} else {
 		log.Info(c, "Copied to clipboard.")
 	}
 
 	// Output URL
 	fmt.Printf("%s\n", url)
 
 	return p, nil
 }
 
 // DoFetchCollections retrieves a list of the currently logged in users
 // collections.
 func DoFetchCollections(c *cli.Context) ([]RemoteColl, error) {
 	cl, err := NewClient(c, true)
 	if err != nil {
 		if config.Debug() {
 			log.ErrorlnQuit("could not create new client: %v", err)
 		}
 		return nil, fmt.Errorf("Couldn't create new client")
 	}
 
 	colls, err := cl.GetUserCollections()
 	if err != nil {
 		if config.Debug() {
 			log.ErrorlnQuit("failed fetching user collections: %v", err)
 		}
 		return nil, fmt.Errorf("Couldn't get user collections")
 	}
 
 	out := make([]RemoteColl, len(*colls))
 
 	for i, c := range *colls {
 		coll := RemoteColl{
 			Alias: c.Alias,
 			Title: c.Title,
 			URL:   c.URL,
 		}
 		out[i] = coll
 	}
 
 	return out, 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{}
 	params.Title, params.Content = posts.ExtractTitle(string(post))
 	if lang := config.Language(c, false); lang != "" {
 		params.Language = &lang
 	}
 	if code || font != "" {
 		params.Font = config.GetFont(code, font)
 	}
 
 	_, err := cl.UpdatePost(friendlyID, token, &params)
 	if err != nil {
 		if config.Debug() {
 			log.ErrorlnQuit("Problem updating: %v", err)
 		}
 		return fmt.Errorf("Post doesn't exist, or bad edit token given.")
 	}
 
 	if tor {
 		log.Info(c, "Post updated via hidden service.")
 	} else {
 		log.Info(c, "Post updated.")
 	}
 	return nil
 }
 
 // DoDelete deletes the given post on Write.as, and removes any local references
 func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error {
 	cl, _ := NewClient(c, false)
 
 	err := cl.DeletePost(friendlyID, token)
 	if err != nil {
 		if config.Debug() {
 			log.ErrorlnQuit("Problem deleting: %v", err)
 		}
 		return fmt.Errorf("Post doesn't exist, or bad edit token given.")
 	}
 
 	if tor {
 		log.Info(c, "Post deleted from hidden service.")
 	} else {
 		log.Info(c, "Post deleted.")
 	}
-	RemovePost(c.App.ExtraInfo()["configDir"], friendlyID)
+	RemovePost(c, friendlyID)
 
 	return nil
 }
 
 func DoLogIn(c *cli.Context, username, password string) error {
 	cl, err := client(c, config.UserAgent(c), config.IsTor(c))
 	if err != nil {
 		return err
 	}
 
 	u, err := cl.LogIn(username, password)
 	if err != nil {
 		if config.Debug() {
 			log.ErrorlnQuit("Problem logging in: %v", err)
 		}
 		return err
 	}
 
 	err = config.SaveUser(c, u)
 	if err != nil {
 		return err
 	}
 	log.Info(c, "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 config.Debug() {
 			log.ErrorlnQuit("Problem logging out: %v", err)
 		}
 		return err
 	}
 
 	// delete local user file
 	return config.DeleteUser(c)
 }
diff --git a/api/posts.go b/api/posts.go
index 379a2c6..cef808f 100644
--- a/api/posts.go
+++ b/api/posts.go
@@ -1,304 +1,312 @@
 package api
 
 import (
 	"bufio"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
 	writeas "github.com/writeas/go-writeas/v2"
 	"github.com/writeas/writeas-cli/config"
 	"github.com/writeas/writeas-cli/fileutils"
 	"github.com/writeas/writeas-cli/log"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 const (
 	postsFile = "posts.psv"
 	separator = `|`
 )
 
 // Post holds the basic authentication information for a Write.as post.
 type Post struct {
 	ID        string
 	EditToken string
 }
 
 // RemotePost holds addition information about published
 // posts
 type RemotePost struct {
 	Post
 	Title,
 	Excerpt,
 	Slug,
 	Collection,
 	EditToken string
 	Synced  bool
 	Updated time.Time
 }
 
 func AddPost(c *cli.Context, id, token string) error {
-	f, err := os.OpenFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600)
+	hostDir, err := config.HostDirectory(c)
+	if err != nil {
+		return fmt.Errorf("Error checking for host directory: %v", err)
+	}
+	f, err := os.OpenFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), hostDir, postsFile), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600)
 	if err != nil {
 		return fmt.Errorf("Error creating local posts list: %s", err)
 	}
 	defer f.Close()
 
 	l := fmt.Sprintf("%s%s%s\n", id, separator, token)
 
 	if _, err = f.WriteString(l); err != nil {
 		return fmt.Errorf("Error writing to local posts list: %s", err)
 	}
 
 	return nil
 }
 
 // ClaimPost adds a local post to the authenticated user's account and deletes
 // the local reference
 func ClaimPosts(c *cli.Context, localPosts *[]Post) (*[]writeas.ClaimPostResult, error) {
 	cl, err := NewClient(c, true)
 	if err != nil {
 		return nil, err
 	}
 	postsToClaim := make([]writeas.OwnedPostParams, len(*localPosts))
 	for i, post := range *localPosts {
 		postsToClaim[i] = writeas.OwnedPostParams{
 			ID:    post.ID,
 			Token: post.EditToken,
 		}
 	}
 
 	return cl.ClaimPosts(&postsToClaim)
 }
 
 func TokenFromID(c *cli.Context, id string) string {
-	post := fileutils.FindLine(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile), id)
+	hostDir, _ := config.HostDirectory(c)
+	post := fileutils.FindLine(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), hostDir, postsFile), id)
 	if post == "" {
 		return ""
 	}
 
 	parts := strings.Split(post, separator)
 	if len(parts) < 2 {
 		return ""
 	}
 
 	return parts[1]
 }
 
-func RemovePost(path, id string) {
-	fileutils.RemoveLine(filepath.Join(config.UserDataDir(path), postsFile), id)
+func RemovePost(c *cli.Context, id string) {
+	hostDir, _ := config.HostDirectory(c)
+	fullPath := filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), hostDir, postsFile)
+	fileutils.RemoveLine(fullPath, id)
 }
 
 func GetPosts(c *cli.Context) *[]Post {
-	lines := fileutils.ReadData(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile))
+	hostDir, _ := config.HostDirectory(c)
+	lines := fileutils.ReadData(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), hostDir, postsFile))
 
 	posts := []Post{}
 
 	if lines != nil && len(*lines) > 0 {
 		parts := make([]string, 2)
 		for _, l := range *lines {
 			parts = strings.Split(l, separator)
 			if len(parts) < 2 {
 				continue
 			}
 			posts = append(posts, Post{ID: parts[0], EditToken: parts[1]})
 		}
 	}
 
 	return &posts
 }
 
 func GetUserPosts(c *cli.Context) ([]RemotePost, error) {
 	waposts, err := DoFetchPosts(c)
 	if err != nil {
 		return nil, err
 	}
 
 	if len(waposts) == 0 {
 		return nil, nil
 	}
 
 	posts := []RemotePost{}
 	for _, p := range waposts {
 		post := RemotePost{
 			Post: Post{
 				ID:        p.ID,
 				EditToken: p.Token,
 			},
 			Title:   p.Title,
 			Excerpt: getExcerpt(p.Content),
 			Slug:    p.Slug,
 			Synced:  p.Slug != "",
 			Updated: p.Updated,
 		}
 		if p.Collection != nil {
 			post.Collection = p.Collection.Alias
 		}
 		posts = append(posts, post)
 	}
 
 	return posts, nil
 }
 
 // getExcerpt takes in a content string and returns
 // a concatenated version. limited to no more than
 // two lines of 80 chars each. delimited by '...'
 func getExcerpt(input string) string {
 	length := len(input)
 
 	if length <= 80 {
 		return input
 	} else if length < 160 {
 		ln1, idx := trimToLength(input, 80)
 		if idx == -1 {
 			idx = 80
 		}
 		ln2, _ := trimToLength(input[idx:], 80)
 		return ln1 + "\n" + ln2
 	} else {
 		excerpt := input[:158]
 		ln1, idx := trimToLength(excerpt, 80)
 		if idx == -1 {
 			idx = 80
 		}
 		ln2, _ := trimToLength(excerpt[idx:], 80)
 		return ln1 + "\n" + ln2 + "..."
 	}
 }
 
 func trimToLength(in string, l int) (string, int) {
 	c := []rune(in)
 	spaceIdx := -1
 	length := len(c)
 	if length <= l {
 		return in, spaceIdx
 	}
 
 	for i := l; i > 0; i-- {
 		if c[i] == ' ' {
 			spaceIdx = i
 			break
 		}
 	}
 	if spaceIdx > -1 {
 		c = c[:spaceIdx]
 	}
 	return string(c), spaceIdx
 }
 
 func ComposeNewPost() (string, *[]byte) {
 	f, err := fileutils.TempFile(os.TempDir(), "WApost", "txt")
 	if err != nil {
 		if config.Debug() {
 			panic(err)
 		} else {
 			log.Errorln("Error creating temp file: %s", err)
 			return "", nil
 		}
 	}
 	f.Close()
 
 	cmd := config.EditPostCmd(f.Name())
 	if cmd == nil {
 		os.Remove(f.Name())
 
 		fmt.Println(config.NoEditorErr)
 		return "", nil
 	}
 	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	if err := cmd.Start(); err != nil {
 		os.Remove(f.Name())
 
 		if config.Debug() {
 			panic(err)
 		} else {
 			log.Errorln("Error starting editor: %s", err)
 			return "", nil
 		}
 	}
 
 	// If something fails past this point, the temporary post file won't be
 	// removed automatically. Calling function should handle this.
 	if err := cmd.Wait(); err != nil {
 		if config.Debug() {
 			panic(err)
 		} else {
 			log.Errorln("Editor finished with error: %s", err)
 			return "", nil
 		}
 	}
 
 	post, err := ioutil.ReadFile(f.Name())
 	if err != nil {
 		if config.Debug() {
 			panic(err)
 		} else {
 			log.Errorln("Error reading post: %s", err)
 			return "", nil
 		}
 	}
 	return f.Name(), &post
 }
 
 func WritePost(postsDir string, p *writeas.Post) error {
 	postFilename := p.ID
 	collDir := ""
 	if p.Collection != nil {
 		postFilename = p.Slug
 		collDir = p.Collection.Alias
 	}
 	postFilename += PostFileExt
 
 	txtFile := p.Content
 	if p.Title != "" {
 		txtFile = "# " + p.Title + "\n\n" + txtFile
 	}
 	return ioutil.WriteFile(filepath.Join(postsDir, collDir, postFilename), []byte(txtFile), 0644)
 }
 
 func HandlePost(fullPost []byte, c *cli.Context) (*writeas.Post, error) {
 	tor := config.IsTor(c)
 	if c.Int("tor-port") != 0 {
 		TorPort = c.Int("tor-port")
 	}
 	if tor {
 		log.Info(c, "Posting to hidden service...")
 	} else {
 		log.Info(c, "Posting...")
 	}
 
 	return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code"))
 }
 
 func ReadStdIn() []byte {
 	numBytes, numChunks := int64(0), int64(0)
 	r := bufio.NewReader(os.Stdin)
 	fullPost := []byte{}
 	buf := make([]byte, 0, 1024)
 	for {
 		n, err := r.Read(buf[:cap(buf)])
 		buf = buf[:n]
 		if n == 0 {
 			if err == nil {
 				continue
 			}
 			if err == io.EOF {
 				break
 			}
 			log.ErrorlnQuit("Error reading from stdin: %v", err)
 		}
 		numChunks++
 		numBytes += int64(len(buf))
 
 		fullPost = append(fullPost, buf...)
 		if err != nil && err != io.EOF {
 			log.ErrorlnQuit("Error appending to end of post: %v", err)
 		}
 	}
 
 	return fullPost
 }
diff --git a/commands/commands.go b/commands/commands.go
index 7e30f75..1c35003 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -1,361 +1,364 @@
 package commands
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"text/tabwriter"
 
 	"github.com/howeyc/gopass"
 	"github.com/writeas/writeas-cli/api"
 	"github.com/writeas/writeas-cli/config"
 	"github.com/writeas/writeas-cli/fileutils"
 	"github.com/writeas/writeas-cli/log"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 func CmdPost(c *cli.Context) error {
 	_, err := api.HandlePost(api.ReadStdIn(), c)
-	return err
+	if err != nil {
+		cli.NewExitError(fmt.Sprintf("Could not post: %v", err), 1)
+	}
+	return nil
 }
 
 func CmdNew(c *cli.Context) error {
 	fname, p := api.ComposeNewPost()
 	if p == nil {
 		// Assume composeNewPost already told us what the error was. Abort now.
 		os.Exit(1)
 	}
 
 	// Ensure we have something to post
 	if len(*p) == 0 {
 		// Clean up temporary post
 		if fname != "" {
 			os.Remove(fname)
 		}
 
 		log.InfolnQuit("Empty post. Bye!")
 	}
 
 	_, err := api.HandlePost(*p, c)
 	if err != nil {
 		log.Errorln("Error posting: %s\n%s", err, config.MessageRetryCompose(fname))
 		return cli.NewExitError("", 1)
 	}
 
 	// Clean up temporary post
 	if fname != "" {
 		os.Remove(fname)
 	}
 
 	return nil
 }
 
 func CmdPublish(c *cli.Context) error {
 	filename := c.Args().Get(0)
 	if filename == "" {
 		return cli.NewExitError("usage: writeas publish <filename>", 1)
 	}
 	content, err := ioutil.ReadFile(filename)
 	if err != nil {
 		return err
 	}
 	p, err := api.HandlePost(content, c)
 	if err != nil {
 		return err
 	}
 
 	// Save post to posts folder
 	cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	if cfg.Posts.Directory != "" {
 		err = api.WritePost(cfg.Posts.Directory, p)
 		if err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
 func CmdDelete(c *cli.Context) error {
 	friendlyID := c.Args().Get(0)
 	token := c.Args().Get(1)
 	if friendlyID == "" {
 		return cli.NewExitError("usage: writeas delete <postId> [<token>]", 1)
 	}
 
 	u, _ := config.LoadUser(c)
 	if token == "" {
 		// Search for the token locally
 		token = api.TokenFromID(c, friendlyID)
 		if token == "" && u == nil {
 			log.Errorln("Couldn't find an edit token locally. Did you create this post here?")
 			log.ErrorlnQuit("If you have an edit token, use: writeas delete %s <token>", friendlyID)
 		}
 	}
 
 	tor := config.IsTor(c)
 	if c.Int("tor-port") != 0 {
 		api.TorPort = c.Int("tor-port")
 	}
 	if tor {
 		log.Info(c, "Deleting via hidden service...")
 	} else {
 		log.Info(c, "Deleting...")
 	}
 
 	err := api.DoDelete(c, friendlyID, token, tor)
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("Couldn't delete remote copy: %v", err), 1)
 	}
 
 	// Delete local file, if necessary
 	cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	if cfg.Posts.Directory != "" {
 		// TODO: handle deleting blog posts
 		err = fileutils.DeleteFile(filepath.Join(cfg.Posts.Directory, friendlyID+api.PostFileExt))
 		if err != nil {
 			return cli.NewExitError(fmt.Sprintf("Couldn't delete local copy: %v", err), 1)
 		}
 	}
 
 	return nil
 }
 
 func CmdUpdate(c *cli.Context) error {
 	friendlyID := c.Args().Get(0)
 	token := c.Args().Get(1)
 	if friendlyID == "" {
 		return cli.NewExitError("usage: writeas update <postId> [<token>]", 1)
 	}
 
 	u, _ := config.LoadUser(c)
 	if token == "" {
 		// Search for the token locally
 		token = api.TokenFromID(c, friendlyID)
 		if token == "" && u == nil {
 			log.Errorln("Couldn't find an edit token locally. Did you create this post here?")
 			log.ErrorlnQuit("If you have an edit token, use: writeas update %s <token>", friendlyID)
 		}
 	}
 
 	// Read post body
 	fullPost := api.ReadStdIn()
 
 	tor := config.IsTor(c)
 	if c.Int("tor-port") != 0 {
 		api.TorPort = c.Int("tor-port")
 	}
 	if tor {
 		log.Info(c, "Updating via hidden service...")
 	} else {
 		log.Info(c, "Updating...")
 	}
 
 	return api.DoUpdate(c, fullPost, friendlyID, token, c.String("font"), tor, c.Bool("code"))
 }
 
 func CmdGet(c *cli.Context) error {
 	friendlyID := c.Args().Get(0)
 	if friendlyID == "" {
 		return cli.NewExitError("usage: writeas get <postId>", 1)
 	}
 
 	tor := config.IsTor(c)
 	if c.Int("tor-port") != 0 {
 		api.TorPort = c.Int("tor-port")
 	}
 	if tor {
 		log.Info(c, "Getting via hidden service...")
 	} else {
 		log.Info(c, "Getting...")
 	}
 
 	return api.DoFetch(c, friendlyID, config.UserAgent(c), tor)
 }
 
 func CmdAdd(c *cli.Context) error {
 	friendlyID := c.Args().Get(0)
 	token := c.Args().Get(1)
 	if friendlyID == "" || token == "" {
 		return cli.NewExitError("usage: writeas add <postId> <token>", 1)
 	}
 
 	err := api.AddPost(c, friendlyID, token)
 	return err
 }
 
 func CmdListPosts(c *cli.Context) error {
 	urls := c.Bool("url")
 	ids := c.Bool("id")
 
 	var p api.Post
 	posts := api.GetPosts(c)
 	tw := tabwriter.NewWriter(os.Stdout, 10, 0, 2, ' ', tabwriter.TabIndent)
 	numPosts := len(*posts)
 	if ids || !urls && numPosts != 0 {
 		fmt.Fprintf(tw, "Local\t%s\t%s\t\n", "ID", "Token")
 	} else if numPosts != 0 {
 		fmt.Fprintf(tw, "Local\t%s\t%s\t\n", "URL", "Token")
 	} else {
 		fmt.Fprintf(tw, "No local posts found\n")
 	}
 	for i := range *posts {
 		p = (*posts)[numPosts-1-i]
 		if ids || !urls {
 			fmt.Fprintf(tw, "unsynced\t%s\t%s\t\n", p.ID, p.EditToken)
 		} else {
 			fmt.Fprintf(tw, "unsynced\t%s\t%s\t\n", getPostURL(c, p.ID), p.EditToken)
 		}
 	}
 	u, _ := config.LoadUser(c)
 	if u != nil {
 		remotePosts, err := api.GetUserPosts(c)
 		if err != nil {
 			fmt.Println(err)
 		}
 
 		if len(remotePosts) > 0 {
 			identifier := "URL"
 			if ids || !urls {
 				identifier = "ID"
 			}
 			fmt.Fprintf(tw, "\nAccount\t%s\t%s\t\n", identifier, "Title")
 		}
 		for _, p := range remotePosts {
 			identifier := getPostURL(c, p.ID)
 			if ids || !urls {
 				identifier = p.ID
 			}
 			synced := "unsynced"
 			if p.Synced {
 				synced = "synced"
 			}
 			fmt.Fprintf(tw, "%s\t%s\t%s\t\n", synced, identifier, p.Title)
 		}
 	}
 	return tw.Flush()
 }
 
 func getPostURL(c *cli.Context, slug string) string {
 	base := config.WriteasBaseURL
 	if config.IsDev() {
 		base = config.DevBaseURL
 	}
 	ext := ""
 	// Output URL in requested format
 	if c.Bool("md") {
 		ext = ".md"
 	}
 	return fmt.Sprintf("%s/%s%s", base, slug, ext)
 }
 
 func CmdCollections(c *cli.Context) error {
 	u, err := config.LoadUser(c)
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
 	}
 	if u == nil {
 		return cli.NewExitError("You must be authenticated to view collections.\nLog in first with: writeas auth <username>", 1)
 	}
 	colls, err := api.DoFetchCollections(c)
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("Couldn't get collections for user %s: %v", u.User.Username, err), 1)
 	}
 	urls := c.Bool("url")
 	tw := tabwriter.NewWriter(os.Stdout, 8, 0, 2, ' ', tabwriter.TabIndent)
 	detail := "Title"
 	if urls {
 		detail = "URL"
 	}
 	fmt.Fprintf(tw, "%s\t%s\t\n", "Alias", detail)
 	for _, c := range colls {
 		dData := c.Title
 		if urls {
 			dData = c.URL
 		}
 		fmt.Fprintf(tw, "%s\t%s\t\n", c.Alias, dData)
 	}
 	tw.Flush()
 	return nil
 }
 
 func CmdClaim(c *cli.Context) error {
 	u, err := config.LoadUser(c)
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
 	}
 	if u == nil {
 		return cli.NewExitError("You must be authenticated to claim local posts.\nLog in first with: writeas auth <username>", 1)
 	}
 
 	localPosts := api.GetPosts(c)
 	if len(*localPosts) == 0 {
 		return nil
 	}
 
 	log.Info(c, "Claiming %d post(s) for %s...", len(*localPosts), u.User.Username)
 	results, err := api.ClaimPosts(c, localPosts)
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("Failed to claim posts: %v", err), 1)
 	}
 
 	var okCount, errCount int
 	for _, r := range *results {
 		id := r.ID
 		if id == "" {
 			// No top-level ID, so the claim was successful
 			id = r.Post.ID
 		}
 		status := fmt.Sprintf("Post %s...", id)
 		if r.ErrorMessage != "" {
 			log.Errorln("%serror: %v", status, r.ErrorMessage)
 			errCount++
 		} else {
 			log.Info(c, "%sOK", status)
 			okCount++
 			// only delete local if successful
-			api.RemovePost(c.App.ExtraInfo()["configDir"], id)
+			api.RemovePost(c, id)
 		}
 	}
 	log.Info(c, "%d claimed, %d failed", okCount, errCount)
 	return nil
 }
 
 func CmdAuth(c *cli.Context) error {
 	// Check configuration
 	u, err := config.LoadUser(c)
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
 	}
 	if u != nil && u.AccessToken != "" {
 		return cli.NewExitError("You're already authenticated as "+u.User.Username+". Log out with: writeas logout", 1)
 	}
 
 	// Validate arguments and get password
 	// TODO: after global config, check for default user
 	username := c.Args().Get(0)
 	if username == "" {
 		return cli.NewExitError("usage: writeas auth <username>", 1)
 	}
 
 	fmt.Print("Password: ")
 	pass, err := gopass.GetPasswdMasked()
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("error reading password: %v", err), 1)
 	}
 
 	// Validate password
 	if len(pass) == 0 {
 		return cli.NewExitError("Please enter your password.", 1)
 	}
 	err = api.DoLogIn(c, username, string(pass))
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("error logging in: %v", err), 1)
 	}
 
 	return nil
 }
 
 func CmdLogOut(c *cli.Context) error {
 	return api.DoLogOut(c)
 }