diff --git a/api_auth_docker/api-sample.properties b/api_auth_docker/api-sample.properties
index 27ddfd6..74c2cc4 100644
--- a/api_auth_docker/api-sample.properties
+++ b/api_auth_docker/api-sample.properties
@@ -31,6 +31,7 @@ action_ln_decodebolt11=watcher
 action_ln_listpeers=watcher
 action_ln_getroute=watcher
 action_ln_listpays=watcher
+action_bitcoin_estimatesmartfee=watcher
 
 # Spender can do what the watcher can do, plus:
 action_getxnslist=spender
@@ -55,6 +56,12 @@ action_ln_decodebolt11=spender
 action_ln_connectfund=spender
 action_ln_listfunds=spender
 action_ln_withdraw=spender
+action_createbatch=spender
+action_updatebatch=spender
+action_removefrombatch=spender
+action_listbatches=spender
+action_getbatch=spender
+action_getbatchdetails=spender
 
 # Admin can do what the spender can do, plus:
 
diff --git a/cyphernodeconf_docker/templates/gatekeeper/api.properties b/cyphernodeconf_docker/templates/gatekeeper/api.properties
index d22c2f5..7350b0b 100644
--- a/cyphernodeconf_docker/templates/gatekeeper/api.properties
+++ b/cyphernodeconf_docker/templates/gatekeeper/api.properties
@@ -36,6 +36,7 @@ action_ln_decodebolt11=watcher
 action_ln_listpeers=watcher
 action_ln_getroute=watcher
 action_ln_listpays=watcher
+action_bitcoin_estimatesmartfee=watcher
 
 # Spender can do what the watcher can do, plus:
 action_get_txns_spending=spender
@@ -59,6 +60,12 @@ action_ln_decodebolt11=spender
 action_ln_connectfund=spender
 action_ln_listfunds=spender
 action_ln_withdraw=spender
+action_createbatch=spender
+action_updatebatch=spender
+action_removefrombatch=spender
+action_listbatches=spender
+action_getbatch=spender
+action_getbatchdetails=spender
 
 # Admin can do what the spender can do, plus:
 
diff --git a/proxy_docker/app/data/cyphernode.sql b/proxy_docker/app/data/cyphernode.sql
index 743ce18..7fb3621 100644
--- a/proxy_docker/app/data/cyphernode.sql
+++ b/proxy_docker/app/data/cyphernode.sql
@@ -64,9 +64,24 @@ CREATE TABLE recipient (
   address TEXT,
   amount REAL,
   tx_id INTEGER REFERENCES tx,
-  inserted_ts INTEGER DEFAULT CURRENT_TIMESTAMP
+  inserted_ts INTEGER DEFAULT CURRENT_TIMESTAMP,
+  webhook_url TEXT,
+  calledback INTEGER DEFAULT FALSE,
+  calledback_ts INTEGER,
+  batch_id INTEGER REFERENCES batch,
+  label TEXT,
 );
 CREATE INDEX idx_recipient_address ON recipient (address);
