Move more stuff into the dropbox helper.