diff --git a/api/api.go b/api/api.go
index d3fa3fc..032d69f 100644
--- a/api/api.go
+++ b/api/api.go
@@ -1,267 +1,267 @@
 package api
 
 import (
 	"fmt"
 	"path/filepath"
 
 	"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/fileutils"
 	"github.com/writeas/writeas-cli/log"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 func client(userAgent string, tor bool) *writeas.Client {
 	var client *writeas.Client
 	if tor {
 		client = writeas.NewTorClient(TorPort)
 	} else {
 		if config.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 config.IsTor(c) {
 		client = writeas.NewTorClient(TorPort)
 	} else {
 		if config.IsDev() {
 			client = writeas.NewDevClient()
 		} else {
 			client = writeas.NewClient()
 		}
 	}
 	client.UserAgent = config.UserAgent(c)
 	// TODO: load user into var shared across the app
-	u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+	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(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
 }
 
 // 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)
 	}
 
 	var url string
 	if p.Collection != nil {
 		url = p.Collection.URL + p.Slug
 	} else {
 		if tor {
 			url = config.TorBaseURL
 		} else if config.IsDev() {
 			url = config.DevBaseURL
 		} 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)
 
 	return nil
 }
 
 func DoLogIn(c *cli.Context, username, password string) error {
 	cl := client(config.UserAgent(c), config.IsTor(c))
 
 	u, err := cl.LogIn(username, password)
 	if err != nil {
 		if config.Debug() {
 			log.ErrorlnQuit("Problem logging in: %v", err)
 		}
 		return err
 	}
 
-	err = config.SaveUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]), u)
+	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 data
 	err = fileutils.DeleteFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), config.UserFile))
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
diff --git a/api/sync.go b/api/sync.go
index d687f24..070b5e0 100644
--- a/api/sync.go
+++ b/api/sync.go
@@ -1,131 +1,131 @@
 package api
 
 import (
 	//"github.com/writeas/writeas-cli/sync"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 
 	"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 (
 	PostFileExt  = ".txt"
 	userFilename = "writeas_user"
 )
 
 func CmdPull(c *cli.Context) error {
 	cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	if err != nil {
 		return err
 	}
 	// Create posts directory if needed
 	if cfg.Posts.Directory == "" {
-		syncSetUp(c.App.ExtraInfo()["configDir"], cfg)
+		syncSetUp(c, cfg)
 	}
 
 	// Fetch posts
 	cl, err := NewClient(c, true)
 	if err != nil {
 		return err
 	}
 
 	posts, err := cl.GetUserPosts()
 	if err != nil {
 		return err
 	}
 
 	for _, p := range *posts {
 		postFilename := p.ID
 		collDir := ""
 		if p.Collection != nil {
 			postFilename = p.Slug
 			// Create directory for collection
 			collDir = p.Collection.Alias
 			if !fileutils.Exists(filepath.Join(cfg.Posts.Directory, collDir)) {
 				log.Info(c, "Creating folder "+collDir)
 				err = os.Mkdir(filepath.Join(cfg.Posts.Directory, collDir), 0755)
 				if err != nil {
 					log.Errorln("Error creating blog directory %s: %s. Skipping post %s.", collDir, err, postFilename)
 					continue
 				}
 			}
 		}
 		postFilename += PostFileExt
 
 		// Write file
 		txtFile := p.Content
 		if p.Title != "" {
 			txtFile = "# " + p.Title + "\n\n" + txtFile
 		}
 		err = ioutil.WriteFile(filepath.Join(cfg.Posts.Directory, collDir, postFilename), []byte(txtFile), 0644)
 		if err != nil {
 			log.Errorln("Error creating file %s: %s", postFilename, err)
 		}
 		log.Info(c, "Saved post "+postFilename)
 
 		// Update mtime and atime on files
 		modTime := p.Updated.Local()
 		err = os.Chtimes(filepath.Join(cfg.Posts.Directory, collDir, postFilename), modTime, modTime)
 		if err != nil {
 			log.Errorln("Error setting time on %s: %s", postFilename, err)
 		}
 	}
 
 	return nil
 }
 