+CREATE INDEX idx_recipient_label ON recipient (label);
+
+CREATE TABLE batch (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  label TEXT UNIQUE,
+  conf_target INTEGER,
+  feerate REAL,
+  inserted_ts INTEGER DEFAULT CURRENT_TIMESTAMP
+);
+INSERT INTO batch (id, label, conf_target, feerate) VALUES (1, "default", 6, NULL);
 
 CREATE TABLE watching_by_txid (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
diff --git a/proxy_docker/app/data/sqlmigrate20181213_0-0.1.sh b/proxy_docker/app/data/sqlmigrate20181213_0-0.1.sh
old mode 100644
new mode 100755
diff --git a/proxy_docker/app/data/sqlmigrate20190104_0.1-0.2.sh b/proxy_docker/app/data/sqlmigrate20190104_0.1-0.2.sh
old mode 100644
new mode 100755
diff --git a/proxy_docker/app/data/sqlmigrate20190130_0.1-0.2.sh b/proxy_docker/app/data/sqlmigrate20190130_0.1-0.2.sh
old mode 100644
new mode 100755
diff --git a/proxy_docker/app/data/sqlmigrate20191127_0.2.4-0.3.0.sh b/proxy_docker/app/data/sqlmigrate20191127_0.2.4-0.3.0.sh
old mode 100644
new mode 100755
diff --git a/proxy_docker/app/data/sqlmigrate20200610_0.4.0-0.5.0.sh b/proxy_docker/app/data/sqlmigrate20200610_0.4.0-0.5.0.sh
new file mode 100755
index 0000000..9cb8049
--- /dev/null
+++ b/proxy_docker/app/data/sqlmigrate20200610_0.4.0-0.5.0.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "Checking for extended batching support in DB..."
+count=$(sqlite3 $DB_FILE "select count(*) from pragma_table_info('recipient') where name='batch_id'")
+if [ "${count}" -eq "0" ]; then
+	# batch_id not there, we have to migrate
+	echo "Migrating database for extended batching support..."
+  echo "Backing up current DB..."
+  cp  $DB_FILE $DB_FILE-sqlmigrate20200610_0.4.0-0.5.0
+  echo "Altering DB..."
+	cat sqlmigrate20200610_0.4.0-0.5.0.sql | sqlite3 $DB_FILE
+else
+	echo "Database extended batching support migration already done, skipping!"
+fi
diff --git a/proxy_docker/app/data/sqlmigrate20200610_0.4.0-0.5.0.sql b/proxy_docker/app/data/sqlmigrate20200610_0.4.0-0.5.0.sql
new file mode 100644
index 0000000..bc8fd39
--- /dev/null
+++ b/proxy_docker/app/data/sqlmigrate20200610_0.4.0-0.5.0.sql
@@ -0,0 +1,16 @@
+
+CREATE TABLE batch (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  label TEXT UNIQUE,
+  conf_target INTEGER,
+  feerate REAL,
+  inserted_ts INTEGER DEFAULT CURRENT_TIMESTAMP
+);
+INSERT INTO batch (id, label, conf_target, feerate) VALUES (1, "default", 6, NULL);
+
+ALTER TABLE recipient ADD COLUMN webhook_url TEXT;
+ALTER TABLE recipient ADD COLUMN batch_id INTEGER REFERENCES batch;
+ALTER TABLE recipient ADD COLUMN label INTEGER REFERENCES batch;
+ALTER TABLE recipient ADD COLUMN calledback INTEGER DEFAULT FALSE;
+ALTER TABLE recipient ADD COLUMN calledback_ts INTEGER;
+CREATE INDEX idx_recipient_label ON recipient (label);
diff --git a/proxy_docker/app/script/batching.sh b/proxy_docker/app/script/batching.sh
new file mode 100644
index 0000000..f95b88f
--- /dev/null
+++ b/proxy_docker/app/script/batching.sh
@@ -0,0 +1,823 @@
+#!/bin/sh
+
+. ./trace.sh
+. ./sendtobitcoinnode.sh
+
+createbatch() {
+  trace "Entering createbatch()..."
+
+  # POST http://192.168.111.152:8080/createbatch
+  #
+  # args:
+  # - batchLabel, optional, id can be used to reference the batch
+  # - confTarget, optional, overriden by batchspend's confTarget, default Bitcoin Core conf_target will be used if not supplied
+  # NOTYET - feeRate, sat/vB, optional, overrides confTarget if supplied, overriden by batchspend's feeRate, default Bitcoin Core fee policy will be used if not supplied
+  #
+  # response:
+  # - id, the batch id
+  #
+  # BODY {"batchLabel":"lowfees","confTarget":32}
+  # NOTYET BODY {"batchLabel":"highfees","feeRate":231.8}
+
+  local request=${1}
+  local response
+  local label=$(echo "${request}" | jq ".batchLabel")
+  trace "[createbatch] label=${label}"
+  local conf_target=$(echo "${request}" | jq ".confTarget")
+  trace "[createbatch] conf_target=${conf_target}"
+  local feerate=$(echo "${request}" | jq ".feeRate")
+  trace "[createbatch] feerate=${feerate}"
+
+  # if [ "${feerate}" != "null" ]; then
+  #   # If not null, let's nullify conf_target since feerate overrides it
+  #   conf_target="null"
+  #   trace "[createbatch] Overriding conf_target=${conf_target}"
+  # fi
+
+  local batch_id
+
+  batch_id=$(sql "INSERT OR IGNORE INTO batch (label, conf_target, feerate) VALUES (${label}, ${conf_target}, ${feerate}); SELECT LAST_INSERT_ROWID();")
+
+  if ("${batch_id}" -eq "0"); then
+    trace "[createbatch] Could not insert"
+    response='{"result":null,"error":{"code":-32700,"message":"Could not create batch, label probably already exists","data":'${request}'}}'
+  else
+    trace "[createbatch] Inserted"
+    response='{"result":{"batchId":'${batch_id}'},"error":null}'
+  fi
+
+  echo "${response}"
+}
+
+updatebatch() {
+  trace "Entering updatebatch()..."
+
+  # POST http://192.168.111.152:8080/updatebatch
+  #
+  # args:
+  # - batchId, optional, batch id to update, will update default batch if not supplied
+  # - batchLabel, optional, id can be used to reference the batch, will update default batch if not supplied, if id is present then change the label with supplied text
+  # - confTarget, optional, new confirmation target for the batch
+  # NOTYET - feeRate, sat/vB, optional, new feerate for the batch
+  #
+  # response:
+  # - batchId, the batch id
+  # - batchLabel, the batch label
+  # - confTarget, the batch default confirmation target
+  # NOTYET - feeRate, the batch default feerate
+  #
+  # BODY {"batchId":5,"confTarget":12}
+  # NOTYET BODY {"batchLabel":"highfees","feeRate":400}
+  # NOTYET BODY {"batchId":3,"batchLabel":"ultrahighfees","feeRate":800}
+  # BODY {"batchLabel":"fast","confTarget":2}
+
+  local request=${1}
+  local response
+  local whereclause
+  local returncode
+
+  local id=$(echo "${request}" | jq ".batchId")
+  trace "[updatebatch] id=${id}"
+  local label=$(echo "${request}" | jq ".batchLabel")
+  trace "[updatebatch] label=${label}"
+  local conf_target=$(echo "${request}" | jq ".confTarget")
+  trace "[updatebatch] conf_target=${conf_target}"
+  local feerate=$(echo "${request}" | jq ".feeRate")
+  trace "[updatebatch] feerate=${feerate}"
+
+  if [ "${id}" = "null" ] && [ "${label}" = "null" ]; then
+    # If id and label are null, use default batch
+    trace "[updatebatch] Using default batch 1"
+    id=1
+  fi
+
+  # if [ "${feerate}" != "null" ]; then
+  #   # If not null, let's nullify conf_target since feerate overrides it
+  #   conf_target="null"
+  #   trace "[updatebatch] Overriding conf_target=${conf_target}"
+  # fi
+
+  if [ "${id}" = "null" ]; then
+    whereclause="label=${label}"
+  else
+    whereclause="id = ${id}"
+  fi
+
+  sql "UPDATE batch set label=${label}, conf_target=${conf_target}, feerate=${feerate} WHERE ${whereclause}"
+  returncode=$?
+  trace_rc ${returncode}
+  if [ "${returncode}" -ne 0 ]; then
+    response='{"result":null,"error":{"code":-32700,"message":"Could not update batch","data":'${request}'}}'
+  else
+    response='{"result":{"batchId":'${id}'},"error":null}'
+  fi
+
+  echo "${response}"
+}
+
+addtobatch() {
+  trace "Entering addtobatch()..."
+
+  # POST http://192.168.111.152:8080/addtobatch
+  #
+  # args:
+  # - address, required, desination address
+  # - amount, required, amount to send to the destination address
+  # - batchId, optional, the id of the batch to which the output will be added, default batch if not supplied, overrides batchLabel
+  # - batchLabel, optional, the label of the batch to which the output will be added, default batch if not supplied
+  # - webhookUrl, optional, the webhook to call when the batch is broadcast
+  #
+  # response:
+  # - id, the id of the added output
+  # - nbOutputs, the number of outputs currently in the batch
+  # - oldest, the timestamp of the oldest output in the batch
+  # - pendingTotal, the current sum of the batch's output amounts
+  #
+  # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233}
+  # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"batchId":34,"webhookUrl":"https://myCypherApp:3000/batchExecuted"}
+  # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"batchLabel":"lowfees","webhookUrl":"https://myCypherApp:3000/batchExecuted"}
+  # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"batchId":34,"webhookUrl":"https://myCypherApp:3000/batchExecuted"}
+
+  local request=${1}
+  local response
+  local returncode=0
+  local inserted_id
+  local row
+
+  local address=$(echo "${request}" | jq ".address")
+  trace "[addtobatch] address=${address}"
+  local amount=$(echo "${request}" | jq ".amount")
+  trace "[addtobatch] amount=${amount}"
+  local label=$(echo "${request}" | jq ".outputLabel")
+  trace "[addtobatch] label=${label}"
+  local batch_id=$(echo "${request}" | jq ".batchId")
+  trace "[addtobatch] batch_id=${batch_id}"
+  local batch_label=$(echo "${request}" | jq ".batchLabel")
+  trace "[addtobatch] batch_label=${batch_label}"
+  local webhook_url=$(echo "${request}" | jq ".webhookUrl")
+  trace "[addtobatch] webhook_url=${webhook_url}"
+
+  if [ "${batch_id}" = "null" ] && [ "${batch_label}" = "null" ]; then
+    # If batch_id and batch_label are null, use default batch
+    trace "[addtobatch] Using default batch 1"
+    batch_id=1
+  fi
+
+  if [ "${batch_id}" = "null" ]; then
+    # Using batch_label
+    batch_id=$(sql "SELECT id FROM batch WHERE label=${batch_label}")
+    returncode=$?
+    trace_rc ${returncode}
+  fi
+
+  if [ -z "${batch_id}" ]; then
+    # batchLabel not found
+    response='{"result":null,"error":{"code":-32700,"message":"batch not found","data":'${request}'}}'
+  else
+    inserted_id=$(sql "INSERT INTO recipient (address, amount, webhook_url, batch_id, label) VALUES (${address}, ${amount}, ${webhook_url}, ${batch_id}, ${label}); SELECT LAST_INSERT_ROWID();")
+    returncode=$?
+    trace_rc ${returncode}
+
+    if [ "${returncode}" -ne 0 ]; then
+      response='{"result":null,"error":{"code":-32700,"message":"Could not add to batch","data":'${request}'}}'
+    else
+      row=$(sql "SELECT COUNT(id), MIN(inserted_ts), SUM(amount) FROM recipient WHERE tx_id IS NULL AND batch_id=${batch_id}")
+      returncode=$?
+      trace_rc ${returncode}
+
+      local count=$(echo "${row}" | cut -d '|' -f1)
+      trace "[addtobatch] count=${count}"
+      local oldest=$(echo "${row}" | cut -d '|' -f2)
+      trace "[addtobatch] oldest=${oldest}"
+      local total=$(echo "${row}" | cut -d '|' -f3)
+      trace "[addtobatch] total=${total}"
+
+      response='{"result":{"batchId":'${batch_id}',"outputId":'${inserted_id}',"nbOutputs":'${count}',"oldest":"'${oldest}'","pendingTotal":'${total}'},"error":null}'
+    fi
+  fi
+
+  echo "${response}"
+}
+
+removefrombatch() {
+  trace "Entering removefrombatch()..."
+
+  # POST http://192.168.111.152:8080/removefrombatch
+  #
+  # args:
+  # - outputId, required, id of the output to remove
+  #
+  # response:
+  # - outputId, the id of the removed output if found
+  # - nbOutputs, the number of outputs currently in the batch
+  # - oldest, the timestamp of the oldest output in the batch
+  # - pendingTotal, the current sum of the batch's output amounts
+  #
+  # BODY {"id":72}
+
+  local request=${1}
+  local response
+  local returncode=0
+  local row
+  local batch_id
+
+  local id=$(echo "${request}" | jq ".outputId")
+  trace "[removefrombatch] id=${id}"
+
+  if [ "${id}" = "null" ]; then
+    # id is required
+    trace "[removefrombatch] id missing"
+    response='{"result":null,"error":{"code":-32700,"message":"outputId is required","data":'${request}'}}'
+  else
+    batch_id=$(sql "SELECT batch_id FROM recipient WHERE id=${id}")
+    returncode=$?
+    trace_rc ${returncode}
+
+    if [ -n "${batch_id}" ]; then
+      sql "DELETE FROM recipient WHERE id=${id}"
+      returncode=$?
+      trace_rc ${returncode}
+
+      if [ "${returncode}" -ne 0 ]; then
+        response='{"result":null,"error":{"code":-32700,"message":"Output was not removed","data":'${request}'}}'
+      else
+        row=$(sql "SELECT COUNT(id), COALESCE(MIN(inserted_ts), 0), COALESCE(SUM(amount), 0.00000000) FROM recipient WHERE tx_id IS NULL AND batch_id=${batch_id}")
+        returncode=$?
+        trace_rc ${returncode}
+
+        local count=$(echo "${row}" | cut -d '|' -f1)
+        trace "[removefrombatch] count=${count}"
+        local oldest=$(echo "${row}" | cut -d '|' -f2)
+        trace "[removefrombatch] oldest=${oldest}"
+        local total=$(echo "${row}" | cut -d '|' -f3)
+        trace "[removefrombatch] total=${total}"
+
+        response='{"result":{"batchId":'${batch_id}',"nbOutputs":'${count}',"oldest":"'${oldest}'","pendingTotal":'${total}'},"error":null}'
+      fi
+    else
+      response='{"result":null,"error":{"code":-32700,"message":"Output not found or already spent","data":'${request}'}}'
+    fi
+  fi
+
+  echo "${response}"
+}
+
+batchspend() {
+  trace "Entering batchspend()..."
+
+  # POST http://192.168.111.152:8080/batchspend
+  #
+  # args:
+  # - batchId, optional, id of the batch to spend, overrides batchLabel, default batch will be spent if not supplied
+  # - batchLabel, optional, label of the batch to spend, default batch will be spent if not supplied
+  # - confTarget, optional, overrides default value of createbatch, default to value of createbatch, default Bitcoin Core conf_target will be used if not supplied
+  # NOTYET - feeRate, optional, overrides confTarget if supplied, overrides default value of createbatch, default to value of createbatch, default Bitcoin Core value will be used if not supplied
+  #
+  # response:
+  # - txid, the txid of the batch
+  # - nbOutputs, the number of outputs spent in the batch
+  # - oldest, the timestamp of the oldest output in the spent batch
+  # - total, the sum of the spent batch's output amounts
+  # - txid, the transaction txid
+  # - hash, the transaction hash
+  # - tx details: size, vsize, replaceable, fee
+  # - outputs
+  #
+  # BODY {}
+  # BODY {"batchId":"34","confTarget":12}
+  # NOTYET BODY {"batchLabel":"highfees","feeRate":233.7}
+  # BODY {"batchId":"411","confTarget":6}
+
+  local request=${1}
+  local response
+  local returncode=0
+  local row
+  local whereclause
+
+  local batch_id=$(echo "${request}" | jq ".batchId")
+  trace "[batchspend] batch_id=${batch_id}"
+  local batch_label=$(echo "${request}" | jq ".batchLabel")
+  trace "[batchspend] batch_label=${batch_label}"
+  local conf_target=$(echo "${request}" | jq ".confTarget")
+  trace "[batchspend] conf_target=${conf_target}"
+  local feerate=$(echo "${request}" | jq ".feeRate")
+  trace "[batchspend] feerate=${feerate}"
+
+  if [ "${batch_id}" = "null" ] && [ "${batch_label}" = "null" ]; then
+    # If batch_id and batch_label are null, use default batch
+    trace "[batchspend] Using default batch 1"
+    batch_id=1
+  fi
+
+  if [ "${batch_id}" = "null" ]; then
+    # Using batch_label
+    whereclause="label=${batch_label}"
+  else
+    whereclause="id=${batch_id}"
+  fi
+
+  local batch=$(sql "SELECT id, conf_target, feerate FROM batch WHERE ${whereclause}")
+  returncode=$?
+  trace_rc ${returncode}
+
+  if [ -z "${batch}" ]; then
+    # batchLabel not found
+    response='{"result":null,"error":{"code":-32700,"message":"batch not found","data":'${request}'}}'
+  else
+    # All good, let's try to batch spend!
+
+    # NOTYET
+    # We'll use supplied feerate
+    # If not supplied, we'll use supplied conf_target
+    # If not supplied, we'll use batch default feerate
+    # If not set, we'll use batch default conf_target
+    # If not set, default Bitcoin Core fee policy will be used
+
+    # We'll use the supplied conf_target
+    # If not supplied, we'll use the batch default conf_target
+    # If not set, default Bitcoin Core fee policy will be used
+
+    # if [ "${feerate}" != "null" ]; then
+    #   # If not null, let's nullify conf_target since feerate overrides it
+    #   conf_target=
+    #   trace "[batchspend] Overriding conf_target=${conf_target}"
+    # else
+    #   if [ "${conf_target}" = "null" ]; then
+    #     feerate=$(echo "${batch}" | cut -d '|' -f3)
+    #     if [ -z "${feerate}" ]; then
+    #       # If null, let's use batch conf_target
+    #       conf_target=$(echo "${batch}" | cut -d '|' -f2)
+    #     fi
+    #   fi
+    # fi
+
+    if [ "${conf_target}" = "null" ]; then
+      conf_target=$(echo "${batch}" | cut -d '|' -f2)
+      trace "[batchspend] Using batch default conf_target=${conf_target}"
+    fi
+
+    batch_id=$(echo "${batch}" | cut -d '|' -f1)
+
+    local batching=$(sql "SELECT address, amount, id, webhook_url FROM recipient WHERE tx_id IS NULL AND batch_id=${batch_id}")
+    trace "[batchspend] batching=${batching}"
+
+    local data
+    local recipientsjson
+    local webhooks_data
+    local id_inserted
+    local tx_details
+    local tx_raw_details
+    local address
+    local amount
+    local IFS=$'\n'
+    for row in ${batching}
+    do
+      trace "[batchspend] row=${row}"
+      address=$(echo "${row}" | cut -d '|' -f1)
+      trace "[batchspend] address=${address}"
+      amount=$(echo "${row}" | cut -d '|' -f2)
+      trace "[batchspend] amount=${amount}"
+      recipient_id=$(echo "${row}" | cut -d '|' -f3)
+      trace "[batchspend] recipient_id=${recipient_id}"
+      webhook_url=$(echo "${row}" | cut -d '|' -f4)
+      trace "[batchspend] webhook_url=${webhook_url}"
+
+      if [ -z "${recipientsjson}" ]; then
+        whereclause="\"${recipient_id}\""
+        recipientsjson="\"${address}\":${amount}"
+        webhooks_data="{\"outputId\":${recipient_id},\"address\":\"${address}\",\"amount\":${amount},\"webhookUrl\":\"${webhook_url}\"}"
+      else
+        whereclause="${whereclause},\"${recipient_id}\""
+        recipientsjson="${recipientsjson},\"${address}\":${amount}"
+        webhooks_data="${webhooks_data},{\"outputId\":${recipient_id},\"address\":\"${address}\",\"amount\":${amount},\"webhookUrl\":\"${webhook_url}\"}"
+      fi
+    done
+
+    local bitcoincore_args="{\"method\":\"sendmany\",\"params\":[\"\", {${recipientsjson}}"
+    if [ -n "${conf_target}" ]; then
+      bitcoincore_args="${bitcoincore_args}, 1, \"\", null, null, ${conf_target}"
+    fi
+    bitcoincore_args="${bitcoincore_args}]}"
+    data=$(send_to_spender_node "${bitcoincore_args}")
+    returncode=$?
+    trace_rc ${returncode}
+    trace "[batchspend] data=${data}"
+
+    if [ "${returncode}" -eq 0 ]; then
+      local txid=$(echo "${data}" | jq -r ".result")
+      trace "[batchspend] txid=${txid}"
+
+      # Let's get transaction details on the spending wallet so that we have fee information
+      tx_details=$(get_transaction ${txid} "spender")
+      tx_raw_details=$(get_rawtransaction ${txid})
+
+      # Amounts and fees are negative when spending so we absolute those fields
+      local tx_hash=$(echo "${tx_raw_details}" | jq '.result.hash')
+      local tx_ts_firstseen=$(echo "${tx_details}" | jq '.result.timereceived')
+      local tx_amount=$(echo "${tx_details}" | jq '.result.amount | fabs' | awk '{ printf "%.8f", $0 }')
+      local tx_size=$(echo "${tx_raw_details}" | jq '.result.size')
+      local tx_vsize=$(echo "${tx_raw_details}" | jq '.result.vsize')
+      local tx_replaceable=$(echo "${tx_details}" | jq -r '.result."bip125-replaceable"')
+      trace "[batchspend] tx_replaceable=${tx_replaceable}"
+      tx_replaceable=$([ "${tx_replaceable}" = "yes" ] && echo "true" || echo "false")
+      trace "[batchspend] tx_replaceable=${tx_replaceable}"
+      local fees=$(echo "${tx_details}" | jq '.result.fee | fabs' | awk '{ printf "%.8f", $0 }')
+      # Sometimes raw tx are too long to be passed as paramater, so let's write
+      # it to a temp file for it to be read by sqlite3 and then delete the file
+      echo "${tx_raw_details}" > batchspend-rawtx-${txid}.blob
+
+      # Get the info on the batch before setting it to done
+      row=$(sql "SELECT COUNT(id), COALESCE(MIN(inserted_ts), 0), COALESCE(SUM(amount), 0.00000000) FROM recipient WHERE tx_id IS NULL AND batch_id=${batch_id}")
+
+      # Let's insert the txid in our little DB -- then we'll already have it when receiving confirmation
+      id_inserted=$(sql "INSERT OR IGNORE INTO tx (txid, hash, confirmations, timereceived, fee, size, vsize, is_replaceable, raw_tx) VALUES (\"${txid}\", ${tx_hash}, 0, ${tx_ts_firstseen}, ${fees}, ${tx_size}, ${tx_vsize}, ${tx_replaceable}, readfile('batchspend-rawtx-${txid}.blob')); SELECT LAST_INSERT_ROWID();")
+      returncode=$?
+      trace_rc ${returncode}
+      if [ "${returncode}" -eq 0 ]; then
+        if [ "${id_inserted}" -eq 0 ]; then
+          id_inserted=$(sql "SELECT id FROM tx WHERE txid=\"${txid}\"")
+        fi
+        trace "[batchspend] id_inserted: ${id_inserted}"
+        sql "UPDATE recipient SET tx_id=${id_inserted} WHERE id IN (${whereclause})"
+        trace_rc $?
+      fi
+
+      # Use the selected row above (before the insert)
+      local count=$(echo "${row}" | cut -d '|' -f1)
+      trace "[batchspend] count=${count}"
+      local oldest=$(echo "${row}" | cut -d '|' -f2)
+      trace "[batchspend] oldest=${oldest}"
+      local total=$(echo "${row}" | cut -d '|' -f3)
+      trace "[batchspend] total=${total}"
+
+      response='{"result":{"batchId":'${batch_id}',"nbOutputs":'${count}',"oldest":"'${oldest}'","total":'${total}
+      response="${response},\"txid\":\"${txid}\",\"hash\":${tx_hash},\"details\":{\"firstseen\":${tx_ts_firstseen},\"size\":${tx_size},\"vsize\":${tx_vsize},\"replaceable\":${tx_replaceable},\"fee\":${fees}},\"outputs\":{${recipientsjson}}}"
+      response="${response},\"error\":null}"
+
+      # Delete the temp file containing the raw tx (see above)
+      rm batchspend-rawtx-${txid}.blob
+
+      batch_webhooks "[${webhooks_data}]" '"batchId":'${batch_id}',"txid":"'${txid}'","hash":'${tx_hash}',"details":{"firstseen":'${tx_ts_firstseen}',"size":'${tx_size}',"vsize":'${tx_vsize}',"replaceable":'${tx_replaceable}',"fee":'${fees}'}'
+
+    else
+      local message=$(echo "${data}" | jq -e ".error.message")
+      response='{"result":null,"error":{"code":-32700,"message":'${message}',"data":'${request}'}}'
+    fi
+  fi
+
+  trace "[batchspend] responding=${response}"
+  echo "${response}"
+}
+
+batch_check_webhooks() {
+  trace "Entering batch_check_webhooks()..."
+
+  local webhooks_data
+  local address
+  local amount
+  local recipient_id
+  local webhook_url
+  local batch_id
+  local txid
+  local tx_hash
+  local tx_ts_firstseen
+  local tx_size
+  local tx_vsize
+  local tx_replaceable
+  local fees
+
+  local batching=$(sql "SELECT address, amount, r.id, webhook_url, b.id, t.txid, t.hash, t.timereceived, t.fee, t.size, t.vsize, t.is_replaceable FROM recipient r, batch b, tx t WHERE r.batch_id=b.id AND r.tx_id=t.id AND NOT calledback AND tx_id IS NOT NULL AND webhook_url IS NOT NULL")
+  trace "[batch_check_webhooks] batching=${batching}"
+
+  local IFS=$'\n'
+  for row in ${batching}
+  do
+    trace "[batch_check_webhooks] row=${row}"
+    address=$(echo "${row}" | cut -d '|' -f1)
+    trace "[batch_check_webhooks] address=${address}"
+    amount=$(echo "${row}" | cut -d '|' -f2)
+    trace "[batch_check_webhooks] amount=${amount}"
+    recipient_id=$(echo "${row}" | cut -d '|' -f3)
+    trace "[batch_check_webhooks] recipient_id=${recipient_id}"
+    webhook_url=$(echo "${row}" | cut -d '|' -f4)
+    trace "[batch_check_webhooks] webhook_url=${webhook_url}"
+    batch_id=$(echo "${row}" | cut -d '|' -f5)
+    trace "[batch_check_webhooks] batch_id=${batch_id}"
+    txid=$(echo "${row}" | cut -d '|' -f6)
+    trace "[batch_check_webhooks] txid=${txid}"
+    tx_hash=$(echo "${row}" | cut -d '|' -f7)
+    trace "[batch_check_webhooks] tx_hash=${tx_hash}"
+    tx_ts_firstseen=$(echo "${row}" | cut -d '|' -f8)
+    trace "[batch_check_webhooks] tx_ts_firstseen=${tx_ts_firstseen}"
+    tx_size=$(echo "${row}" | cut -d '|' -f9)
+    trace "[batch_check_webhooks] tx_size=${tx_size}"
+    tx_vsize=$(echo "${row}" | cut -d '|' -f10)
+    trace "[batch_check_webhooks] tx_vsize=${tx_vsize}"
+    tx_replaceable=$(echo "${row}" | cut -d '|' -f11)
+    trace "[batch_check_webhooks] tx_replaceable=${tx_replaceable}"
+    fees=$(echo "${row}" | cut -d '|' -f12)
+    trace "[batch_check_webhooks] fees=${fees}"
+
+    webhooks_data="{\"outputId\":${recipient_id},\"address\":\"${address}\",\"amount\":${amount},\"webhookUrl\":\"${webhook_url}\"}"
+
+    batch_webhooks "[${webhooks_data}]" '"batchId":'${batch_id}',"txid":"'${txid}'","hash":"'${tx_hash}'","details":{"firstseen":'${tx_ts_firstseen}',"size":'${tx_size}',"vsize":'${tx_vsize}',"replaceable":'${tx_replaceable}',"fee":'${fees}'}'
+  done
+}
+
+batch_webhooks() {
+  trace "Entering batch_webhooks()..."
+
+  # webhooks_data:
+  # {"outputId":1,"address":"1abc","amount":0.12,"webhookUrl":"https://bleah.com/batchwebhook"}"
+  local webhooks_data=${1}
+  trace "[batch_webhooks] webhooks_data=${webhooks_data}"
+
+  # tx:
+  # {"batchId":1,"txid":"abc123","hash":"abc123","details":{"firstseen":123123,"size":200,"vsize":141,"replaceable":true,"fee":0.00001}}'
+  local tx=${2}
+  trace "[batch_webhooks] tx=${tx}"
+
+  local outputs
+  local output_id
+  local address
+  local amount
+  local webhook_url
+  local body
+  local successful_recipient_ids
+  local returncode
+
+  outputs=$(echo "${webhooks_data}" | jq -Mc ".[]")
+
+  local output
+  local IFS=$'\n'
+  for output in ${outputs}
+  do
+    webhook_url=$(echo "${output}" | jq -r ".webhookUrl")
+    trace "[batch_webhooks] webhook_url=${webhook_url}"
+
+    if [ -z "${webhook_url}" ] || [ "${webhook_url}" = "null" ]; then
+      trace "[batch_webhooks] Empty webhook_url, skipping"
+      continue
+    fi
+
+    output_id=$(echo "${output}" | jq ".outputId")
+    trace "[batch_webhooks] output_id=${output_id}"
+    address=$(echo "${output}" | jq ".address")
+    trace "[batch_webhooks] address=${address}"
+    amount=$(echo "${output}" | jq ".amount")
+    trace "[batch_webhooks] amount=${amount}"
+
+    body='{"outputId":'${output_id}',"address":'${address}',"amount":'${amount}','${tx}'}'
+    trace "[batch_webhooks] body=${body}"
+
+    notify_web "${webhook_url}" "${body}" ${TOR_ADDR_WATCH_WEBHOOKS}
+    returncode=$?
+    trace_rc ${returncode}
+
+    if [ "${returncode}" -eq 0 ]; then
+      if [ -n "${successful_recipient_ids}" ]; then
+        successful_recipient_ids="${successful_recipient_ids},${output_id}"
+      else
+        successful_recipient_ids="${output_id}"
+      fi
+    else
+      trace "[batch_webhooks] callback failed, won't set to true in DB"
+    fi
+  done
+
+  sql "UPDATE recipient SET calledback=1, calledback_ts=CURRENT_TIMESTAMP WHERE id IN (${successful_recipient_ids})"
+  trace_rc $?
+}
+
+listbatches() {
+  trace "Entering listbatches()..."
+
+  # curl (GET) http://192.168.111.152:8080/listbatches
+  #
+  # {"result":[
+  #   {"batchId":1,"batchLabel":"default","confTarget":6,"nbOutputs":12,"oldest":123123,"pendingTotal":0.86990143},
+  #   {"batchId":2,"batchLabel":"lowfee","confTarget":32,"nbOutputs":44,"oldest":123123,"pendingTotal":0.49827387},
+  #   {"batchId":3,"batchLabel":"highfee","confTarget":2,"nbOutputs":7,"oldest":123123,"pendingTotal":4.16843782}
+  #  ],
+  #  "error":null}
+
+
+  local batches=$(sql "SELECT b.id, '{\"batchId\":' || b.id || ',\"batchLabel\":\"' || b.label || '\",\"confTarget\":' || conf_target || ',\"nbOutputs\":' || COUNT(r.id) || ',\"oldest\":\"' ||COALESCE(MIN(r.inserted_ts), 0) || '\",\"pendingTotal\":' ||COALESCE(SUM(amount), 0.00000000) || '}' FROM batch b LEFT JOIN recipient r ON r.batch_id=b.id AND r.tx_id IS NULL GROUP BY b.id")
+  trace "[listbatches] batches=${batches}"
+
+  local returncode
+  local response
+  local batch
+  local jsonstring
+  local IFS=$'\n'
+  for batch in ${batches}
+  do
+    jsonstring=$(echo ${batch} | cut -d '|' -f2)
+    if [ -z "${response}" ]; then
+      response='{"result":['${jsonstring}
+    else
+      response="${response},${jsonstring}"
+    fi
+  done
+
+  response=${response}'],"error":null}'
+  trace "[listbatches] responding=${response}"
+  echo "${response}"
+}
+
+getbatch() {
+  trace "Entering getbatch()..."
+
+  # POST (GET) http://192.168.111.152:8080/getbatch
+  #
+  # args:
+  # - batchId, optional, id of the batch to spend, overrides batchLabel, default batch will be spent if not supplied
+  # - batchLabel, optional, label of the batch to spend, default batch will be spent if not supplied
+  #
+  # response:
+  # {"result":{"batchId":1,"batchLabel":"default","confTarget":6,"nbOutputs":12,"oldest":123123,"pendingTotal":0.86990143},"error":null}
+  #
+  # BODY {}
+  # BODY {"batchId":34}
+
+  local request=${1}
+  local response
+  local returncode=0
+  local batch
+  local whereclause
+
+  local batch_id=$(echo "${request}" | jq ".batchId")
+  trace "[getbatch] batch_id=${batch_id}"
+  local batch_label=$(echo "${request}" | jq ".batchLabel")
+  trace "[getbatch] batch_label=${batch_label}"
+
+  if [ "${batch_id}" = "null" ] && [ "${batch_label}" = "null" ]; then
+    # If batch_id and batch_label are null, use default batch
+    trace "[getbatch] Using default batch 1"
+    batch_id=1
+  fi
+
+  if [ "${batch_id}" = "null" ]; then
+    # Using batch_label
+    whereclause="b.label=${batch_label}"
+  else
+    # Using batch_id
+    whereclause="b.id=${batch_id}"
+  fi
+
+  batch=$(sql "SELECT b.id, '{\"batchId\":' || b.id || ',\"batchLabel\":\"' || b.label || '\",\"confTarget\":' || conf_target || ',\"nbOutputs\":' || COUNT(r.id) || ',\"oldest\":\"' ||COALESCE(MIN(r.inserted_ts), 0) || '\",\"pendingTotal\":' ||COALESCE(SUM(amount), 0.00000000) || '}' FROM batch b LEFT JOIN recipient r ON r.batch_id=b.id AND r.tx_id IS NULL WHERE ${whereclause} GROUP BY b.id")
+  trace "[getbatch] batch=${batch}"
+
+  if [ -n "${batch}" ]; then
+    batch=$(echo "${batch}" | cut -d '|' -f2)
+    response='{"result":'${batch}',"error":null}'
+  else
+    response='{"result":null,"error":{"code":-32700,"message":"batch not found","data":'${request}'}}'
+  fi
+
+  echo "${response}"
+}
+
+getbatchdetails() {
+  trace "Entering getbatchdetails()..."
+
+  # POST (GET) http://192.168.111.152:8080/getbatchdetails
+  #
+  # args:
+  # - batchId, optional, id of the batch to spend, overrides batchLabel, default batch will be spent if not supplied
+  # - batchLabel, optional, label of the batch to spend, default batch will be spent if not supplied
+  # - txid, optional, if you want the details of an executed batch, supply the batch txid, will return current pending batch
+  #     if not supplied
+  #
+  # response:
+  # {"result":{
+  #    "batchId":34,
+  #    "batchLabel":"Special batch for a special client",
+  #    "confTarget":6,
+  #    "nbOutputs":83,
+  #    "oldest":123123,
+  #    "total":10.86990143,
+  #    "txid":"af867c86000da76df7ddb1054b273ca9e034e8c89d049b5b2795f9f590f67648",
+  #    "hash":"af867c86000da76df7ddb1054b273ca9e034e8c89d049b5b2795f9f590f67648",
+  #    "details":{
+  #      "firstseen":123123,
+  #      "size":424,
+  #      "vsize":371,
+  #      "replaceable":yes,
+  #      "fee":0.00004112,
+  #      "outputs":[
+  #        {"label":"order 1234","address":"1abc","amount":0.12},
+  #        {"label":"order 2345","address":"3abc","amount":0.66},
+  #        "bc1abc":2.848,
+  #        ...
+  #      ]
+  #    }
+  # },"error":null}
+  #
+  # BODY {}
+  # BODY {"batchId":34}
+
+  local request=${1}
+  local response
+  local returncode=0
+  local batch
+  local tx
+  local outputsjson
+  local whereclause
+
+  local batch_id=$(echo "${request}" | jq ".batchId")
+  trace "[getbatchdetails] batch_id=${batch_id}"
+  local batch_label=$(echo "${request}" | jq ".batchLabel")
+  trace "[getbatchdetails] batch_label=${batch_label}"
+  local txid=$(echo "${request}" | jq ".txid")
+  trace "[getbatchdetails] txid=${txid}"
+
+  if [ "${batch_id}" = "null" ] && [ "${batch_label}" = "null" ]; then
+    # If batch_id and batch_label are null, use default batch
+    trace "[getbatchdetails] Using default batch 1"
+    batch_id=1
+  fi
+
+  if [ "${batch_id}" = "null" ]; then
+    # Using batch_label
+    whereclause="b.label=${batch_label}"
+  else
+    # Using batch_id
+    whereclause="b.id=${batch_id}"
+  fi
+
+  if [ "${txid}" != "null" ]; then
+    # Using txid
+    whereclause="${whereclause} AND t.txid=${txid}"
+  else
+    # null txid
+    whereclause="${whereclause} AND t.txid IS NULL"
+    outerclause="AND r.tx_id IS NULL"
+  fi
+
+  # First get the batch summary
+  batch=$(sql "SELECT b.id, COALESCE(t.id, 0), '{\"batchId\":' || b.id || ',\"batchLabel\":\"' || b.label || '\",\"confTarget\":' || conf_target || ',\"nbOutputs\":' || COUNT(r.id) || ',\"oldest\":\"' ||COALESCE(MIN(r.inserted_ts), 0) || '\",\"total\":' ||COALESCE(SUM(amount), 0.00000000) FROM batch b LEFT JOIN recipient r ON r.batch_id=b.id ${outerclause} LEFT JOIN tx t ON t.id=r.tx_id WHERE ${whereclause} GROUP BY b.id")
+  trace "[getbatchdetails] batch=${batch}"
+
+  if [ -n "${batch}" ]; then
+    local tx_id
+    local outputs
+
+    tx_id=$(echo "${batch}" | cut -d '|' -f2)
+    trace "[getbatchdetails] tx_id=${tx_id}"
+    if [ -n "${tx_id}" ]; then
+      # Using txid
+      outerclause="AND r.tx_id=${tx_id}"
+    else
+      # null txid
+      outerclause="AND r.tx_id IS NULL"
+    fi
+
+    tx=$(sql "SELECT '\"txid\":\"' || txid || '\",\"hash\":\"' || hash || '\",\"details\":{\"firstseen\":' || timereceived || ',\"size\":' || size || ',\"vsize\":' || vsize || ',\"replaceable\":' || is_replaceable || ',\"fee\":' || fee || '}' FROM tx WHERE id=${tx_id}")
+
+    batch_id=$(echo "${batch}" | cut -d '|' -f1)
+    outputs=$(sql "SELECT '{\"outputId\":' || id || ',\"outputLabel\":\"' || COALESCE(label, '') || '\",\"address\":\"' || address || '\",\"amount\":' || amount || ',\"addedTimestamp\":\"' || inserted_ts || '\"}' FROM recipient r WHERE batch_id=${batch_id} ${outerclause}")
+
+    local output
+    local IFS=$'\n'
+    for output in ${outputs}
+    do
+      if [ -n "${outputsjson}" ]; then
+        outputsjson="${outputsjson},${output}"
+      else
+        outputsjson="${output}"
+      fi
+    done
+
+    batch=$(echo "${batch}" | cut -d '|' -f3)
+
+    response='{"result":'${batch}
+    if [ -n "${tx}" ]; then
+      response=${response}','${tx}
+    else
+      response=${response}',"txid":null,"hash":null'
+    fi
+    response=${response}',"outputs":['${outputsjson}']},"error":null}'
+  else
+    response='{"result":null,"error":{"code":-32700,"message":"batch not found or no corresponding txid","data":'${request}'}}'
+  fi
+
+  echo "${response}"
+
+}
+
+# curl localhost:8888/listbatches | jq
+# curl -d '{}' localhost:8888/getbatch | jq
+# curl -d '{}' localhost:8888/getbatchdetails | jq
+# curl -d '{"outputLabel":"test002","address":"1abd","amount":0.0002}' localhost:8888/addtobatch | jq
+# curl -d '{}' localhost:8888/batchspend | jq
+# curl -d '{"outputId":1}' localhost:8888/removefrombatch | jq
+
+# curl -d '{"batchLabel":"lowfees","confTarget":32}' localhost:8888/createbatch | jq
+# curl localhost:8888/listbatches | jq
+
+# curl -d '{"batchLabel":"lowfees"}' localhost:8888/getbatch | jq
+# curl -d '{"batchLabel":"lowfees"}' localhost:8888/getbatchdetails | jq
+# curl -d '{"batchLabel":"lowfees","outputLabel":"test002","address":"1abd","amount":0.0002}' localhost:8888/addtobatch | jq
+# curl -d '{"batchLabel":"lowfees"}' localhost:8888/batchspend | jq
+# curl -d '{"batchLabel":"lowfees","outputId":9}' localhost:8888/removefrombatch | jq
diff --git a/proxy_docker/app/script/blockchainrpc.sh b/proxy_docker/app/script/blockchainrpc.sh
index 7d85aec..31ed9b6 100644
--- a/proxy_docker/app/script/blockchainrpc.sh
+++ b/proxy_docker/app/script/blockchainrpc.sh
@@ -103,3 +103,14 @@ validateaddress() {
   send_to_watcher_node "${data}"
   return $?
 }
+
+bitcoin_estimatesmartfee() {
+  trace "Entering bitcoin_estimatesmartfee()..."
+
+  local conf_target=${1}
+  trace "[bitcoin_estimatesmartfee] conf_target=${conf_target}"
+  local data="{\"method\":\"estimatesmartfee\",\"params\":[\"${conf_target}\"]}"
+  trace "[bitcoin_estimatesmartfee] data=${data}"
+  send_to_watcher_node "${data}"
+  return $?
+}
diff --git a/proxy_docker/app/script/callbacks_job.sh b/proxy_docker/app/script/callbacks_job.sh
index 3bc7a06..6bc7219 100644
--- a/proxy_docker/app/script/callbacks_job.sh
+++ b/proxy_docker/app/script/callbacks_job.sh
@@ -45,7 +45,7 @@ do_callbacks() {
   done
 
   callbacks=$(sql "SELECT id, label, bolt11, callback_url, payment_hash, msatoshi, status, pay_index, msatoshi_received, paid_at, description, expires_at FROM ln_invoice WHERE NOT calledback AND callback_failed")
-  trace "[do_callbacks LN] ln_callbacks=${callbacks}"
+  trace "[do_callbacks] ln_callbacks=${callbacks}"
 
   for row in ${callbacks}
   do
diff --git a/proxy_docker/app/script/newblock.sh b/proxy_docker/app/script/newblock.sh
index 7ecfa09..eb4c49d 100644
--- a/proxy_docker/app/script/newblock.sh
+++ b/proxy_docker/app/script/newblock.sh
@@ -3,6 +3,7 @@
 . ./trace.sh
 . ./callbacks_txid.sh
 . ./blockchainrpc.sh
+. ./batching.sh
 
 newblock() {
   trace "Entering newblock()..."
@@ -22,4 +23,5 @@ newblock() {
   trace_rc ${returncode}
 
   do_callbacks_txid
+  batch_check_webhooks
 }
diff --git a/proxy_docker/app/script/requesthandler.sh b/proxy_docker/app/script/requesthandler.sh
index 63f63a1..bbf3836 100644
--- a/proxy_docker/app/script/requesthandler.sh
+++ b/proxy_docker/app/script/requesthandler.sh
@@ -20,6 +20,7 @@
 . ./call_lightningd.sh
 . ./ots.sh
 . ./newblock.sh
+. ./batching.sh
 
 main() {
   trace "Entering main()..."
@@ -300,21 +301,226 @@ main() {
           response_to_client "${response}" ${?}
           break
           ;;
+        createbatch)
+          # POST http://192.168.111.152:8080/createbatch
+          #
+          # args:
+          # - batchLabel, optional, id can be used to reference the batch
+          # - confTarget, optional, overriden by batchspend's confTarget, default Bitcoin Core conf_target will be used if not supplied
+          # NOTYET - feeRate, sat/vB, optional, overrides confTarget if supplied, overriden by batchspend's feeRate, default Bitcoin Core fee policy will be used if not supplied
+          #
+          # response:
+          # - batchId, the batch id
+          #
+          # BODY {"batchLabel":"lowfees","confTarget":32}
+          # NOTYET BODY {"batchLabel":"highfees","feeRate":231.8}
+
+          response=$(createbatch "${line}")
+          response_to_client "${response}" ${?}
+          break
+          ;;
+        updatebatch)
+          # POST http://192.168.111.152:8080/updatebatch
+          #
+          # args:
+          # - batchId, optional, batch id to update, will update default batch if not supplied
+          # - batchLabel, optional, id can be used to reference the batch, will update default batch if not supplied, if id is present then change the label with supplied text
+          # - confTarget, optional, new confirmation target for the batch
+          # NOTYET - feeRate, sat/vB, optional, new feerate for the batch
+          #
+          # response:
+          # - batchId, the batch id
+          # - batchLabel, the batch label
+          # - confTarget, the batch default confirmation target
+          # NOTYET - feeRate, the batch default feerate
+          #
+          # BODY {"batchId":5,"confTarget":12}
+          # NOTYET BODY {"batchLabel":"highfees","feeRate":400}
+          # NOTYET BODY {"batchId":3,"label":"ultrahighfees","feeRate":800}
+          # BODY {"batchLabel":"fast","confTarget":2}
+
+          response=$(updatebatch "${line}")
+          response_to_client "${response}" ${?}
+          break
+          ;;
         addtobatch)
           # POST http://192.168.111.152:8080/addtobatch
+          #
+          # args:
+          # - address, required, desination address
+          # - amount, required, amount to send to the destination address
+          # - outputLabel, optional, if you want to reference this output
+          # - batchId, optional, the id of the batch to which the output will be added, default batch if not supplied, overrides batchLabel
+          # - batchLabel, optional, the label of the batch to which the output will be added, default batch if not supplied
+          # - webhookUrl, optional, the webhook to call when the batch is broadcast
+          #
+          # response:
+          # - outputId, the id of the added output
+          # - nbOutputs, the number of outputs currently in the batch
+          # - oldest, the timestamp of the oldest output in the batch
+          # - pendingTotal, the current sum of the batch's output amounts
+          #
           # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233}
+          # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"batchId":34,"webhookUrl":"https://myCypherApp:3000/batchExecuted"}
+          # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"batchLabel":"lowfees","webhookUrl":"https://myCypherApp:3000/batchExecuted"}
+          # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"batchId":34,"webhookUrl":"https://myCypherApp:3000/batchExecuted"}
 
-          response=$(addtobatching $(echo "${line}" | jq -r ".address") $(echo "${line}" | jq ".amount"))
+          response=$(addtobatch "${line}")
+          response_to_client "${response}" ${?}
+          break
+          ;;
+        removefrombatch)
+          # POST http://192.168.111.152:8080/removefrombatch
+          #
+          # args:
+          # - outputId, required, id of the output to remove
+          #
+          # response:
+          # - outputId, the id of the removed output if found
+          # - nbOutputs, the number of outputs currently in the batch
+          # - oldest, the timestamp of the oldest output in the batch
+          # - pendingTotal, the current sum of the batch's output amounts
+          #
+          # BODY {"outputId":72}
+
+          response=$(removefrombatch "${line}")
           response_to_client "${response}" ${?}
           break
           ;;
         batchspend)
