diff --git a/packages/cli/.vscode/launch.json b/packages/cli/.vscode/launch.json
index 919097f2f4..d84036ad8f 100644
--- a/packages/cli/.vscode/launch.json
+++ b/packages/cli/.vscode/launch.json
@@ -9,7 +9,7 @@
             "request": "launch",
             "name": "init",
             "program": "${workspaceFolder}\\bin\\budi",
-            "args": ["init", "-b", "pouch"],
+            "args": ["init", "-b", "remote"],
             "console": "integratedTerminal",
             "cwd": "${workspaceFolder}/sandbox"
         },
diff --git a/packages/cli/src/commands/init/initHandler.js b/packages/cli/src/commands/init/initHandler.js
index b49a469e34..7ac01b7f23 100644
--- a/packages/cli/src/commands/init/initHandler.js
+++ b/packages/cli/src/commands/init/initHandler.js
@@ -31,10 +31,11 @@ const ensureAppDir = async opts => {
   }
   await ensureDir(opts.dir)
 
-  if (opts.database === "pouch") {
+  if (opts.database === "local") {
     const dataDir = join(opts.dir, ".data")
     await ensureDir(dataDir)
-    process.env.COUCH_DB_URL = dataDir
+    process.env.COUCH_DB_URL =
+      dataDir + (dataDir.endsWith("/") || dataDir.endsWith("\\") ? "" : "/")
   }
 }
 
@@ -51,12 +52,14 @@ const prompts = async opts => {
     },
   ]
 
-  if (opts.database === "couch" && !opts.couchDbUrl) {
+  if (opts.database === "remote" && !opts.couchDbUrl) {
     const answers = await inquirer.prompt(questions)
     opts.couchDbUrl = answers.couchDbUrl
   }
 }
 
+//https://admin:password@localhost:5984
+
 const createClientDatabse = async opts => {
   const couch = CouchDb()
   if (opts.clientId === "new") {
@@ -72,6 +75,7 @@ const createClientDatabse = async opts => {
   }
 
   const db = new couch(`client-${opts.clientId}`)
+  console.log(await db.info())
   await initialiseClientDb(db)
 }
 
diff --git a/packages/server/db/client.js b/packages/server/db/client.js
index c6aee5b6ec..d27823d543 100644
--- a/packages/server/db/client.js
+++ b/packages/server/db/client.js
@@ -1,14 +1,14 @@
 const PouchDB = require("pouchdb")
-require("pouchdb-all-dbs")(PouchDB)
+const allDbs = require("pouchdb-all-dbs")
 
 module.exports = () => {
   const COUCH_DB_URL =
     process.env.COUCH_DB_URL || "http://admin:password@localhost:5984"
   const DATABASE_TYPE = process.env.DATABASE_TYPE || "couch"
 
-  PouchDB.defaults({
+  const pouch =  PouchDB.defaults({
     prefix: COUCH_DB_URL,
   })
-
-  return PouchDB
+  allDbs(pouch)
+  return pouch
 }