-func syncSetUp(path string, cfg *config.UserConfig) error {
+func syncSetUp(c *cli.Context, cfg *config.UserConfig) error {
 	// Get user information and fail early (before we make the user do
 	// anything), if we're going to
-	u, err := config.LoadUser(config.UserDataDir(path))
+	u, err := config.LoadUser(c)
 	if err != nil {
 		return err
 	}
 
 	// Prompt for posts directory
 	defaultDir, err := os.Getwd()
 	if err != nil {
 		return err
 	}
 	var dir string
 	fmt.Printf("Posts directory? [%s]: ", defaultDir)
 	fmt.Scanln(&dir)
 	if dir == "" {
 		dir = defaultDir
 	}
 
 	// FIXME: This only works on non-Windows OSes (fix: https://www.reddit.com/r/golang/comments/5t3ezd/hidden_files_directories/)
 	userFilepath := filepath.Join(dir, "."+userFilename)
 
 	// Create directory if needed
 	if !fileutils.Exists(dir) {
 		err = os.MkdirAll(dir, 0700)
 		if err != nil {
 			if config.Debug() {
 				log.Errorln("Error creating data directory: %s", err)
 			}
 			return err
 		}
 		// Create username file in directory
 		err = ioutil.WriteFile(userFilepath, []byte(u.User.Username), 0644)
 		fmt.Println("Created posts directory.")
 	}
 
 	// Save preference
 	cfg.Posts.Directory = dir
-	err = config.SaveConfig(config.UserDataDir(path), cfg)
+	err = config.SaveConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]), cfg)
 	if err != nil {
 		if config.Debug() {
 			log.Errorln("Unable to save config: %s", err)
 		}
 		return err
 	}
 	fmt.Println("Saved config.")
 
 	return nil
 }
diff --git a/cmd/wf/main.go b/cmd/wf/main.go
index 8b78771..4dbbf7e 100644
--- a/cmd/wf/main.go
+++ b/cmd/wf/main.go
@@ -1,266 +1,250 @@
 package main
 
 import (
 	"os"
 
 	"github.com/writeas/writeas-cli/api"
 	"github.com/writeas/writeas-cli/commands"
 	"github.com/writeas/writeas-cli/config"
-	"github.com/writeas/writeas-cli/log"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 func main() {
-	initialize(appInfo["configDir"])
+	config.DirMustExist(appInfo["configDir"])
 	cli.VersionFlag = cli.BoolFlag{
 		Name:  "version, V",
 		Usage: "print the version",
 	}
 
 	// Run the app
 	app := cli.NewApp()
 	app.Name = "wf"
 	app.Version = config.Version
 	app.Usage = "Publish text quickly"
 	// TODO: who is the author? the contributors? link to GH?
 	app.Authors = []cli.Author{
 		{
 			Name:  "Write.as",
 			Email: "hello@write.as",
 		},
 	}
 	app.ExtraInfo = func() map[string]string {
 		return appInfo
 	}
 	app.Action = commands.CmdPost
 	app.Flags = globalFlags
 	app.Commands = []cli.Command{
 		{
 			Name:   "post",
 			Usage:  "Alias for default action: create post from stdin",
 			Action: commands.CmdPost,
 			Flags:  config.PostFlags,
 			Description: `Create a new post on Write.as from stdin.
 
    Use the --code flag to indicate that the post should use syntax 
    highlighting. Or use the --font [value] argument to set the post's 
    appearance, where [value] is mono, monospace (default), wrap (monospace 
    font with word wrapping), serif, or sans.`,
 		},
 		{
 			Name:  "new",
 			Usage: "Compose a new post from the command-line and publish",
 			Description: `An alternative to piping data to the program.
 
    On Windows, this will use 'copy con' to start reading what you input from the
    prompt. Press F6 or Ctrl-Z then Enter to end input.
    On *nix, this will use the best available text editor, starting with the 
    value set to the WRITEAS_EDITOR or EDITOR environment variable, or vim, or
    finally nano.
 
    Use the --code flag to indicate that the post should use syntax 
    highlighting. Or use the --font [value] argument to set the post's 
    appearance, where [value] is mono, monospace (default), wrap (monospace 
    font with word wrapping), serif, or sans.
    
    If posting fails for any reason, 'writeas' will show you the temporary file
    location and how to pipe it to 'writeas' to retry.`,
 			Action: commands.CmdNew,
 			Flags:  config.PostFlags,
 		},
 		{
 			Name:   "publish",
 			Usage:  "Publish a file to Write.as",
 			Action: commands.CmdPublish,
 			Flags:  config.PostFlags,
 		},
 		{
 			Name:   "delete",
 			Usage:  "Delete a post",
 			Action: commands.CmdDelete,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Delete via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "update",
 			Usage:  "Update (overwrite) a post",
 			Action: commands.CmdUpdate,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Update via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "code",
 					Usage: "Specifies this post is code",
 				},
 				cli.StringFlag{
 					Name:  "font",
 					Usage: "Sets post font to given value",
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "get",
 			Usage:  "Read a raw post",
 			Action: commands.CmdGet,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Get from Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:  "add",
 			Usage: "Add an existing post locally",
 			Description: `A way to add an existing post to your local store for easy editing later.
 			
    This requires a post ID (from https://write.as/[ID]) and an Edit Token
    (exported from another Write.as client, such as the Android app).
 `,
 			Action: commands.CmdAdd,
 		},
 		{
 			Name:        "posts",
 			Usage:       "List all of your posts",
 			Description: "This will list only local posts when not currently authenticated. To list remote posts as well, first run: writeas auth <username>.",
 			Action:      commands.CmdListPosts,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "id",
 					Usage: "Show list with post IDs (default)",
 				},
 				cli.BoolFlag{
 					Name:  "md",
 					Usage: "Use with --url to return URLs with Markdown enabled",
 				},
 				cli.BoolFlag{
 					Name:  "url",
 					Usage: "Show list with URLs",
 				},
 			},
 		},
 		{
 			Name:   "fetch",
 			Usage:  "Fetch authenticated user's Write.as posts",
 			Action: api.CmdPull,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "auth",
 			Usage:  "Authenticate with Write.as",
 			Action: commands.CmdAuth,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "logout",
 			Usage:  "Log out of Write.as",
 			Action: commands.CmdLogOut,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 	}
 
 	cli.CommandHelpTemplate = `NAME:
    {{.Name}} - {{.Usage}}
 
 USAGE:
    writeas {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}
 
 DESCRIPTION:
    {{.Description}}{{end}}{{if .Flags}}
 
 OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{ end }}
 `
 	app.Run(os.Args)
 }