-          # GET http://192.168.111.152:8080/batchspend
+          # POST http://192.168.111.152:8080/batchspend
+          #
+          # args:
+          # - batchId, optional, id of the batch to spend, overrides batchLabel, default batch will be spent if not supplied
+          # - batchLabel, optional, label of the batch to spend, default batch will be spent if not supplied
+          # - confTarget, optional, overrides default value of createbatch, default to value of createbatch, default Bitcoin Core conf_target will be used if not supplied
+          # NOTYET - feeRate, optional, overrides confTarget if supplied, overrides default value of createbatch, default to value of createbatch, default Bitcoin Core value will be used if not supplied
+          #
+          # response:
+          # - txid, the transaction txid
+          # - hash, the transaction hash
+          # - nbOutputs, the number of outputs spent in the batch
+          # - oldest, the timestamp of the oldest output in the spent batch
+          # - total, the sum of the spent batch's output amounts
+          # - tx details: size, vsize, replaceable, fee
+          # - outputs
+          #
+          # {"result":{
+          #    "batchId":34,
+          #    "batchLabel":"Special batch for a special client",
+          #    "confTarget":6,
+          #    "nbOutputs":83,
+          #    "oldest":123123,
+          #    "total":10.86990143,
+          #    "txid":"af867c86000da76df7ddb1054b273ca9e034e8c89d049b5b2795f9f590f67648",
+          #    "hash":"af867c86000da76df7ddb1054b273ca9e034e8c89d049b5b2795f9f590f67648",
+          #    "details":{
+          #      "firstseen":123123,
+          #      "size":424,
+          #      "vsize":371,
+          #      "replaceable":yes,
+          #      "fee":0.00004112
+          #    },
+          #    "outputs":{
+          #      "1abc":0.12,
+          #      "3abc":0.66,
+          #      "bc1abc":2.848,
+          #      ...
+          #    }
+          #  }
+          # },"error":null}
+          #
+          # BODY {}
+          # BODY {"batchId":34,"confTarget":12}
+          # NOTYET BODY {"batchLabel":"highfees","feeRate":233.7}
+          # BODY {"batchId":411,"confTarget":6}
 
           response=$(batchspend "${line}")
           response_to_client "${response}" ${?}
           break
           ;;
+        getbatch)
+          # POST (GET) http://192.168.111.152:8080/getbatch
+          #
+          # args:
+          # - batchId, optional, id of the batch to spend, overrides batchLabel, default batch will be spent if not supplied
+          # - batchLabel, optional, label of the batch to spend, default batch will be spent if not supplied
+          #
+          # response:
+          # {"result":{"batchId":1,"batchLabel":"default","confTarget":6,"nbOutputs":12,"oldest":123123,"pendingTotal":0.86990143},"error":null}
+          #
+          # BODY {}
+          # BODY {"batchId":34}
+
+          response=$(getbatch "${line}")
+          response_to_client "${response}" ${?}
+          break
+          ;;
+        getbatchdetails)
+          # POST (GET) http://192.168.111.152:8080/getbatchdetails
+          #
+          # args:
+          # - batchId, optional, id of the batch to spend, overrides batchLabel, default batch will be spent if not supplied
+          # - batchLabel, optional, label of the batch to spend, default batch will be spent if not supplied
+          # - txid, optional, if you want the details of an executed batch, supply the batch txid, will return current pending batch
+          #     if not supplied
+          #
+          # response:
+          # {"result":{
+          #    "batchId":34,
+          #    "batchLabel":"Special batch for a special client",
+          #    "confTarget":6,
+          #    "nbOutputs":83,
+          #    "oldest":123123,
+          #    "total":10.86990143,
+          #    "txid":"af867c86000da76df7ddb1054b273ca9e034e8c89d049b5b2795f9f590f67648",
+          #    "hash":"af867c86000da76df7ddb1054b273ca9e034e8c89d049b5b2795f9f590f67648",
+          #    "details":{
+          #      "firstseen":123123,
+          #      "size":424,
+          #      "vsize":371,
+          #      "replaceable":yes,
+          #      "fee":0.00004112
+          #    },
+          #    "outputs":[
+          #      "1abc":0.12,
+          #      "3abc":0.66,
+          #      "bc1abc":2.848,
+          #      ...
+          #    ]
+          #  }
+          # },"error":null}
+          #
+          # BODY {}
+          # BODY {"batchId":34}
+
+          response=$(getbatchdetails "${line}")
+          response_to_client "${response}" ${?}
+          break
+          ;;
+        listbatches)
+          # curl (GET) http://192.168.111.152:8080/listbatches
+          #
+          # response:
+          # {"result":[
+          #   {"batchId":1,"batchLabel":"default","confTarget":6,"nbOutputs":12,"oldest":123123,"pendingTotal":0.86990143},
+          #   {"batchId":2,"batchLabel":"lowfee","confTarget":32,"nbOutputs":44,"oldest":123123,"pendingTotal":0.49827387},
+          #   {"batchId":3,"batchLabel":"highfee","confTarget":2,"nbOutputs":7,"oldest":123123,"pendingTotal":4.16843782}
+          #  ],
+          #  "error":null}
+
+          response=$(listbatches)
+          response_to_client "${response}" ${?}
+          break
+          ;;
+        bitcoin_estimatesmartfee)
+          # POST http://192.168.111.152:8080/bitcoin_estimatesmartfee
+          # BODY {"confTarget":2}
+
+          response=$(bitcoin_estimatesmartfee $(echo "${line}" | jq -r ".confTarget"))
+          response_to_client "${response}" ${?}
+          break
+          ;;
         deriveindex)
           # curl GET http://192.168.111.152:8080/deriveindex/25-30
           # curl GET http://192.168.111.152:8080/deriveindex/34