-
-func initialize(dataDirName string) {
-	// Ensure we have a data directory to use
-	if !config.DataDirExists(dataDirName) {
-		err := config.CreateDataDir(dataDirName)
-		if err != nil {
-			if config.Debug() {
-				panic(err)
-			} else {
-				log.Errorln("Error creating data directory: %s", err)
-				return
-			}
-		}
-	}
-}
diff --git a/cmd/writeas/main.go b/cmd/writeas/main.go
index 7bdcc6e..111d1e5 100644
--- a/cmd/writeas/main.go
+++ b/cmd/writeas/main.go
@@ -1,265 +1,249 @@
 package main
 
 import (
 	"os"
 
 	"github.com/writeas/writeas-cli/commands"
 	"github.com/writeas/writeas-cli/config"
-	"github.com/writeas/writeas-cli/log"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
 func main() {
-	initialize(appInfo["configDir"])
+	config.DirMustExist(appInfo["configDir"])
 	cli.VersionFlag = cli.BoolFlag{
 		Name:  "version, V",
 		Usage: "print the version",
 	}
 
 	// Run the app
 	app := cli.NewApp()
 	app.Name = "writeas"
 	app.Version = config.Version
 	app.Usage = "Publish text quickly"
 	app.Authors = []cli.Author{
 		{
 			Name:  "Write.as",
 			Email: "hello@write.as",
 		},
 	}
 	app.ExtraInfo = func() map[string]string {
 		return appInfo
 	}
 	app.Action = commands.CmdPost
 	app.Flags = globalFlags
 	app.Commands = []cli.Command{
 		{
 			Name:   "post",
 			Usage:  "Alias for default action: create post from stdin",
 			Action: commands.CmdPost,
 			Flags:  config.PostFlags,
 			Description: `Create a new post on Write.as from stdin.
 
    Use the --code flag to indicate that the post should use syntax 
    highlighting. Or use the --font [value] argument to set the post's 
    appearance, where [value] is mono, monospace (default), wrap (monospace 
    font with word wrapping), serif, or sans.`,
 		},
 		{
 			Name:  "new",
 			Usage: "Compose a new post from the command-line and publish",
 			Description: `An alternative to piping data to the program.
 
    On Windows, this will use 'copy con' to start reading what you input from the
    prompt. Press F6 or Ctrl-Z then Enter to end input.
    On *nix, this will use the best available text editor, starting with the 
    value set to the WRITEAS_EDITOR or EDITOR environment variable, or vim, or
    finally nano.
 
    Use the --code flag to indicate that the post should use syntax 
    highlighting. Or use the --font [value] argument to set the post's 
    appearance, where [value] is mono, monospace (default), wrap (monospace 
    font with word wrapping), serif, or sans.
    
    If posting fails for any reason, 'writeas' will show you the temporary file
    location and how to pipe it to 'writeas' to retry.`,
 			Action: commands.CmdNew,
 			Flags:  config.PostFlags,
 		},
 		{
 			Name:   "publish",
 			Usage:  "Publish a file to Write.as",
 			Action: commands.CmdPublish,
 			Flags:  config.PostFlags,
 		},
 		{
 			Name:   "delete",
 			Usage:  "Delete a post",
 			Action: commands.CmdDelete,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Delete via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "update",
 			Usage:  "Update (overwrite) a post",
 			Action: commands.CmdUpdate,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Update via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "code",
 					Usage: "Specifies this post is code",
 				},
 				cli.StringFlag{
 					Name:  "font",
 					Usage: "Sets post font to given value",
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "get",
 			Usage:  "Read a raw post",
 			Action: commands.CmdGet,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Get from Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:  "add",
 			Usage: "Add an existing post locally",
 			Description: `A way to add an existing post to your local store for easy editing later.
 			
    This requires a post ID (from https://write.as/[ID]) and an Edit Token
    (exported from another Write.as client, such as the Android app).
 `,
 			Action: commands.CmdAdd,
 		},
 		{
 			Name:        "posts",
 			Usage:       "List all of your posts",
 			Description: "This will list only local posts when not currently authenticated. To list remote posts as well, first run: writeas auth <username>.",
 			Action:      commands.CmdListPosts,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "id",
 					Usage: "Show list with post IDs (default)",
 				},
 				cli.BoolFlag{
 					Name:  "md",
 					Usage: "Use with --url to return URLs with Markdown enabled",
 				},
 				cli.BoolFlag{
 					Name:  "url",
 					Usage: "Show list with URLs",
 				},
 			},
 		}, {
 			Name:   "blogs",
 			Usage:  "List blogs",
 			Action: commands.CmdCollections,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "url",
 					Usage: "Show list with URLs",
 				},
 			},
 		}, {
 			Name:        "claim",
 			Usage:       "Claim local unsynced posts",
 			Action:      commands.CmdClaim,
 			Description: "This will claim any unsynced posts local to this machine. To see which posts these are run: writeas posts.",
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "auth",
 			Usage:  "Authenticate with Write.as",
 			Action: commands.CmdAuth,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 		{
 			Name:   "logout",
 			Usage:  "Log out of Write.as",
 			Action: commands.CmdLogOut,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "verbose, v",
 					Usage: "Make the operation more talkative",
 				},
 			},
 		},
 	}
 
 	cli.CommandHelpTemplate = `NAME:
    {{.Name}} - {{.Usage}}
 
 USAGE:
    writeas {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}
 
 DESCRIPTION:
    {{.Description}}{{end}}{{if .Flags}}
 
 OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{ end }}
 `
 	app.Run(os.Args)
 }