diff --git a/proxy_docker/app/script/test-batching.sh b/proxy_docker/app/script/test-batching.sh
new file mode 100755
index 0000000..eb2bab9
--- /dev/null
+++ b/proxy_docker/app/script/test-batching.sh
@@ -0,0 +1,322 @@
+#!/bin/sh
+
+# curl localhost:8888/listbatches | jq
+# curl -d '{}' localhost:8888/getbatch | jq
+# curl -d '{}' localhost:8888/getbatchdetails | jq
+# curl -d '{"outputLabel":"test002","address":"1abd","amount":0.0002}' localhost:8888/addtobatch | jq
+# curl -d '{}' localhost:8888/batchspend | jq
+# curl -d '{"outputId":1}' localhost:8888/removefrombatch | jq
+
+# curl -d '{"batchLabel":"lowfees","confTarget":32}' localhost:8888/createbatch | jq
+# curl localhost:8888/listbatches | jq
+
+# curl -d '{"batchLabel":"lowfees"}' localhost:8888/getbatch | jq
+# curl -d '{"batchLabel":"lowfees"}' localhost:8888/getbatchdetails | jq
+# curl -d '{"batchLabel":"lowfees","outputLabel":"test002","address":"1abd","amount":0.0002}' localhost:8888/addtobatch | jq
+# curl -d '{"batchLabel":"lowfees"}' localhost:8888/batchspend | jq
+# curl -d '{"batchLabel":"lowfees","outputId":9}' localhost:8888/removefrombatch | jq
+
+testbatching() {
+  local response
+  local id
+  local id2
+  local data
+  local data2
+  local address1
+  local address2
+  local amount1
+  local amount2
+
+  local url1="$(hostname):1111/callback"
+  echo "url1=${url1}"
+  local url2="$(hostname):1112/callback"
+  echo "url2=${url2}"
+
+  # List batches (should show at least empty default batch)
+  echo "Testing listbatches..."
+  response=$(curl -s proxy:8888/listbatches)
+  echo "response=${response}"
+  id=$(echo "${response}" | jq ".result[0].batchId")
+  echo "batchId=${id}"
+  if [ "${id}" -ne "1" ]; then
+    exit 10
+  fi
+  echo "Tested listbatches."
+
+  # getbatch the default batch
+  echo "Testing getbatch..."
+  response=$(curl -sd '{}' localhost:8888/getbatch)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchLabel")
+  echo "batchLabel=${data}"
+  if [ "${data}" != "default" ]; then
+    exit 20
+  fi
+
+  response=$(curl -sd '{"batchId":1}' localhost:8888/getbatch)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchLabel")
+  echo "batchLabel=${data}"
+  if [ "${data}" != "default" ]; then
+    exit 25
+  fi
+  echo "Tested getbatch."
+
+  # getbatchdetails the default batch
+  echo "Testing getbatchdetails..."
+  response=$(curl -sd '{}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchLabel")
+  echo "batchLabel=${data}"
+  if [ "${data}" != "default" ]; then
+    exit 30
+  fi
+  echo "${response}" | jq -e ".result.outputs"
+  if [ "$?" -ne 0 ]; then
+    exit 32
+  fi
+
+  response=$(curl -sd '{"batchId":1}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchLabel")
+  echo "batchLabel=${data}"
+  if [ "${data}" != "default" ]; then
+    exit 35
+  fi
+  echo "${response}" | jq -e ".result.outputs"
+  if [ "$?" -ne 0 ]; then
+    exit 37
+  fi
+  echo "Tested getbatchdetails."
+
+  # addtobatch to default batch
+  echo "Testing addtobatch..."
+  response=$(curl -sd '{"outputLabel":"test001","address":"test001","amount":0.001}' localhost:8888/addtobatch)
+  echo "response=${response}"
+  id=$(echo "${response}" | jq ".result.batchId")
+  echo "batchId=${id}"
+  if [ "${id}" -ne "1" ]; then
+    exit 40
+  fi
+  id=$(echo "${response}" | jq -e ".result.outputId")
+  if [ "$?" -ne 0 ]; then
+    exit 42
+  fi
+  echo "outputId=${id}"
+
+  response=$(curl -sd '{"batchId":1,"outputLabel":"test002","address":"test002","amount":0.002}' localhost:8888/addtobatch)
+  echo "response=${response}"
+  id2=$(echo "${response}" | jq ".result.batchId")
+  echo "batchId=${id2}"
+  if [ "${id2}" -ne "1" ]; then
+    exit 40
+  fi
+  id2=$(echo "${response}" | jq -e ".result.outputId")
+  if [ "$?" -ne 0 ]; then
+    exit 42
+  fi
+  echo "outputId=${id2}"
+  echo "Tested addtobatch."
+
+  # batchspend default batch
+  echo "Testing batchspend..."
+  response=$(curl -sd '{}' localhost:8888/batchspend)
+  echo "response=${response}"
+  echo "${response}" | jq -e ".error"
+  if [ "$?" -ne 0 ]; then
+    exit 44
+  fi
+  echo "Tested batchspend."
+
+  # getbatchdetails the default batch
+  echo "Testing getbatchdetails..."
+  response=$(curl -sd '{}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq ".result.nbOutputs")
+  echo "nbOutputs=${data}"
+  echo "Tested getbatchdetails."
+
+  # removefrombatch from default batch
+  echo "Testing removefrombatch..."
+  response=$(curl -sd '{"outputId":'${id}'}' localhost:8888/removefrombatch)
+  echo "response=${response}"
+  id=$(echo "${response}" | jq ".result.batchId")
+  echo "batchId=${id}"
+  if [ "${id}" -ne "1" ]; then
+    exit 50
+  fi
+
+  response=$(curl -sd '{"outputId":'${id2}'}' localhost:8888/removefrombatch)
+  echo "response=${response}"
+  id=$(echo "${response}" | jq ".result.batchId")
+  echo "batchId=${id}"
+  if [ "${id}" -ne "1" ]; then
+    exit 54
+  fi
+  echo "Tested removefrombatch."
+
+  # getbatchdetails the default batch
+  echo "Testing getbatchdetails..."
+  response=$(curl -sd '{"batchId":1}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data2=$(echo "${response}" | jq ".result.nbOutputs")
+  echo "nbOutputs=${data2}"
+  if [ "${data2}" -ne "$((${data}-2))" ]; then
+    exit 58
+  fi
+  echo "Tested getbatchdetails."
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  # Create a batch
+  echo "Testing createbatch..."
+  response=$(curl -s -H 'Content-Type: application/json' -d '{"batchLabel":"testbatch","confTarget":32}' proxy:8888/createbatch)
+  echo "response=${response}"
+  id=$(echo "${response}" | jq -e ".result.batchId")
+  if [ "$?" -ne "0" ]; then
+    exit 60
+  fi
+
+  # List batches (should show at least default and testbatch batches)
+  echo "Testing listbatches..."
+  response=$(curl -s proxy:8888/listbatches)
+  echo "response=${response}"
+  id=$(echo "${response}" | jq '.result[] | select(.batchLabel == "testbatch") | .batchId')
+  echo "batchId=${id}"
+  if [ -z "${id}" ]; then
+    exit 70
+  fi
+  echo "Tested listbatches."
+
+  # getbatch the testbatch batch
+  echo "Testing getbatch..."
+  response=$(curl -sd '{"batchId":'${id}'}' localhost:8888/getbatch)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchLabel")
+  echo "batchLabel=${data}"
+  if [ "${data}" != "testbatch" ]; then
+    exit 80
+  fi
+
+  response=$(curl -sd '{"batchLabel":"testbatch"}' localhost:8888/getbatch)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchId")
+  echo "batchId=${data}"
+  if [ "${data}" != "${id}" ]; then
+    exit 90
+  fi
+  echo "Tested getbatch."
+
+  # getbatchdetails the testbatch batch
+  echo "Testing getbatchdetails..."
+  response=$(curl -sd '{"batchLabel":"testbatch"}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchId")
+  echo "batchId=${data}"
+  if [ "${data}" != "${id}" ]; then
+    exit 100
+  fi
+  echo "${response}" | jq -e ".result.outputs"
+  if [ "$?" -ne 0 ]; then
+    exit 32
+  fi
+
+  response=$(curl -sd '{"batchId":'${id}'}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq -r ".result.batchLabel")
+  echo "batchLabel=${data}"
+  if [ "${data}" != "testbatch" ]; then
+    exit 35
+  fi
+  echo "${response}" | jq -e ".result.outputs"
+  if [ "$?" -ne 0 ]; then
+    exit 37
+  fi
+  echo "Tested getbatchdetails."
+
+  # addtobatch to testbatch batch
+  echo "Testing addtobatch..."
+  address1=$(curl -s localhost:8888/getnewaddress | jq -r ".address")
+  echo "address1=${address1}"
+  response=$(curl -sd '{"batchId":'${id}',"outputLabel":"test001","address":"'${address1}'","amount":0.001,"webhookUrl":"'${url1}'/'${address1}'"}' localhost:8888/addtobatch)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq ".result.batchId")
+  echo "batchId=${data}"
+  if [ "${data}" -ne "${id}" ]; then
+    exit 40
+  fi
+  id2=$(echo "${response}" | jq -e ".result.outputId")
+  if [ "$?" -ne 0 ]; then
+    exit 42
+  fi
+  echo "outputId=${id2}"
+
+  address2=$(curl -s localhost:8888/getnewaddress | jq -r ".address")
+  echo "address2=${address2}"
+  response=$(curl -sd '{"batchLabel":"testbatch","outputLabel":"test002","address":"'${address2}'","amount":0.002,"webhookUrl":"'${url2}'/'${address2}'"}' localhost:8888/addtobatch)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq ".result.batchId")
+  echo "batchId=${data}"
+  if [ "${data}" -ne "${id}" ]; then
+    exit 40
+  fi
+  id2=$(echo "${response}" | jq -e ".result.outputId")
+  if [ "$?" -ne 0 ]; then
+    exit 42
+  fi
+  echo "outputId=${id2}"
+  echo "Tested addtobatch."
+
+  # batchspend testbatch batch
+  echo "Testing batchspend..."
+  response=$(curl -sd '{"batchLabel":"testbatch"}' localhost:8888/batchspend)
+  echo "response=${response}"
+  data2=$(echo "${response}" | jq -e ".result.txid")
+  if [ "$?" -ne 0 ]; then
+    exit 44
+  fi
+  echo "txid=${data2}"
+  data=$(echo "${response}" | jq ".result.outputs | length")
+  if [ "${data}" -ne "2" ]; then
+    exit 42
+  fi
+  echo "Tested batchspend."
+
+  # getbatchdetails the testbatch batch
+  echo "Testing getbatchdetails..."
+  echo "txid=${data2}"
+  response=$(curl -sd '{"batchLabel":"testbatch","txid":'${data2}'}' localhost:8888/getbatchdetails)
+  echo "response=${response}"
+  data=$(echo "${response}" | jq ".result.nbOutputs")
+  echo "nbOutputs=${data}"
+  if [ "${data}" -ne "2" ]; then
+    exit 42
+  fi
+  echo "Tested getbatchdetails."
+
+  # List batches
+  # Add to batch
+  # List batches
+  # Remove from batch
+  # List batches
+}
+
+wait_for_callbacks() {
+  nc -vlp1111 -e ./tests-cb.sh &
+  nc -vlp1112 -e ./tests-cb.sh &
+}
+
+wait_for_callbacks
+testbatching
+wait
diff --git a/proxy_docker/app/script/walletoperations.sh b/proxy_docker/app/script/walletoperations.sh
index 067937b..a7e623a 100644
--- a/proxy_docker/app/script/walletoperations.sh
+++ b/proxy_docker/app/script/walletoperations.sh
@@ -44,7 +44,7 @@ spend() {
     local tx_size=$(echo "${tx_raw_details}" | jq '.result.size')
     local tx_vsize=$(echo "${tx_raw_details}" | jq '.result.vsize')
     local tx_replaceable=$(echo "${tx_details}" | jq '.result."bip125-replaceable"')
-    tx_replaceable=$([ ${tx_replaceable} = "yes" ] && echo 1 || echo 0)
+    tx_replaceable=$([ ${tx_replaceable} = "yes" ] && echo "true" || echo "false")
     local fees=$(echo "${tx_details}" | jq '.result.fee | fabs' | awk '{ printf "%.8f", $0 }')
     # Sometimes raw tx are too long to be passed as paramater, so let's write
     # it to a temp file for it to be read by sqlite3 and then delete the file
@@ -77,7 +77,7 @@ spend() {
     trace_rc $?
 
     data="{\"status\":\"accepted\""
-    data="${data},\"hash\":\"${txid}\",\"details\":{\"address\":\"${address}\",\"amount\":${amount},\"firstseen\":${tx_ts_firstseen},\"size\":${tx_size},\"vsize\":${tx_vsize},\"replaceable\":${replaceable},\"fee\":${fees},\"subtractfeefromamount\":${subtractfeefromamount}}}"
+    data="${data},\"hash\":\"${txid}\",\"details\":{\"address\":\"${address}\",\"amount\":${amount},\"firstseen\":${tx_ts_firstseen},\"size\":${tx_size},\"vsize\":${tx_vsize},\"replaceable\":${tx_replaceable},\"fee\":${fees},\"subtractfeefromamount\":${subtractfeefromamount}}}"
 
     # Delete the temp file containing the raw tx (see above)
     rm spend-rawtx-${txid}-$$.blob
@@ -156,6 +156,7 @@ get_txns_spending() {
 
   return ${returncode}
 }
+
 getbalance() {
   trace "Entering getbalance()..."
 
@@ -293,113 +294,6 @@ getnewaddress() {
   return ${returncode}
 }
 
-addtobatching() {
-  trace "Entering addtobatching()..."
-
-  local address=${1}
-  trace "[addtobatching] address=${address}"
-  local amount=${2}
-  trace "[addtobatching] amount=${amount}"
-
-  sql "INSERT OR IGNORE INTO recipient (address, amount) VALUES (\"${address}\", ${amount})"
-  returncode=$?
-  trace_rc ${returncode}
-
-  return ${returncode}
-}
-
-batchspend() {
-  trace "Entering batchspend()..."
-
-  local data
-  local response
-  local recipientswhere
-  local recipientsjson
-  local id_inserted
-  local tx_details
-  local tx_raw_details
-
-  # We will batch all the addresses in DB without a TXID
-  local batching=$(sql 'SELECT address, amount FROM recipient WHERE tx_id IS NULL')
-  trace "[batchspend] batching=${batching}"
-
-  local returncode
-  local address
-  local amount
-  local notfirst=false
-  local IFS=$'\n'
-  for row in ${batching}
-  do
-    trace "[batchspend] row=${row}"
-    address=$(echo "${row}" | cut -d '|' -f1)
-    trace "[batchspend] address=${address}"
-    amount=$(echo "${row}" | cut -d '|' -f2)
-    trace "[batchspend] amount=${amount}"
-
-    if ${notfirst}; then
-      recipientswhere="${recipientswhere},"
-      recipientsjson="${recipientsjson},"
-    else
-      notfirst=true
-    fi
-
-    recipientswhere="${recipientswhere}\"${address}\""
-    recipientsjson="${recipientsjson}\"${address}\":${amount}"
-  done
-
-  response=$(send_to_spender_node "{\"method\":\"sendmany\",\"params\":[\"\", {${recipientsjson}}]}")
-  returncode=$?
-  trace_rc ${returncode}
-  trace "[batchspend] response=${response}"
-
-  if [ "${returncode}" -eq 0 ]; then
-    local txid=$(echo "${response}" | jq -r ".result")
-    trace "[batchspend] txid=${txid}"
-
-    # Let's get transaction details on the spending wallet so that we have fee information
-    tx_details=$(get_transaction ${txid} "spender")
-    tx_raw_details=$(get_rawtransaction ${txid})
-
-    # Amounts and fees are negative when spending so we absolute those fields
-    local tx_hash=$(echo "${tx_raw_details}" | jq '.result.hash')
-    local tx_ts_firstseen=$(echo "${tx_details}" | jq '.result.timereceived')
-    local tx_amount=$(echo "${tx_details}" | jq '.result.amount | fabs' | awk '{ printf "%.8f", $0 }')
-    local tx_size=$(echo "${tx_raw_details}" | jq '.result.size')
-    local tx_vsize=$(echo "${tx_raw_details}" | jq '.result.vsize')
-    local tx_replaceable=$(echo "${tx_details}" | jq '.result."bip125-replaceable"')
-    tx_replaceable=$([ ${tx_replaceable} = "yes" ] && echo 1 || echo 0)
-    local fees=$(echo "${tx_details}" | jq '.result.fee | fabs' | awk '{ printf "%.8f", $0 }')
-    # Sometimes raw tx are too long to be passed as paramater, so let's write
-    # it to a temp file for it to be read by sqlite3 and then delete the file
-    echo "${tx_raw_details}" > batchspend-rawtx-${txid}-$$.blob
-
-    # Let's insert the txid in our little DB -- then we'll already have it when receiving confirmation
-    sql "INSERT OR IGNORE INTO tx (txid, hash, confirmations, timereceived, fee, size, vsize, is_replaceable, raw_tx) VALUES (\"${txid}\", ${tx_hash}, 0, ${tx_ts_firstseen}, ${fees}, ${tx_size}, ${tx_vsize}, ${tx_replaceable}, readfile('batchspend-rawtx-${txid}-$$.blob'))"
-    returncode=$?
-    trace_rc ${returncode}
-    if [ "${returncode}" -eq 0 ]; then
-      id_inserted=$(sql "SELECT id FROM tx WHERE txid=\"${txid}\"")
-      trace "[batchspend] id_inserted: ${id_inserted}"
-      sql "UPDATE recipient SET tx_id=${id_inserted} WHERE address IN (${recipientswhere})"
-      trace_rc $?
-    fi
-
-    data="{\"status\":\"accepted\""
-    data="${data},\"hash\":\"${txid}\"}"
-
-    # Delete the temp file containing the raw tx (see above)
-    rm batchspend-rawtx-${txid}-$$.blob
-  else
-    local message=$(echo "${response}" | jq -e ".error.message")
-    data="{\"message\":${message}}"
-  fi
-
-  trace "[batchspend] responding=${data}"
-  echo "${data}"
-
-  return ${returncode}
-}
-
 create_wallet() {
   trace "[Entering create_wallet()]"
 
@@ -416,4 +310,3 @@ create_wallet() {
 
   return ${returncode}
 }
-