-
-func initialize(dataDirName string) {
-	// Ensure we have a data directory to use
-	if !config.DataDirExists(dataDirName) {
-		err := config.CreateDataDir(dataDirName)
-		if err != nil {
-			if config.Debug() {
-				panic(err)
-			} else {
-				log.Errorln("Error creating data directory: %s", err)
-				return
-			}
-		}
-	}
-}
diff --git a/commands/commands.go b/commands/commands.go
index 0a4ba6a..7e51455 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -1,339 +1,339 @@
 package commands
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"text/tabwriter"
 
 	"github.com/howeyc/gopass"
 	"github.com/writeas/writeas-cli/api"
 	"github.com/writeas/writeas-cli/config"
 	"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
 }
 
 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
 	}
 	_, err = api.HandlePost(content, c)
 
 	// TODO: write local file if directory is set
 	return err
 }
 
 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(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+	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)
 	}
 
 	// TODO: Delete local file, if necessary
 	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(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+	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(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(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+	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(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	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(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
 	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)
 		}
 	}
 	log.Info(c, "%d claimed, %d failed", okCount, errCount)
 	return nil
 }
 
 func CmdAuth(c *cli.Context) error {
 	// Check configuration
-	u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+	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
 	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)
 }
diff --git a/config/directories.go b/config/directories.go
index 8373835..a24cc31 100644
--- a/config/directories.go
+++ b/config/directories.go
@@ -1,20 +1,38 @@
 package config
 
 import (
 	"os"
 	"path/filepath"
 
 	"github.com/writeas/writeas-cli/fileutils"
+	"github.com/writeas/writeas-cli/log"
 )
 
 func UserDataDir(dataDirName string) string {
 	return filepath.Join(parentDataDir(), dataDirName)
 }
 
-func DataDirExists(dataDirName string) bool {
-	return fileutils.Exists(UserDataDir(dataDirName))
+func dataDirExists(dataDirName string) bool {
+	return fileutils.Exists(dataDirName)
 }
 
-func CreateDataDir(dataDirName string) error {
-	return os.Mkdir(UserDataDir(dataDirName), 0700)
+func createDataDir(dataDirName string) error {
+	return os.Mkdir(dataDirName, 0700)
+}
+
+// DirMustExist checks for a directory, creates it if not found and either
+// panics or logs and error depending on the status of Debug
+func DirMustExist(dataDirName string) {
+	// Ensure we have a data directory to use
+	if !dataDirExists(dataDirName) {
+		err := createDataDir(dataDirName)
+		if err != nil {
+			if Debug() {
+				panic(err)
+			} else {
+				log.Errorln("Error creating data directory: %s", err)
+				return
+			}
+		}
+	}
 }
diff --git a/config/user.go b/config/user.go
index 21dd8f9..6722452 100644
--- a/config/user.go
+++ b/config/user.go
@@ -1,47 +1,66 @@
 package config
 
 import (
 	"encoding/json"
 	"io/ioutil"
 	"path/filepath"
 
 	writeas "github.com/writeas/go-writeas/v2"
 	"github.com/writeas/writeas-cli/fileutils"
+	"gopkg.in/urfave/cli.v1"
 )
 
 const UserFile = "user.json"
 
-func LoadUser(dataDir string) (*writeas.AuthUser, error) {
-	fname := filepath.Join(dataDir, UserFile)
+func LoadUser(c *cli.Context) (*writeas.AuthUser, error) {
+	dir, err := userHostDir(c)
+	if err != nil {
+		return nil, err
+	}
+	fname := filepath.Join(dir, UserFile)
 	userJSON, err := ioutil.ReadFile(fname)
 	if err != nil {
 		if !fileutils.Exists(fname) {
 			// Don't return a file-not-found error
 			return nil, nil
 		}
 		return nil, err
 	}
 
 	// Parse JSON file
 	u := &writeas.AuthUser{}
 	err = json.Unmarshal(userJSON, u)
 	if err != nil {
 		return nil, err
 	}
 	return u, nil
 }
 
-func SaveUser(dataDir string, u *writeas.AuthUser) error {
+func SaveUser(c *cli.Context, u *writeas.AuthUser) error {
 	// Marshal struct into pretty-printed JSON
 	userJSON, err := json.MarshalIndent(u, "", "  ")
 	if err != nil {
 		return err
 	}
 
+	dir, err := userHostDir(c)
+	if err != nil {
+		return err
+	}
+	DirMustExist(dir)
 	// Save file
-	err = ioutil.WriteFile(filepath.Join(dataDir, UserFile), userJSON, 0600)
+	err = ioutil.WriteFile(filepath.Join(dir, UserFile), userJSON, 0600)
 	if err != nil {
 		return err
 	}
 	return nil
 }
+
+func userHostDir(c *cli.Context) (string, error) {
+	dataDir := UserDataDir(c.App.ExtraInfo()["configDir"])
+	hostDir, err := HostDirectory(c)
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(dataDir, hostDir), nil
+}