@actual-app/api 4.1.5 → 5.0.0

package/app/bundle.api.js

@@ -11582,86 +11582,6 @@ module.exports = function (records, options = {}) {
 
 /***/ }),
 
-/***/ "./node_modules/damerau-levenshtein/index.js":
-/*!***************************************************!*\
-  !*** ./node_modules/damerau-levenshtein/index.js ***!
-  \***************************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-// TheSpanishInquisition
-// Cache the matrix. Note that if you not pass a limit this implementation will use a dynamically calculate one.
-module.exports = function (__this, that, limit) {
-  var thisLength = __this.length,
-      thatLength = that.length,
-      matrix = []; // If the limit is not defined it will be calculate from this and that args.
-
-  limit = (limit || (thatLength > thisLength ? thatLength : thisLength)) + 1;
-
-  for (var i = 0; i < limit; i++) {
-    matrix[i] = [i];
-    matrix[i].length = limit;
-  }
-
-  for (i = 0; i < limit; i++) {
-    matrix[0][i] = i;
-  }
-
-  if (Math.abs(thisLength - thatLength) > (limit || 100)) {
-    return prepare(limit || 100);
-  }
-
-  if (thisLength === 0) {
-    return prepare(thatLength);
-  }
-
-  if (thatLength === 0) {
-    return prepare(thisLength);
-  } // Calculate matrix.
-
-
-  var j, this_i, that_j, cost, min, t;
-
-  for (i = 1; i <= thisLength; ++i) {
-    this_i = __this[i - 1]; // Step 4
-
-    for (j = 1; j <= thatLength; ++j) {
-      // Check the jagged ld total so far
-      if (i === j && matrix[i][j] > 4) return prepare(thisLength);
-      that_j = that[j - 1];
-      cost = this_i === that_j ? 0 : 1; // Step 5
-      // Calculate the minimum (much faster than Math.min(...)).
-
-      min = matrix[i - 1][j] + 1; // Deletion.
-
-      if ((t = matrix[i][j - 1] + 1) < min) min = t; // Insertion.
-
-      if ((t = matrix[i - 1][j - 1] + cost) < min) min = t; // Substitution.
-      // Update matrix.
-
-      matrix[i][j] = i > 1 && j > 1 && this_i === that[j - 2] && __this[i - 2] === that_j && (t = matrix[i - 2][j - 2] + cost) < min ? t : min; // Transposition.
-    }
-  }
-
-  return prepare(matrix[thisLength][thatLength]);
-  /**
-   *
-   */
-
-  function prepare(steps) {
-    var length = Math.max(thisLength, thatLength);
-    var relative = length === 0 ? 0 : steps / length;
-    var similarity = 1 - relative;
-    return {
-      steps: steps,
-      relative: relative,
-      similarity: similarity
-    };
-  }
-};
-
-/***/ }),
-
 /***/ "./node_modules/date-fns/esm/_lib/addLeadingZeros/index.js":
 /*!*****************************************************************!*\
   !*** ./node_modules/date-fns/esm/_lib/addLeadingZeros/index.js ***!
@@ -26399,7 +26319,7 @@ var is = __webpack_require__(/*! object-is */ "./node_modules/object-is/index.js
 
 var isRegex = __webpack_require__(/*! is-regex */ "./node_modules/is-regex/index.js");
 
-var flags = __webpack_require__(/*! regexp.prototype.flags */ "./node_modules/regexp.prototype.flags/index.js");
+var flags = __webpack_require__(/*! regexp.prototype.flags */ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/index.js");
 
 var isArray = __webpack_require__(/*! isarray */ "./node_modules/deep-equal/node_modules/isarray/index.js");
 
@@ -26417,7 +26337,7 @@ var getIterator = __webpack_require__(/*! es-get-iterator */ "./node_modules/es-
 
 var getSideChannel = __webpack_require__(/*! side-channel */ "./node_modules/side-channel/index.js");
 
-var whichTypedArray = __webpack_require__(/*! which-typed-array */ "./node_modules/which-typed-array/index.js");
+var whichTypedArray = __webpack_require__(/*! which-typed-array */ "./node_modules/deep-equal/node_modules/which-typed-array/index.js");
 
 var assign = __webpack_require__(/*! object.assign */ "./node_modules/object.assign/index.js");
 
@@ -26867,6 +26787,97 @@ module.exports = function deepEqual(a, b, opts) {
 
 /***/ }),
 
+/***/ "./node_modules/deep-equal/node_modules/is-typed-array/index.js":
+/*!**********************************************************************!*\
+  !*** ./node_modules/deep-equal/node_modules/is-typed-array/index.js ***!
+  \**********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var forEach = __webpack_require__(/*! foreach */ "./node_modules/foreach/index.js");
+
+var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
+
+var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
+
+var $toString = callBound('Object.prototype.toString');
+
+var hasToStringTag = __webpack_require__(/*! has-tostringtag/shams */ "./node_modules/has-tostringtag/shams.js")();
+
+var g = typeof globalThis === 'undefined' ? global : globalThis;
+var typedArrays = availableTypedArrays();
+
+var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(array, value) {
+  for (var i = 0; i < array.length; i += 1) {
+    if (array[i] === value) {
+      return i;
+    }
+  }
+
+  return -1;
+};
+
+var $slice = callBound('String.prototype.slice');
+var toStrTags = {};
+
+var gOPD = __webpack_require__(/*! es-abstract/helpers/getOwnPropertyDescriptor */ "./node_modules/es-abstract/helpers/getOwnPropertyDescriptor.js");
+
+var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
+
+if (hasToStringTag && gOPD && getPrototypeOf) {
+  forEach(typedArrays, function (typedArray) {
+    var arr = new g[typedArray]();
+
+    if (Symbol.toStringTag in arr) {
+      var proto = getPrototypeOf(arr);
+      var descriptor = gOPD(proto, Symbol.toStringTag);
+
+      if (!descriptor) {
+        var superProto = getPrototypeOf(proto);
+        descriptor = gOPD(superProto, Symbol.toStringTag);
+      }
+
+      toStrTags[typedArray] = descriptor.get;
+    }
+  });
+}
+
+var tryTypedArrays = function tryAllTypedArrays(value) {
+  var anyTrue = false;
+  forEach(toStrTags, function (getter, typedArray) {
+    if (!anyTrue) {
+      try {
+        anyTrue = getter.call(value) === typedArray;
+      } catch (e) {
+        /**/
+      }
+    }
+  });
+  return anyTrue;
+};
+
+module.exports = function isTypedArray(value) {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+
+  if (!hasToStringTag || !(Symbol.toStringTag in value)) {
+    var tag = $slice($toString(value), 8, -1);
+    return $indexOf(typedArrays, tag) > -1;
+  }
+
+  if (!gOPD) {
+    return false;
+  }
+
+  return tryTypedArrays(value);
+};
+
+/***/ }),
+
 /***/ "./node_modules/deep-equal/node_modules/isarray/index.js":
 /*!***************************************************************!*\
   !*** ./node_modules/deep-equal/node_modules/isarray/index.js ***!
@@ -26882,6 +26893,242 @@ module.exports = Array.isArray || function (arr) {
 
 /***/ }),
 
+/***/ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/implementation.js":
+/*!***************************************************************************************!*\
+  !*** ./node_modules/deep-equal/node_modules/regexp.prototype.flags/implementation.js ***!
+  \***************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var $Object = Object;
+var $TypeError = TypeError;
+
+module.exports = function flags() {
+  if (this != null && this !== $Object(this)) {
+    throw new $TypeError('RegExp.prototype.flags getter called on non-object');
+  }
+
+  var result = '';
+
+  if (this.hasIndices) {
+    result += 'd';
+  }
+
+  if (this.global) {
+    result += 'g';
+  }
+
+  if (this.ignoreCase) {
+    result += 'i';
+  }
+
+  if (this.multiline) {
+    result += 'm';
+  }
+
+  if (this.dotAll) {
+    result += 's';
+  }
+
+  if (this.unicode) {
+    result += 'u';
+  }
+
+  if (this.sticky) {
+    result += 'y';
+  }
+
+  return result;
+};
+
+/***/ }),
+
+/***/ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/index.js":
+/*!******************************************************************************!*\
+  !*** ./node_modules/deep-equal/node_modules/regexp.prototype.flags/index.js ***!
+  \******************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var define = __webpack_require__(/*! define-properties */ "./node_modules/define-properties/index.js");
+
+var callBind = __webpack_require__(/*! call-bind */ "./node_modules/call-bind/index.js");
+
+var implementation = __webpack_require__(/*! ./implementation */ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/implementation.js");
+
+var getPolyfill = __webpack_require__(/*! ./polyfill */ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/polyfill.js");
+
+var shim = __webpack_require__(/*! ./shim */ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/shim.js");
+
+var flagsBound = callBind(getPolyfill());
+define(flagsBound, {
+  getPolyfill: getPolyfill,
+  implementation: implementation,
+  shim: shim
+});
+module.exports = flagsBound;
+
+/***/ }),
+
+/***/ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/polyfill.js":
+/*!*********************************************************************************!*\
+  !*** ./node_modules/deep-equal/node_modules/regexp.prototype.flags/polyfill.js ***!
+  \*********************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var implementation = __webpack_require__(/*! ./implementation */ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/implementation.js");
+
+var supportsDescriptors = __webpack_require__(/*! define-properties */ "./node_modules/define-properties/index.js").supportsDescriptors;
+
+var $gOPD = Object.getOwnPropertyDescriptor;
+
+module.exports = function getPolyfill() {
+  if (supportsDescriptors && /a/mig.flags === 'gim') {
+    var descriptor = $gOPD(RegExp.prototype, 'flags');
+
+    if (descriptor && typeof descriptor.get === 'function' && typeof /a/.dotAll === 'boolean') {
+      return descriptor.get;
+    }
+  }
+
+  return implementation;
+};
+
+/***/ }),
+
+/***/ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/shim.js":
+/*!*****************************************************************************!*\
+  !*** ./node_modules/deep-equal/node_modules/regexp.prototype.flags/shim.js ***!
+  \*****************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var supportsDescriptors = __webpack_require__(/*! define-properties */ "./node_modules/define-properties/index.js").supportsDescriptors;
+
+var getPolyfill = __webpack_require__(/*! ./polyfill */ "./node_modules/deep-equal/node_modules/regexp.prototype.flags/polyfill.js");
+
+var gOPD = Object.getOwnPropertyDescriptor;
+var defineProperty = Object.defineProperty;
+var TypeErr = TypeError;
+var getProto = Object.getPrototypeOf;
+var regex = /a/;
+
+module.exports = function shimFlags() {
+  if (!supportsDescriptors || !getProto) {
+    throw new TypeErr('RegExp.prototype.flags requires a true ES5 environment that supports property descriptors');
+  }
+
+  var polyfill = getPolyfill();
+  var proto = getProto(regex);
+  var descriptor = gOPD(proto, 'flags');
+
+  if (!descriptor || descriptor.get !== polyfill) {
+    defineProperty(proto, 'flags', {
+      configurable: true,
+      enumerable: false,
+      get: polyfill
+    });
+  }
+
+  return polyfill;
+};
+
+/***/ }),
+
+/***/ "./node_modules/deep-equal/node_modules/which-typed-array/index.js":
+/*!*************************************************************************!*\
+  !*** ./node_modules/deep-equal/node_modules/which-typed-array/index.js ***!
+  \*************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var forEach = __webpack_require__(/*! foreach */ "./node_modules/foreach/index.js");
+
+var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
+
+var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
+
+var $toString = callBound('Object.prototype.toString');
+
+var hasToStringTag = __webpack_require__(/*! has-tostringtag/shams */ "./node_modules/has-tostringtag/shams.js")();
+
+var g = typeof globalThis === 'undefined' ? global : globalThis;
+var typedArrays = availableTypedArrays();
+var $slice = callBound('String.prototype.slice');
+var toStrTags = {};
+
+var gOPD = __webpack_require__(/*! es-abstract/helpers/getOwnPropertyDescriptor */ "./node_modules/es-abstract/helpers/getOwnPropertyDescriptor.js");
+
+var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
+
+if (hasToStringTag && gOPD && getPrototypeOf) {
+  forEach(typedArrays, function (typedArray) {
+    if (typeof g[typedArray] === 'function') {
+      var arr = new g[typedArray]();
+
+      if (Symbol.toStringTag in arr) {
+        var proto = getPrototypeOf(arr);
+        var descriptor = gOPD(proto, Symbol.toStringTag);
+
+        if (!descriptor) {
+          var superProto = getPrototypeOf(proto);
+          descriptor = gOPD(superProto, Symbol.toStringTag);
+        }
+
+        toStrTags[typedArray] = descriptor.get;
+      }
+    }
+  });
+}
+
+var tryTypedArrays = function tryAllTypedArrays(value) {
+  var foundName = false;
+  forEach(toStrTags, function (getter, typedArray) {
+    if (!foundName) {
+      try {
+        var name = getter.call(value);
+
+        if (name === typedArray) {
+          foundName = name;
+        }
+      } catch (e) {}
+    }
+  });
+  return foundName;
+};
+
+var isTypedArray = __webpack_require__(/*! is-typed-array */ "./node_modules/deep-equal/node_modules/is-typed-array/index.js");
+
+module.exports = function whichTypedArray(value) {
+  if (!isTypedArray(value)) {
+    return false;
+  }
+
+  if (!hasToStringTag || !(Symbol.toStringTag in value)) {
+    return $slice($toString(value), 8, -1);
+  }
+
+  return tryTypedArrays(value);
+};
+
+/***/ }),
+
 /***/ "./node_modules/define-properties/index.js":
 /*!*************************************************!*\
   !*** ./node_modules/define-properties/index.js ***!
@@ -36420,97 +36667,6 @@ if (hasSymbols) {
 
 /***/ }),
 
-/***/ "./node_modules/is-typed-array/index.js":
-/*!**********************************************!*\
-  !*** ./node_modules/is-typed-array/index.js ***!
-  \**********************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var forEach = __webpack_require__(/*! foreach */ "./node_modules/foreach/index.js");
-
-var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
-
-var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
-
-var $toString = callBound('Object.prototype.toString');
-
-var hasToStringTag = __webpack_require__(/*! has-tostringtag/shams */ "./node_modules/has-tostringtag/shams.js")();
-
-var g = typeof globalThis === 'undefined' ? global : globalThis;
-var typedArrays = availableTypedArrays();
-
-var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(array, value) {
-  for (var i = 0; i < array.length; i += 1) {
-    if (array[i] === value) {
-      return i;
-    }
-  }
-
-  return -1;
-};
-
-var $slice = callBound('String.prototype.slice');
-var toStrTags = {};
-
-var gOPD = __webpack_require__(/*! es-abstract/helpers/getOwnPropertyDescriptor */ "./node_modules/es-abstract/helpers/getOwnPropertyDescriptor.js");
-
-var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
-
-if (hasToStringTag && gOPD && getPrototypeOf) {
-  forEach(typedArrays, function (typedArray) {
-    var arr = new g[typedArray]();
-
-    if (Symbol.toStringTag in arr) {
-      var proto = getPrototypeOf(arr);
-      var descriptor = gOPD(proto, Symbol.toStringTag);
-
-      if (!descriptor) {
-        var superProto = getPrototypeOf(proto);
-        descriptor = gOPD(superProto, Symbol.toStringTag);
-      }
-
-      toStrTags[typedArray] = descriptor.get;
-    }
-  });
-}
-
-var tryTypedArrays = function tryAllTypedArrays(value) {
-  var anyTrue = false;
-  forEach(toStrTags, function (getter, typedArray) {
-    if (!anyTrue) {
-      try {
-        anyTrue = getter.call(value) === typedArray;
-      } catch (e) {
-        /**/
-      }
-    }
-  });
-  return anyTrue;
-};
-
-module.exports = function isTypedArray(value) {
-  if (!value || typeof value !== 'object') {
-    return false;
-  }
-
-  if (!hasToStringTag || !(Symbol.toStringTag in value)) {
-    var tag = $slice($toString(value), 8, -1);
-    return $indexOf(typedArrays, tag) > -1;
-  }
-
-  if (!gOPD) {
-    return false;
-  }
-
-  return tryTypedArrays(value);
-};
-
-/***/ }),
-
 /***/ "./node_modules/is-weakmap/index.js":
 /*!******************************************!*\
   !*** ./node_modules/is-weakmap/index.js ***!
@@ -38990,161 +39146,6 @@ module.exports = function shimAssign() {
 
 /***/ }),
 
-/***/ "./node_modules/regexp.prototype.flags/implementation.js":
-/*!***************************************************************!*\
-  !*** ./node_modules/regexp.prototype.flags/implementation.js ***!
-  \***************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var $Object = Object;
-var $TypeError = TypeError;
-
-module.exports = function flags() {
-  if (this != null && this !== $Object(this)) {
-    throw new $TypeError('RegExp.prototype.flags getter called on non-object');
-  }
-
-  var result = '';
-
-  if (this.hasIndices) {
-    result += 'd';
-  }
-
-  if (this.global) {
-    result += 'g';
-  }
-
-  if (this.ignoreCase) {
-    result += 'i';
-  }
-
-  if (this.multiline) {
-    result += 'm';
-  }
-
-  if (this.dotAll) {
-    result += 's';
-  }
-
-  if (this.unicode) {
-    result += 'u';
-  }
-
-  if (this.sticky) {
-    result += 'y';
-  }
-
-  return result;
-};
-
-/***/ }),
-
-/***/ "./node_modules/regexp.prototype.flags/index.js":
-/*!******************************************************!*\
-  !*** ./node_modules/regexp.prototype.flags/index.js ***!
-  \******************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var define = __webpack_require__(/*! define-properties */ "./node_modules/define-properties/index.js");
-
-var callBind = __webpack_require__(/*! call-bind */ "./node_modules/call-bind/index.js");
-
-var implementation = __webpack_require__(/*! ./implementation */ "./node_modules/regexp.prototype.flags/implementation.js");
-
-var getPolyfill = __webpack_require__(/*! ./polyfill */ "./node_modules/regexp.prototype.flags/polyfill.js");
-
-var shim = __webpack_require__(/*! ./shim */ "./node_modules/regexp.prototype.flags/shim.js");
-
-var flagsBound = callBind(getPolyfill());
-define(flagsBound, {
-  getPolyfill: getPolyfill,
-  implementation: implementation,
-  shim: shim
-});
-module.exports = flagsBound;
-
-/***/ }),
-
-/***/ "./node_modules/regexp.prototype.flags/polyfill.js":
-/*!*********************************************************!*\
-  !*** ./node_modules/regexp.prototype.flags/polyfill.js ***!
-  \*********************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var implementation = __webpack_require__(/*! ./implementation */ "./node_modules/regexp.prototype.flags/implementation.js");
-
-var supportsDescriptors = __webpack_require__(/*! define-properties */ "./node_modules/define-properties/index.js").supportsDescriptors;
-
-var $gOPD = Object.getOwnPropertyDescriptor;
-
-module.exports = function getPolyfill() {
-  if (supportsDescriptors && /a/mig.flags === 'gim') {
-    var descriptor = $gOPD(RegExp.prototype, 'flags');
-
-    if (descriptor && typeof descriptor.get === 'function' && typeof /a/.dotAll === 'boolean') {
-      return descriptor.get;
-    }
-  }
-
-  return implementation;
-};
-
-/***/ }),
-
-/***/ "./node_modules/regexp.prototype.flags/shim.js":
-/*!*****************************************************!*\
-  !*** ./node_modules/regexp.prototype.flags/shim.js ***!
-  \*****************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var supportsDescriptors = __webpack_require__(/*! define-properties */ "./node_modules/define-properties/index.js").supportsDescriptors;
-
-var getPolyfill = __webpack_require__(/*! ./polyfill */ "./node_modules/regexp.prototype.flags/polyfill.js");
-
-var gOPD = Object.getOwnPropertyDescriptor;
-var defineProperty = Object.defineProperty;
-var TypeErr = TypeError;
-var getProto = Object.getPrototypeOf;
-var regex = /a/;
-
-module.exports = function shimFlags() {
-  if (!supportsDescriptors || !getProto) {
-    throw new TypeErr('RegExp.prototype.flags requires a true ES5 environment that supports property descriptors');
-  }
-
-  var polyfill = getPolyfill();
-  var proto = getProto(regex);
-  var descriptor = gOPD(proto, 'flags');
-
-  if (!descriptor || descriptor.get !== polyfill) {
-    defineProperty(proto, 'flags', {
-      configurable: true,
-      enumerable: false,
-      get: polyfill
-    });
-  }
-
-  return polyfill;
-};
-
-/***/ }),
-
 /***/ "./node_modules/side-channel/index.js":
 /*!********************************************!*\
   !*** ./node_modules/side-channel/index.js ***!
@@ -39620,87 +39621,6 @@ module.exports = function whichCollection(value) {
 
 /***/ }),
 
-/***/ "./node_modules/which-typed-array/index.js":
-/*!*************************************************!*\
-  !*** ./node_modules/which-typed-array/index.js ***!
-  \*************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var forEach = __webpack_require__(/*! foreach */ "./node_modules/foreach/index.js");
-
-var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
-
-var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
-
-var $toString = callBound('Object.prototype.toString');
-
-var hasToStringTag = __webpack_require__(/*! has-tostringtag/shams */ "./node_modules/has-tostringtag/shams.js")();
-
-var g = typeof globalThis === 'undefined' ? global : globalThis;
-var typedArrays = availableTypedArrays();
-var $slice = callBound('String.prototype.slice');
-var toStrTags = {};
-
-var gOPD = __webpack_require__(/*! es-abstract/helpers/getOwnPropertyDescriptor */ "./node_modules/es-abstract/helpers/getOwnPropertyDescriptor.js");
-
-var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
-
-if (hasToStringTag && gOPD && getPrototypeOf) {
-  forEach(typedArrays, function (typedArray) {
-    if (typeof g[typedArray] === 'function') {
-      var arr = new g[typedArray]();
-
-      if (Symbol.toStringTag in arr) {
-        var proto = getPrototypeOf(arr);
-        var descriptor = gOPD(proto, Symbol.toStringTag);
-
-        if (!descriptor) {
-          var superProto = getPrototypeOf(proto);
-          descriptor = gOPD(superProto, Symbol.toStringTag);
-        }
-
-        toStrTags[typedArray] = descriptor.get;
-      }
-    }
-  });
-}
-
-var tryTypedArrays = function tryAllTypedArrays(value) {
-  var foundName = false;
-  forEach(toStrTags, function (getter, typedArray) {
-    if (!foundName) {
-      try {
-        var name = getter.call(value);
-
-        if (name === typedArray) {
-          foundName = name;
-        }
-      } catch (e) {}
-    }
-  });
-  return foundName;
-};
-
-var isTypedArray = __webpack_require__(/*! is-typed-array */ "./node_modules/is-typed-array/index.js");
-
-module.exports = function whichTypedArray(value) {
-  if (!isTypedArray(value)) {
-    return false;
-  }
-
-  if (!hasToStringTag || !(Symbol.toStringTag in value)) {
-    return $slice($toString(value), 8, -1);
-  }
-
-  return tryTypedArrays(value);
-};
-
-/***/ }),
-
 /***/ "./packages/api/app/query.js":
 /*!***********************************!*\
   !*** ./packages/api/app/query.js ***!
@@ -39929,6 +39849,15 @@ async function loadBudget(budgetId) {
   });
 }
 
+async function downloadBudget(syncId, {
+  password
+} = {}) {
+  return send('api/download-budget', {
+    syncId,
+    password
+  });
+}
+
 async function batchBudgetUpdates(func) {
   await send('api/batch-budget-start');
 
@@ -40157,6 +40086,7 @@ module.exports = {
   runQuery,
   q,
   loadBudget,
+  downloadBudget,
   batchBudgetUpdates,
   getBudgetMonths,
   getBudgetMonth,
@@ -40222,6 +40152,12 @@ module.exports = {
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -40333,7 +40269,8 @@ function getCurrentMonth() {
 
 
 async function importAccounts(data, entityIdMap) {
-  return Promise.all(data.accounts.map(async account => {
+  const accounts = sortByKey(data.accounts, 'sortableIndex');
+  return Promise.all(accounts.map(async account => {
     if (!account.isTombstone) {
       const id = await actual.createAccount({
         type: mapAccountType(account.accountType),
@@ -40419,6 +40356,12 @@ async function importTransactions(data, entityIdMap) {
 
   for (let transaction of data.transactions) {
     entityIdMap.set(transaction.entityId, uuid.v4());
+
+    if (transaction.subTransactions) {
+      for (let subTransaction of transaction.subTransactions) {
+        entityIdMap.set(subTransaction.entityId, uuid.v4());
+      }
+    }
   }
 
   let sortOrder = 1;
@@ -40431,29 +40374,38 @@ async function importTransactions(data, entityIdMap) {
       }
 
       let id = entityIdMap.get(transaction.entityId);
-      let transferId = entityIdMap.get(transaction.transferTransactionId) || null;
-      let payee = null;
 
-      if (transferId) {
-        payee = payees.find(p => p.transfer_acct === entityIdMap.get(transaction.targetAccountId)).id;
-      } else {
-        payee = entityIdMap.get(transaction.payeeId);
+      function transferProperties(t) {
+        let transferId = entityIdMap.get(t.transferTransactionId) || null;
+        let payee = null;
+
+        if (transferId) {
+          payee = payees.find(p => p.transfer_acct === entityIdMap.get(t.targetAccountId)).id;
+        } else {
+          payee = entityIdMap.get(t.payeeId);
+        }
+
+        return {
+          transfer_id: transferId,
+          payee
+        };
       }
 
-      let newTransaction = {
+      let newTransaction = _objectSpread({
         id,
         amount: amountToInteger(transaction.amount),
         category: isOffBudget(entityIdMap.get(accountId)) ? null : getCategory(transaction.categoryId),
         date: transaction.date,
         notes: transaction.memo || null,
-        payee,
-        transfer_id: transferId
-      };
+        cleared: transaction.cleared === 'Cleared'
+      }, transferProperties(transaction));
+
       newTransaction.subtransactions = transaction.subTransactions && transaction.subTransactions.map((t, i) => {
-        return {
+        return _objectSpread({
           amount: amountToInteger(t.amount),
-          category: getCategory(t.categoryId)
-        };
+          category: getCategory(t.categoryId),
+          notes: t.memo || null
+        }, transferProperties(t));
       });
       return newTransaction;
     }).filter(x => x);
@@ -40486,11 +40438,7 @@ function fillInBudgets(data, categoryBudgets) {
 
 async function importBudgets(data, entityIdMap) {
   let budgets = sortByKey(data.monthlyBudgets, 'month');
-  let earliestMonth = monthFromDate(budgets[0].month);
-  let currentMonth = getCurrentMonth();
   await actual.batchBudgetUpdates(async () => {
-    const carryoverFlags = {};
-
     for (let budget of budgets) {
       let filled = fillInBudgets(data, budget.monthlySubCategoryBudgets.filter(b => !b.isTombstone));
       await Promise.all(filled.map(async catBudget => {
@@ -40505,13 +40453,8 @@ async function importBudgets(data, entityIdMap) {
         await actual.setBudgetAmount(month, catId, amount);
 
         if (catBudget.overspendingHandling === 'AffectsBuffer') {
-          // Turn off the carryover flag so it doesn't propagate
-          // to future months
-          carryoverFlags[catId] = false;
-        } else if (catBudget.overspendingHandling === 'Confined' || carryoverFlags[catId]) {
-          // Overspending has switched to carryover, set the
-          // flag so it propagates to future months
-          carryoverFlags[catId] = true;
+          await actual.setBudgetCarryover(month, catId, false);
+        } else if (catBudget.overspendingHandling === 'Confined') {
           await actual.setBudgetCarryover(month, catId, true);
         }
       }));
@@ -41406,9 +41349,7 @@ async function fillChecking(handlers, account, payees, groups) {
 async function fillInvestment(handlers, account, payees, groups) {
   let _extractCommonThings3 = extractCommonThings(payees, groups),
       incomePayee = _extractCommonThings3.incomePayee,
-      expensePayees = _extractCommonThings3.expensePayees,
-      incomeGroup = _extractCommonThings3.incomeGroup,
-      expenseCategories = _extractCommonThings3.expenseCategories;
+      incomeGroup = _extractCommonThings3.incomeGroup;
 
   let numTransactions = integer(10, 30);
   let transactions = [];
@@ -41487,9 +41428,7 @@ async function fillSavings(handlers, account, payees, groups) {
 async function fillMortgage(handlers, account, payees, groups) {
   let _extractCommonThings5 = extractCommonThings(payees, groups),
       incomePayee = _extractCommonThings5.incomePayee,
-      expensePayees = _extractCommonThings5.expensePayees,
-      incomeGroup = _extractCommonThings5.incomeGroup,
-      expenseCategories = _extractCommonThings5.expenseCategories;
+      incomeGroup = _extractCommonThings5.incomeGroup;
 
   let numTransactions = integer(7, 10);
   let amount = integer(100000, 200000);
@@ -41524,9 +41463,7 @@ async function fillMortgage(handlers, account, payees, groups) {
 async function fillOther(handlers, account, payees, groups) {
   let _extractCommonThings6 = extractCommonThings(payees, groups),
       incomePayee = _extractCommonThings6.incomePayee,
-      expensePayees = _extractCommonThings6.expensePayees,
-      incomeGroup = _extractCommonThings6.incomeGroup,
-      expenseCategories = _extractCommonThings6.expenseCategories;
+      incomeGroup = _extractCommonThings6.incomeGroup;
 
   let numTransactions = integer(3, 6);
   let category = incomeGroup.categories.find(c => c.name === 'Income');
@@ -41897,16 +41834,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "captureBreadcrumb", function() { return captureBreadcrumb; });
 function captureException(exc) {
   console.log('[Exception]', exc);
-
-  if (global.SentryClient) {
-    global.SentryClient.captureException(exc);
-  }
-}
-function captureBreadcrumb(breadcrumb) {
-  if (global.SentryClient) {
-    global.SentryClient.addBreadcrumb(breadcrumb);
-  }
 }
+function captureBreadcrumb(breadcrumb) {}
 
 /***/ }),
 
@@ -42725,7 +42654,7 @@ async function parseOFX(filepath) {
 
   await initModule();
   let errors = [];
-  let contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFile(filepath);
+  let contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFile(filepath, 'binary');
   let data;
 
   try {
@@ -42968,14 +42897,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
-function safeNumber(n) {
-  return isNaN(n) ? null : n;
-}
-
-function safeParseInt(n) {
-  return safeNumber(parseInt(n));
-}
-
 function assert(test, type, msg) {
   if (!test) {
     throw new _errors__WEBPACK_IMPORTED_MODULE_5__["RuleError"](type, msg);
@@ -43637,7 +43558,6 @@ function migrateIds(rule, mappings) {
 } // This finds all the rules that reference the `id`
 
 function iterateIds(rules, fieldName, func) {
-  let counts = {};
   let i;
 
   ruleiter: for (i = 0; i < rules.length; i++) {
@@ -43738,8 +43658,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
-const levenshtein = __webpack_require__(/*! damerau-levenshtein */ "./node_modules/damerau-levenshtein/index.js");
-
 const dateFns = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/index.js");
 
 const uuid = __webpack_require__(/*! ../../platform/uuid */ "./packages/loot-core/src/platform/uuid/index.electron.js");
@@ -44039,7 +43957,6 @@ async function reconcileTransactions(acctId, transactions) {
   }); // Finally, generate & commit the changes
 
   for (let _ref2 of transactionsStep3) {
-    let payee_name = _ref2.payee_name;
     let trans = _ref2.trans;
     let subtransactions = _ref2.subtransactions;
     let match = _ref2.match;
@@ -44107,7 +44024,6 @@ async function addTransactions(acctId, transactions, {
       payeesToCreate = _await$normalizeTrans2.payeesToCreate;
 
   for (let _ref3 of normalized) {
-    let payee_name = _ref3.payee_name;
     let trans = _ref3.trans;
     let subtransactions = _ref3.subtransactions;
     // Run the rules
@@ -44602,7 +44518,6 @@ function onApplySync(oldValues, newValues) {
 function runRules(trans) {
   let finalTrans = _objectSpread({}, trans);
 
-  let allChanges = {};
   let rules = Object(_rules__WEBPACK_IMPORTED_MODULE_9__["rankRules"])(Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["fastSetMerge"])(firstcharIndexer.getApplicableRules(trans), payeeIndexer.getApplicableRules(trans)));
 
   for (let i = 0; i < rules.length; i++) {
@@ -44711,11 +44626,6 @@ function conditionsToAQL(conditions, {
             let dates = value.schedule.occurrences({
               take: recurDateBounds
             }).toArray().map(d => Object(_shared_months__WEBPACK_IMPORTED_MODULE_0__["dayFromDate"])(d.date));
-
-            let compare = d => ({
-              $eq: d
-            });
-
             return {
               $or: dates.map(d => {
                 if (op === 'isapprox') {
@@ -44738,8 +44648,6 @@ function conditionsToAQL(conditions, {
               })
             };
           } else {
-            let date = value.date;
-
             if (op === 'isapprox') {
               let fullDate = Object(_shared_months__WEBPACK_IMPORTED_MODULE_0__["parseDate"])(value.date);
               let high = Object(_shared_months__WEBPACK_IMPORTED_MODULE_0__["addDays"])(fullDate, 2);
@@ -45413,8 +45321,7 @@ async function getPayee(acct) {
 async function getTransferredAccount(transaction) {
   if (transaction.payee) {
     let _await$db$first = await _db__WEBPACK_IMPORTED_MODULE_0__["first"]('SELECT id, transfer_acct FROM v_payees WHERE id = ?', [transaction.payee]),
-        transfer_acct = _await$db$first.transfer_acct,
-        id = _await$db$first.id;
+        transfer_acct = _await$db$first.transfer_acct;
 
     return transfer_acct;
   }
@@ -45499,21 +45406,26 @@ async function addTransfer(transaction, transferredAccount) {
   } : {});
 }
 async function removeTransfer(transaction) {
-  let transferTrans = await _db__WEBPACK_IMPORTED_MODULE_0__["getTransaction"](transaction.transfer_id);
-
-  if (transferTrans.is_child) {
-    // If it's a child transaction, we don't delete it because that
-    // would invalidate the whole split transaction. Instead of turn
-    // it into a normal transaction
-    await _db__WEBPACK_IMPORTED_MODULE_0__["updateTransaction"]({
-      id: transaction.transfer_id,
-      transfer_id: null,
-      payee: null
-    });
-  } else {
-    await _db__WEBPACK_IMPORTED_MODULE_0__["deleteTransaction"]({
-      id: transaction.transfer_id
-    });
+  let transferTrans = await _db__WEBPACK_IMPORTED_MODULE_0__["getTransaction"](transaction.transfer_id); // Perform operations on the transfer transaction only
+  // if it is found. For example: when users delete both
+  // (in & out) transfer transactions at the same time -
+  // transfer transaction will not be found.
+
+  if (transferTrans) {
+    if (transferTrans.is_child) {
+      // If it's a child transaction, we don't delete it because that
+      // would invalidate the whole split transaction. Instead of turn
+      // it into a normal transaction
+      await _db__WEBPACK_IMPORTED_MODULE_0__["updateTransaction"]({
+        id: transaction.transfer_id,
+        transfer_id: null,
+        payee: null
+      });
+    } else {
+      await _db__WEBPACK_IMPORTED_MODULE_0__["deleteTransaction"]({
+        id: transaction.transfer_id
+      });
+    }
   }
 
   await _db__WEBPACK_IMPORTED_MODULE_0__["updateTransaction"]({
@@ -45807,20 +45719,21 @@ const payeeRuleModel = _objectSpread(_objectSpread({}, _models__WEBPACK_IMPORTED
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.js");
-/* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.js");
-/* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shared/transactions */ "./packages/loot-core/src/shared/transactions.js");
-/* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../shared/util */ "./packages/loot-core/src/shared/util.js");
-/* harmony import */ var _accounts_sync__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./accounts/sync */ "./packages/loot-core/src/server/accounts/sync.js");
-/* harmony import */ var _api_models__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./api-models */ "./packages/loot-core/src/server/api-models.js");
-/* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.js");
-/* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.js");
-/* harmony import */ var _crdt__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./crdt */ "./packages/loot-core/src/server/crdt/index.js");
-/* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.js");
-/* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.js");
-/* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.js");
-/* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.js");
-/* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.js");
+/* harmony import */ var _shared_errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../shared/errors */ "./packages/loot-core/src/shared/errors.js");
+/* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.js");
+/* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.js");
+/* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../shared/transactions */ "./packages/loot-core/src/shared/transactions.js");
+/* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../shared/util */ "./packages/loot-core/src/shared/util.js");
+/* harmony import */ var _accounts_sync__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./accounts/sync */ "./packages/loot-core/src/server/accounts/sync.js");
+/* harmony import */ var _api_models__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./api-models */ "./packages/loot-core/src/server/api-models.js");
+/* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.js");
+/* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.js");
+/* harmony import */ var _crdt__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./crdt */ "./packages/loot-core/src/server/crdt/index.js");
+/* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.js");
+/* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.js");
+/* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.js");
+/* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.js");
+/* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.js");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -45842,6 +45755,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
 const connection = __webpack_require__(/*! ../platform/server/connection */ "./packages/loot-core/src/platform/server/connection/index.api.js");
 
 let IMPORT_MODE = false; // This is duplicate from main.js...
@@ -45860,10 +45774,10 @@ function APIError(msg, meta) {
 
 function withMutation(handler) {
   return args => {
-    return Object(_mutators__WEBPACK_IMPORTED_MODULE_10__["runMutator"])(async () => {
-      let latestTimestamp = Object(_crdt__WEBPACK_IMPORTED_MODULE_8__["getClock"])().timestamp.toString();
+    return Object(_mutators__WEBPACK_IMPORTED_MODULE_11__["runMutator"])(async () => {
+      let latestTimestamp = Object(_crdt__WEBPACK_IMPORTED_MODULE_9__["getClock"])().timestamp.toString();
       let result = await handler(args);
-      let rows = await _db__WEBPACK_IMPORTED_MODULE_9__["all"]('SELECT DISTINCT dataset FROM messages_crdt WHERE timestamp > ?', [latestTimestamp]); // Only send the sync event if anybody else is connected
+      let rows = await _db__WEBPACK_IMPORTED_MODULE_10__["all"]('SELECT DISTINCT dataset FROM messages_crdt WHERE timestamp > ?', [latestTimestamp]); // Only send the sync event if anybody else is connected
 
       if (connection.getNumClients() > 1) {
         connection.send('sync-event', {
@@ -45891,7 +45805,7 @@ async function validateMonth(month) {
         start = _await$handlers$getB.start,
         end = _await$handlers$getB.end;
 
-    let range = _shared_months__WEBPACK_IMPORTED_MODULE_0__["range"](start, end);
+    let range = _shared_months__WEBPACK_IMPORTED_MODULE_1__["range"](start, end);
 
     if (!range.includes(month)) {
       throw APIError('No budget exists for month: ' + month);
@@ -45904,7 +45818,7 @@ async function validateExpenseCategory(debug, id) {
     throw APIError(`${debug}: category id is required`);
   }
 
-  let row = await _db__WEBPACK_IMPORTED_MODULE_9__["first"]('SELECT is_income FROM categories WHERE id = ?', [id]);
+  let row = await _db__WEBPACK_IMPORTED_MODULE_10__["first"]('SELECT is_income FROM categories WHERE id = ?', [id]);
 
   if (!row) {
     throw APIError(`${debug}: category "${id}" does not exist`);
@@ -45926,7 +45840,7 @@ handlers['api/batch-budget-start'] = async function () {
 
 
   if (IMPORT_MODE) {
-    _db__WEBPACK_IMPORTED_MODULE_9__["asyncTransaction"](() => {
+    _db__WEBPACK_IMPORTED_MODULE_10__["asyncTransaction"](() => {
       return new Promise((resolve, reject) => {
         batchPromise = {
           resolve,
@@ -45935,7 +45849,7 @@ handlers['api/batch-budget-start'] = async function () {
       });
     });
   } else {
-    Object(_sync__WEBPACK_IMPORTED_MODULE_13__["batchMessages"])(() => {
+    Object(_sync__WEBPACK_IMPORTED_MODULE_14__["batchMessages"])(() => {
       return new Promise((resolve, reject) => {
         batchPromise = {
           resolve,
@@ -45958,7 +45872,7 @@ handlers['api/batch-budget-end'] = async function () {
 handlers['api/load-budget'] = async function ({
   id
 }) {
-  let _ref = _prefs__WEBPACK_IMPORTED_MODULE_11__["getPrefs"]() || {},
+  let _ref = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"]() || {},
       currentId = _ref.id;
 
   if (currentId !== id) {
@@ -45973,15 +45887,69 @@ handlers['api/load-budget'] = async function ({
       connection.send('finish-load');
     } else {
       connection.send('show-budgets');
+      throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getSyncError"])(error, id));
+    }
+  }
+};
 
-      if (error === 'out-of-sync-migrations' || error === 'out-of-sync-data') {
-        throw new Error('This budget cannot be loaded with this version of the app.');
-      } else if (error === 'budget-not-found') {
-        throw new Error('Budget "' + id + '" not found. Check the id of your budget in the "Advanced" section of the settings page.');
-      } else {
-        throw new Error('We had an unknown problem opening "' + id + '".');
+handlers['api/download-budget'] = async function ({
+  syncId,
+  password
+}) {
+  let _ref2 = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"]() || {},
+      currentId = _ref2.id;
+
+  if (currentId) {
+    await handlers['close-budget']();
+  }
+
+  let localBudget = (await handlers['get-budgets']()).find(b => b.groupId === syncId);
+
+  if (localBudget) {
+    await handlers['load-budget']({
+      id: localBudget.id
+    });
+    let result = await handlers['sync-budget']({
+      id: localBudget.id
+    });
+
+    if (result.error) {
+      throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getSyncError"])(result.error, localBudget.id));
+    }
+  } else {
+    let files = await handlers['get-remote-files']();
+    let file = files.find(f => f.groupId === syncId);
+
+    if (!file) {
+      throw new Error(`Budget "${syncId}" not found. Check the sync id of your budget in the "Advanced" section of the settings page.`);
+    }
+
+    if (file.encryptKeyId && !password) {
+      throw new Error(`File ${file.name} is encrypted. Please provide a password.`);
+    }
+
+    if (password) {
+      let result = await handlers['key-test']({
+        fileId: file.fileId,
+        password
+      });
+
+      if (result.error) {
+        throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getTestKeyError"])(result.error));
       }
     }
+
+    let result = await handlers['download-budget']({
+      fileId: file.fileId
+    });
+
+    if (result.error) {
+      throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getDownloadError"])(result.error, result.id));
+    }
+
+    await handlers['load-budget']({
+      id: result.id
+    });
   }
 };
 
@@ -45996,20 +45964,20 @@ handlers['api/start-import'] = async function ({
     avoidUpload: true
   }); // Clear out the default expense categories
 
-  await _db__WEBPACK_IMPORTED_MODULE_9__["runQuery"]('DELETE FROM categories WHERE is_income = 0');
-  await _db__WEBPACK_IMPORTED_MODULE_9__["runQuery"]('DELETE FROM category_groups WHERE is_income = 0'); // Turn syncing off
+  await _db__WEBPACK_IMPORTED_MODULE_10__["runQuery"]('DELETE FROM categories WHERE is_income = 0');
+  await _db__WEBPACK_IMPORTED_MODULE_10__["runQuery"]('DELETE FROM category_groups WHERE is_income = 0'); // Turn syncing off
 
-  Object(_sync__WEBPACK_IMPORTED_MODULE_13__["setSyncingMode"])('import');
+  Object(_sync__WEBPACK_IMPORTED_MODULE_14__["setSyncingMode"])('import');
   connection.send('start-import');
   IMPORT_MODE = true;
 };
 
 handlers['api/finish-import'] = async function () {
-  _sheet__WEBPACK_IMPORTED_MODULE_12__["get"]().markCacheDirty(); // We always need to fully reload the app. Importing doesn't touch
+  _sheet__WEBPACK_IMPORTED_MODULE_13__["get"]().markCacheDirty(); // We always need to fully reload the app. Importing doesn't touch
   // the spreadsheet, but we can't just recreate the spreadsheet
   // either; there is other internal state that isn't created
 
-  let _prefs$getPrefs = _prefs__WEBPACK_IMPORTED_MODULE_11__["getPrefs"](),
+  let _prefs$getPrefs = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"](),
       id = _prefs$getPrefs.id;
 
   await handlers['close-budget']();
@@ -46017,15 +45985,15 @@ handlers['api/finish-import'] = async function () {
     id
   });
   await handlers['get-budget-bounds']();
-  await _sheet__WEBPACK_IMPORTED_MODULE_12__["waitOnSpreadsheet"]();
-  await _cloud_storage__WEBPACK_IMPORTED_MODULE_7__["upload"]().catch(err => {});
+  await _sheet__WEBPACK_IMPORTED_MODULE_13__["waitOnSpreadsheet"]();
+  await _cloud_storage__WEBPACK_IMPORTED_MODULE_8__["upload"]().catch(err => {});
   connection.send('finish-import');
   IMPORT_MODE = false;
 };
 
 handlers['api/abort-import'] = async function () {
   if (IMPORT_MODE) {
-    let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_11__["getPrefs"](),
+    let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"](),
         id = _prefs$getPrefs2.id;
 
     await handlers['close-budget']();
@@ -46041,7 +46009,7 @@ handlers['api/abort-import'] = async function () {
 handlers['api/query'] = async function ({
   query
 }) {
-  return Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(query);
+  return Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(query);
 };
 
 handlers['api/budget-months'] = async function () {
@@ -46049,18 +46017,18 @@ handlers['api/budget-months'] = async function () {
       start = _await$handlers$getB2.start,
       end = _await$handlers$getB2.end;
 
-  return _shared_months__WEBPACK_IMPORTED_MODULE_0__["range"](start, end);
+  return _shared_months__WEBPACK_IMPORTED_MODULE_1__["range"](start, end);
 };
 
 handlers['api/budget-month'] = async function ({
   month
 }) {
   await validateMonth(month);
-  let groups = await _db__WEBPACK_IMPORTED_MODULE_9__["getCategoriesGrouped"]();
-  let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__["sheetForMonth"](month);
+  let groups = await _db__WEBPACK_IMPORTED_MODULE_10__["getCategoriesGrouped"]();
+  let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_1__["sheetForMonth"](month);
 
   function value(name) {
-    let v = _sheet__WEBPACK_IMPORTED_MODULE_12__["get"]().getCellValue(sheetName, name);
+    let v = _sheet__WEBPACK_IMPORTED_MODULE_13__["get"]().getCellValue(sheetName, name);
     return v === '' ? 0 : v;
   } // This is duplicated from main.js because the return format is
   // different (for now)
@@ -46079,19 +46047,19 @@ handlers['api/budget-month'] = async function ({
     totalBalance: value('total-leftover'),
     categoryGroups: groups.map(group => {
       if (group.is_income) {
-        return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].toExternal(group)), {}, {
+        return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].toExternal(group)), {}, {
           received: value('total-income'),
-          categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].toExternal(cat)), {}, {
+          categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].toExternal(cat)), {}, {
             received: value(`sum-amount-${cat.id}`)
           }))
         });
       }
 
-      return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].toExternal(group)), {}, {
+      return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].toExternal(group)), {}, {
         budgeted: value(`group-budget-${group.id}`),
         spent: value(`group-sum-amount-${group.id}`),
         balance: value(`group-leftover-${group.id}`),
-        categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].toExternal(cat)), {}, {
+        categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].toExternal(cat)), {}, {
           budgeted: value(`budget-${cat.id}`),
           spent: value(`sum-amount-${cat.id}`),
           balance: value(`leftover-${cat.id}`),
@@ -46152,7 +46120,7 @@ handlers['api/transactions-add'] = withMutation(async function ({
   accountId,
   transactions
 }) {
-  await Object(_accounts_sync__WEBPACK_IMPORTED_MODULE_4__["addTransactions"])(accountId, transactions, {
+  await Object(_accounts_sync__WEBPACK_IMPORTED_MODULE_5__["addTransactions"])(accountId, transactions, {
     runTransfers: false
   });
   return 'ok';
@@ -46163,7 +46131,7 @@ handlers['api/transactions-get'] = async function ({
   startDate,
   endDate
 }) {
-  let _await$aqlQuery = await Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+  let _await$aqlQuery = await Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_2__["default"])('transactions').filter({
     $and: [accountId && {
       account: accountId
     }, startDate && {
@@ -46194,20 +46162,20 @@ handlers['api/transaction-update'] = withMutation(async function ({
   id,
   fields
 }) {
-  let _await$aqlQuery2 = await Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+  let _await$aqlQuery2 = await Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_2__["default"])('transactions').filter({
     id
   }).select('*').options({
     splits: 'grouped'
   })),
       data = _await$aqlQuery2.data;
 
-  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["ungroupTransactions"])(data);
+  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["ungroupTransactions"])(data);
 
   if (transactions.length === 0) {
     return [];
   }
 
-  let _updateTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["updateTransaction"])(transactions, fields),
+  let _updateTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["updateTransaction"])(transactions, fields),
       diff = _updateTransaction.diff;
 
   return handlers['transactions-batch-update'](diff);
@@ -46215,28 +46183,28 @@ handlers['api/transaction-update'] = withMutation(async function ({
 handlers['api/transaction-delete'] = withMutation(async function ({
   id
 }) {
-  let _await$aqlQuery3 = await Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+  let _await$aqlQuery3 = await Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_2__["default"])('transactions').filter({
     id
   }).select('*').options({
     splits: 'grouped'
   })),
       data = _await$aqlQuery3.data;
 
-  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["ungroupTransactions"])(data);
+  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["ungroupTransactions"])(data);
 
   if (transactions.length === 0) {
     return [];
   }
 
-  let _deleteTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["deleteTransaction"])(transactions, id),
+  let _deleteTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["deleteTransaction"])(transactions, id),
       diff = _deleteTransaction.diff;
 
   return handlers['transactions-batch-update'](diff);
 });
 
 handlers['api/accounts-get'] = async function () {
-  let accounts = await _db__WEBPACK_IMPORTED_MODULE_9__["getAccounts"]();
-  return accounts.map(account => _api_models__WEBPACK_IMPORTED_MODULE_5__["accountModel"].toExternal(account));
+  let accounts = await _db__WEBPACK_IMPORTED_MODULE_10__["getAccounts"]();
+  return accounts.map(account => _api_models__WEBPACK_IMPORTED_MODULE_6__["accountModel"].toExternal(account));
 };
 
 handlers['api/account-create'] = withMutation(async function ({
@@ -46250,16 +46218,16 @@ handlers['api/account-create'] = withMutation(async function ({
     closed: account.closed,
     // Current the API expects an amount but it really should expect
     // an integer
-    balance: initialBalance != null ? Object(_shared_util__WEBPACK_IMPORTED_MODULE_3__["integerToAmount"])(initialBalance) : null
+    balance: initialBalance != null ? Object(_shared_util__WEBPACK_IMPORTED_MODULE_4__["integerToAmount"])(initialBalance) : null
   });
 });
 handlers['api/account-update'] = withMutation(async function ({
   id,
   fields
 }) {
-  return _db__WEBPACK_IMPORTED_MODULE_9__["updateAccount"](_objectSpread({
+  return _db__WEBPACK_IMPORTED_MODULE_10__["updateAccount"](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["accountModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["accountModel"].fromExternal(fields)));
 });
 handlers['api/account-close'] = withMutation(async function ({
   id,
@@ -46292,7 +46260,7 @@ handlers['api/categories-get'] = async function ({
   grouped
 } = {}) {
   let result = await handlers['get-categories']();
-  return grouped ? result.grouped.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].toExternal) : result.list.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].toExternal);
+  return grouped ? result.grouped.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].toExternal) : result.list.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].toExternal);
 };
 
 handlers['api/category-group-create'] = withMutation(async function ({
@@ -46308,7 +46276,7 @@ handlers['api/category-group-update'] = withMutation(async function ({
 }) {
   return handlers['category-group-update'](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].fromExternal(fields)));
 });
 handlers['api/category-group-delete'] = withMutation(async function ({
   id,
@@ -46334,7 +46302,7 @@ handlers['api/category-update'] = withMutation(async function ({
 }) {
   return handlers['category-update'](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].fromExternal(fields)));
 });
 handlers['api/category-delete'] = withMutation(async function ({
   id,
@@ -46348,7 +46316,7 @@ handlers['api/category-delete'] = withMutation(async function ({
 
 handlers['api/payees-get'] = async function () {
   let payees = await handlers['payees-get']();
-  return payees.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["payeeModel"].toExternal);
+  return payees.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["payeeModel"].toExternal);
 };
 
 handlers['api/payee-create'] = withMutation(async function ({
@@ -46365,7 +46333,7 @@ handlers['api/payee-update'] = withMutation(async function ({
   return handlers['payees-batch-change']({
     updated: [_objectSpread({
       id
-    }, _api_models__WEBPACK_IMPORTED_MODULE_5__["payeeModel"].fromExternal(fields))]
+    }, _api_models__WEBPACK_IMPORTED_MODULE_6__["payeeModel"].fromExternal(fields))]
   });
 });
 handlers['api/payee-delete'] = withMutation(async function ({
@@ -46384,7 +46352,7 @@ handlers['api/payee-rules-get'] = async function ({
   let rules = await handlers['payees-get-rules']({
     id: payeeId
   });
-  return rules.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["payeeRuleModel"].toExternal);
+  return rules.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["payeeRuleModel"].toExternal);
 };
 
 handlers['api/payee-rule-create'] = withMutation(async function ({
@@ -46403,7 +46371,7 @@ handlers['api/payee-rule-update'] = withMutation(async function ({
 }) {
   return handlers['payees-update-rule'](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["payeeRuleModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["payeeRuleModel"].fromExternal(fields)));
 });
 handlers['api/payee-rule-delete'] = withMutation(async function ({
   id
@@ -46674,7 +46642,6 @@ function makePath(state, path) {
 
 function resolvePath(state, path) {
   let paths = path.split('.');
-  let tableId;
   paths = paths.reduce((acc, name) => {
     let fullName = acc.context + '.' + name;
     return {
@@ -47073,19 +47040,6 @@ const compileExpr = saveStack('expr', (state, expr) => {
 
   return compileLiteral(expr);
 });
-
-function assertType(name, data, acceptedTypes) {
-  if (acceptedTypes.indexOf(data.type) === -1) {
-    throw new CompileError(`Invalid type of expression to ${name}, must be one of ${JSON.stringify(acceptedTypes)}: ${JSON.stringify(data.value)}`);
-  }
-}
-
-function assertArgLength(name, args, len) {
-  if (args.length !== len) {
-    throw new CompileError(`Invalid number of args to ${name}: expected ${len} but received ${args.length}`)();
-  }
-}
-
 const compileFunction = saveStack('function', (state, func) => {
   let _Object$keys = Object.keys(func),
       _Object$keys2 = _slicedToArray(_Object$keys, 1),
@@ -47170,34 +47124,21 @@ const compileFunction = saveStack('function', (state, func) => {
     case '$neg':
       {
         validateArgLength(args, 1);
-
-        let _valArray11 = valArray(state, args, ['float']),
-            _valArray12 = _slicedToArray(_valArray11, 1),
-            arg1 = _valArray12[0];
-
+        valArray(state, args, ['float']);
         return typed(`(-${val(state, args[0])})`, args[0].type);
       }
 
     case '$abs':
       {
         validateArgLength(args, 1);
-
-        let _valArray13 = valArray(state, args, ['float']),
-            _valArray14 = _slicedToArray(_valArray13, 1),
-            arg1 = _valArray14[0];
-
+        valArray(state, args, ['float']);
         return typed(`ABS(${val(state, args[0])})`, args[0].type);
       }
 
     case '$idiv':
       {
         validateArgLength(args, 2);
-
-        let _valArray15 = valArray(state, args, ['integer', 'integer']),
-            _valArray16 = _slicedToArray(_valArray15, 2),
-            arg1 = _valArray16[0],
-            arg2 = _valArray16[1];
-
+        valArray(state, args, ['integer', 'integer']);
         return typed(`(${val(state, args[0])} / ${val(state, args[1])})`, args[0].type);
       }
     // date functions
@@ -47223,9 +47164,9 @@ const compileFunction = saveStack('function', (state, func) => {
     case '$nocase':
       validateArgLength(args, 1);
 
-      let _valArray17 = valArray(state, args, ['string']),
-          _valArray18 = _slicedToArray(_valArray17, 1),
-          arg1 = _valArray18[0];
+      let _valArray11 = valArray(state, args, ['string']),
+          _valArray12 = _slicedToArray(_valArray11, 1),
+          arg1 = _valArray12[0];
 
       return typed(`${arg1} COLLATE NOCASE`, args[0].type);
 
@@ -47268,40 +47209,40 @@ const compileOp = saveStack('op', (state, fieldRef, opData) => {
   switch (op) {
     case '$gte':
       {
-        let _valArray19 = valArray(state, [lhs, rhs], [null, lhs.type]),
-            _valArray20 = _slicedToArray(_valArray19, 2),
-            left = _valArray20[0],
-            right = _valArray20[1];
+        let _valArray13 = valArray(state, [lhs, rhs], [null, lhs.type]),
+            _valArray14 = _slicedToArray(_valArray13, 2),
+            left = _valArray14[0],
+            right = _valArray14[1];
 
         return `${left} >= ${right}`;
       }
 
     case '$lte':
       {
-        let _valArray21 = valArray(state, [lhs, rhs], [null, lhs.type]),
-            _valArray22 = _slicedToArray(_valArray21, 2),
-            left = _valArray22[0],
-            right = _valArray22[1];
+        let _valArray15 = valArray(state, [lhs, rhs], [null, lhs.type]),
+            _valArray16 = _slicedToArray(_valArray15, 2),
+            left = _valArray16[0],
+            right = _valArray16[1];
 
         return `${left} <= ${right}`;
       }
 
     case '$gt':
       {
-        let _valArray23 = valArray(state, [lhs, rhs], [null, lhs.type]),
-            _valArray24 = _slicedToArray(_valArray23, 2),
-            left = _valArray24[0],
-            right = _valArray24[1];
+        let _valArray17 = valArray(state, [lhs, rhs], [null, lhs.type]),
+            _valArray18 = _slicedToArray(_valArray17, 2),
+            left = _valArray18[0],
+            right = _valArray18[1];
 
         return `${left} > ${right}`;
       }
 
     case '$lt':
       {
-        let _valArray25 = valArray(state, [lhs, rhs], [null, lhs.type]),
-            _valArray26 = _slicedToArray(_valArray25, 2),
-            left = _valArray26[0],
-            right = _valArray26[1];
+        let _valArray19 = valArray(state, [lhs, rhs], [null, lhs.type]),
+            _valArray20 = _slicedToArray(_valArray19, 2),
+            left = _valArray20[0],
+            right = _valArray20[1];
 
         return `${left} < ${right}`;
       }
@@ -47312,10 +47253,10 @@ const compileOp = saveStack('op', (state, fieldRef, opData) => {
           return `${val(state, lhs)} IS NULL`;
         }
 
-        let _valArray27 = valArray(state, [lhs, rhs], [null, lhs.type]),
-            _valArray28 = _slicedToArray(_valArray27, 2),
-            left = _valArray28[0],
-            right = _valArray28[1];
+        let _valArray21 = valArray(state, [lhs, rhs], [null, lhs.type]),
+            _valArray22 = _slicedToArray(_valArray21, 2),
+            left = _valArray22[0],
+            right = _valArray22[1];
 
         if (rhs.type === 'param') {
           let orders = state.namedParameters.map(param => {
@@ -47333,10 +47274,10 @@ const compileOp = saveStack('op', (state, fieldRef, opData) => {
 
     case '$oneof':
       {
-        let _valArray29 = valArray(state, [lhs, rhs], [null, 'array']),
-            _valArray30 = _slicedToArray(_valArray29, 2),
-            left = _valArray30[0],
-            right = _valArray30[1]; // Dedupe the ids
+        let _valArray23 = valArray(state, [lhs, rhs], [null, 'array']),
+            _valArray24 = _slicedToArray(_valArray23, 2),
+            left = _valArray24[0],
+            right = _valArray24[1]; // Dedupe the ids
 
 
         let ids = [...new Set(right)];
@@ -47345,10 +47286,10 @@ const compileOp = saveStack('op', (state, fieldRef, opData) => {
 
     case '$like':
       {
-        let _valArray31 = valArray(state, [lhs, rhs], ['string', 'string']),
-            _valArray32 = _slicedToArray(_valArray31, 2),
-            left = _valArray32[0],
-            right = _valArray32[1];
+        let _valArray25 = valArray(state, [lhs, rhs], ['string', 'string']),
+            _valArray26 = _slicedToArray(_valArray25, 2),
+            left = _valArray26[0],
+            right = _valArray26[1];
 
         return `${left} LIKE ${right}`;
       }
@@ -47618,7 +47559,7 @@ function isAggregateQuery(queryState) {
   return queryState.selectExpressions.find(expr => {
     if (typeof expr !== 'string') {
       let _Object$entries$3 = _slicedToArray(Object.entries(expr)[0], 2),
-          name = _Object$entries$3[0],
+          _ = _Object$entries$3[0],
           value = _Object$entries$3[1];
 
       return isAggregateFunction(value);
@@ -47673,15 +47614,13 @@ function compileQuery(queryState, schema, schemaConfig = {}) {
       groupExpressions = _customizeQuery.groupExpressions,
       orderExpressions = _customizeQuery.orderExpressions,
       limit = _customizeQuery.limit,
-      offset = _customizeQuery.offset,
-      calculation = _customizeQuery.calculation;
+      offset = _customizeQuery.offset;
 
   let select = '';
   let where = '';
   let joins = '';
   let groupBy = '';
   let orderBy = '';
-  let dependences = [];
   let state = {
     schema,
     implicitTableName: tableName,
@@ -48221,8 +48160,7 @@ function isHappyPathQuery(queryState) {
 }
 
 async function execTransactionsGrouped(state, queryState, sql, params, splitType, outputTypes) {
-  let tableName = queryState.table,
-      withDead = queryState.withDead;
+  let withDead = queryState.withDead;
   let whereDead = withDead ? '' : `AND ${sql.from}.tombstone = 0`;
 
   if (Object(_compiler__WEBPACK_IMPORTED_MODULE_2__["isAggregateQuery"])(queryState)) {
@@ -48290,7 +48228,6 @@ async function execTransactionsGrouped(state, queryState, sql, params, splitType
     WHERE ${where} ${whereDead}
     ${sql.orderBy}
   `;
-  let start = Date.now();
   let allRows = await _db__WEBPACK_IMPORTED_MODULE_0__["all"](finalSql); // Group the parents and children up
 
   let _allRows$reduce = allRows.reduce((acc, trans) => {
@@ -48558,9 +48495,7 @@ const schemaConfig = {
   },
 
   customizeQuery(queryState) {
-    let tableName = queryState.table,
-        _queryState$tableOpti = queryState.tableOptions,
-        tableOptions = _queryState$tableOpti === void 0 ? {} : _queryState$tableOpti;
+    let tableName = queryState.table;
 
     function orderBy(orders) {
       // If order was specified, always add id as the last sort to make
@@ -49068,11 +49003,12 @@ function stopBackupService() {
 /*!*********************************************************!*\
   !*** ./packages/loot-core/src/server/budget/actions.js ***!
   \*********************************************************/
-/*! exports provided: getBudget, setBudget, setBuffer, copyPreviousMonth, setZero, set3MonthAvg, holdForNextMonth, resetHold, coverOverspending, transferAvailable, transferCategory, setCategoryCarryover */
+/*! exports provided: getSheetValue, getBudget, setBudget, setBuffer, copyPreviousMonth, setZero, set3MonthAvg, holdForNextMonth, resetHold, coverOverspending, transferAvailable, transferCategory, setCategoryCarryover */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSheetValue", function() { return getSheetValue; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBudget", function() { return getBudget; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setBudget", function() { return setBudget; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setBuffer", function() { return setBuffer; });
@@ -49097,7 +49033,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
 async function getSheetValue(sheetName, cell) {
   const node = await _sheet__WEBPACK_IMPORTED_MODULE_4__["getCell"](sheetName, cell);
   return Object(_shared_util__WEBPACK_IMPORTED_MODULE_1__["safeNumber"])(typeof node.value === 'number' ? node.value : 0);
@@ -49106,7 +49041,6 @@ async function getSheetValue(sheetName, cell) {
 // and you shouldn't be allowed to pull non-existant money from
 // leftover.
 
-
 function calcBufferedAmount(toBudget, buffered, amount) {
   amount = Math.min(Math.max(amount, -buffered), Math.max(toBudget, 0));
   return buffered + amount;
@@ -49126,13 +49060,6 @@ function isReflectBudget() {
   return budgetType === 'report';
 }
 
-function isZeroBudget() {
-  let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_3__["getPrefs"](),
-      budgetType = _prefs$getPrefs2.budgetType;
-
-  return budgetType === 'rollover';
-}
-
 function dbMonth(month) {
   return parseInt(month.replace('-', ''));
 }
@@ -49410,6 +49337,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.js");
 /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.js");
 /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./actions */ "./packages/loot-core/src/server/budget/actions.js");
+/* harmony import */ var _goaltemplates__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./goaltemplates */ "./packages/loot-core/src/server/budget/goaltemplates.js");
+
 
 
 
@@ -49419,6 +49348,8 @@ app.method('budget/budget-amount', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__
 app.method('budget/copy-previous-month', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_actions__WEBPACK_IMPORTED_MODULE_3__["copyPreviousMonth"])));
 app.method('budget/set-zero', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_actions__WEBPACK_IMPORTED_MODULE_3__["setZero"])));
 app.method('budget/set-3month-avg', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_actions__WEBPACK_IMPORTED_MODULE_3__["set3MonthAvg"])));
+app.method('budget/apply-goal-template', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_goaltemplates__WEBPACK_IMPORTED_MODULE_4__["applyTemplate"])));
+app.method('budget/overwrite-goal-template', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_goaltemplates__WEBPACK_IMPORTED_MODULE_4__["overwriteTemplate"])));
 app.method('budget/hold-for-next-month', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_actions__WEBPACK_IMPORTED_MODULE_3__["holdForNextMonth"])));
 app.method('budget/reset-hold', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_actions__WEBPACK_IMPORTED_MODULE_3__["resetHold"])));
 app.method('budget/cover-overspending', Object(_mutators__WEBPACK_IMPORTED_MODULE_1__["mutator"])(Object(_undo__WEBPACK_IMPORTED_MODULE_2__["undoable"])(_actions__WEBPACK_IMPORTED_MODULE_3__["coverOverspending"])));
@@ -49482,21 +49413,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-
-function mergeUpdates(updates) {
-  const merged = {};
-  updates.forEach(update => {
-    Object.keys(update).forEach(sheet => {
-      if (merged[sheet]) {
-        merged[sheet] = _objectSpread(_objectSpread({}, merged[sheet]), update[sheet]);
-      } else {
-        merged[sheet] = update[sheet];
-      }
-    });
-  });
-  return merged;
-}
-
 function getBudgetType() {
   let meta = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().meta();
   return meta.budgetType || 'rollover';
@@ -49877,6 +49793,1864 @@ async function setType(type) {
 
 /***/ }),
 
+/***/ "./packages/loot-core/src/server/budget/goal-template.pegjs":
+/*!******************************************************************!*\
+  !*** ./packages/loot-core/src/server/budget/goal-template.pegjs ***!
+  \******************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*
+ * Generated by PEG.js 0.10.0.
+ *
+ * http://pegjs.org/
+ */
+
+
+
+function peg$subclass(child, parent) {
+  function ctor() { this.constructor = child; }
+  ctor.prototype = parent.prototype;
+  child.prototype = new ctor();
+}
+
+function peg$SyntaxError(message, expected, found, location) {
+  this.message  = message;
+  this.expected = expected;
+  this.found    = found;
+  this.location = location;
+  this.name     = "SyntaxError";
+
+  if (typeof Error.captureStackTrace === "function") {
+    Error.captureStackTrace(this, peg$SyntaxError);
+  }
+}
+
+peg$subclass(peg$SyntaxError, Error);
+
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+        literal: function(expectation) {
+          return "\"" + literalEscape(expectation.text) + "\"";
+        },
+
+        "class": function(expectation) {
+          var escapedParts = "",
+              i;
+
+          for (i = 0; i < expectation.parts.length; i++) {
+            escapedParts += expectation.parts[i] instanceof Array
+              ? classEscape(expectation.parts[i][0]) + "-" + classEscape(expectation.parts[i][1])
+              : classEscape(expectation.parts[i]);
+          }
+
+          return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
+        },
+
+        any: function(expectation) {
+          return "any character";
+        },
+
+        end: function(expectation) {
+          return "end of input";
+        },
+
+        other: function(expectation) {
+          return expectation.description;
+        }
+      };
+
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
+
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, '\\\\')
+      .replace(/"/g,  '\\"')
+      .replace(/\0/g, '\\0')
+      .replace(/\t/g, '\\t')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/[\x00-\x0F]/g,          function(ch) { return '\\x0' + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x'  + hex(ch); });
+  }
+
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, '\\\\')
+      .replace(/\]/g, '\\]')
+      .replace(/\^/g, '\\^')
+      .replace(/-/g,  '\\-')
+      .replace(/\0/g, '\\0')
+      .replace(/\t/g, '\\t')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/[\x00-\x0F]/g,          function(ch) { return '\\x0' + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x'  + hex(ch); });
+  }
+
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+
+  function describeExpected(expected) {
+    var descriptions = new Array(expected.length),
+        i, j;
+
+    for (i = 0; i < expected.length; i++) {
+      descriptions[i] = describeExpectation(expected[i]);
+    }
+
+    descriptions.sort();
+
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
+      }
+      descriptions.length = j;
+    }
+
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
+    }
+  }
+
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+  }
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
+
+function peg$parse(input, options) {
+  options = options !== void 0 ? options : {};
+
+  var peg$FAILED = {},
+
+      peg$startRuleFunctions = { expr: peg$parseexpr },
+      peg$startRuleFunction  = peg$parseexpr,
+
+      peg$c0 = /^[^\n]/,
+      peg$c1 = peg$classExpectation(["\n"], true, false),
+      peg$c2 = function(percent, category) { return { type: 'percentage', percent: +percent, category } },
+      peg$c3 = function(amount, weeks, starting, limit) { return { type: 'week', amount, weeks, starting, limit } },
+      peg$c4 = function(amount, month, from, repeat) { return {
+            type: from ? 'spend' : 'by',
+            amount,
+            month,
+            ...(repeat ? repeat[3] : {}),
+            from
+          } },
+      peg$c5 = function(monthly, limit) { return { type: 'simple', monthly, limit } },
+      peg$c6 = function(limit) { return { type: 'simple', limit } },
+      peg$c7 = peg$otherExpectation("repeat interval"),
+      peg$c8 = "month",
+      peg$c9 = peg$literalExpectation("month", false),
+      peg$c10 = function() { return { annual: false } },
+      peg$c11 = "months",
+      peg$c12 = peg$literalExpectation("months", false),
+      peg$c13 = function(months) { return { annual: false, repeat: +months } },
+      peg$c14 = "year",
+      peg$c15 = peg$literalExpectation("year", false),
+      peg$c16 = function() { return { annual: true } },
+      peg$c17 = "years",
+      peg$c18 = peg$literalExpectation("years", false),
+      peg$c19 = function(years) { return { annual: true, repeat: +years } },
+      peg$c20 = function(amount) { return amount },
+      peg$c21 = function() { return null },
+      peg$c22 = function(n) { return +n },
+      peg$c23 = "spend",
+      peg$c24 = peg$literalExpectation("spend", false),
+      peg$c25 = "from",
+      peg$c26 = peg$literalExpectation("from", false),
+      peg$c27 = function(month) { return month },
+      peg$c28 = "week",
+      peg$c29 = peg$literalExpectation("week", false),
+      peg$c30 = "weeks",
+      peg$c31 = peg$literalExpectation("weeks", false),
+      peg$c32 = "by",
+      peg$c33 = peg$literalExpectation("by", false),
+      peg$c34 = "of",
+      peg$c35 = peg$literalExpectation("of", false),
+      peg$c36 = "repeat",
+      peg$c37 = peg$literalExpectation("repeat", false),
+      peg$c38 = "every",
+      peg$c39 = peg$literalExpectation("every", false),
+      peg$c40 = "starting",
+      peg$c41 = peg$literalExpectation("starting", false),
+      peg$c42 = "up",
+      peg$c43 = peg$literalExpectation("up", false),
+      peg$c44 = "to",
+      peg$c45 = peg$literalExpectation("to", false),
+      peg$c46 = peg$otherExpectation("space"),
+      peg$c47 = " ",
+      peg$c48 = peg$literalExpectation(" ", false),
+      peg$c49 = peg$otherExpectation("digit"),
+      peg$c50 = /^[0-9]/,
+      peg$c51 = peg$classExpectation([["0", "9"]], false, false),
+      peg$c52 = peg$otherExpectation("number"),
+      peg$c53 = peg$otherExpectation("amount"),
+      peg$c54 = ".",
+      peg$c55 = peg$literalExpectation(".", false),
+      peg$c56 = function(amount) { return +amount },
+      peg$c57 = peg$otherExpectation("percentage"),
+      peg$c58 = "%",
+      peg$c59 = peg$literalExpectation("%", false),
+      peg$c60 = function(percent) { return +percent },
+      peg$c61 = peg$otherExpectation("year"),
+      peg$c62 = peg$otherExpectation("month"),
+      peg$c63 = "-",
+      peg$c64 = peg$literalExpectation("-", false),
+      peg$c65 = peg$otherExpectation("day"),
+      peg$c66 = peg$otherExpectation("currency symbol"),
+      peg$c67 = peg$anyExpectation(),
+      peg$c68 = function(symbol) { return /\p{Sc}/u.test(symbol) },
+
+      peg$currPos          = 0,
+      peg$savedPos         = 0,
+      peg$posDetailsCache  = [{ line: 1, column: 1 }],
+      peg$maxFailPos       = 0,
+      peg$maxFailExpected  = [],
+      peg$silentFails      = 0,
+
+      peg$result;
+
+  if ("startRule" in options) {
+    if (!(options.startRule in peg$startRuleFunctions)) {
+      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+    }
+
+    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+  }
+
+  function text() {
+    return input.substring(peg$savedPos, peg$currPos);
+  }
+
+  function location() {
+    return peg$computeLocation(peg$savedPos, peg$currPos);
+  }
+
+  function expected(description, location) {
+    location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
+
+    throw peg$buildStructuredError(
+      [peg$otherExpectation(description)],
+      input.substring(peg$savedPos, peg$currPos),
+      location
+    );
+  }
+
+  function error(message, location) {
+    location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
+
+    throw peg$buildSimpleError(message, location);
+  }
+
+  function peg$literalExpectation(text, ignoreCase) {
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
+  }
+
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  }
+
+  function peg$anyExpectation() {
+    return { type: "any" };
+  }
+
+  function peg$endExpectation() {
+    return { type: "end" };
+  }
+
+  function peg$otherExpectation(description) {
+    return { type: "other", description: description };
+  }
+
+  function peg$computePosDetails(pos) {
+    var details = peg$posDetailsCache[pos], p;
+
+    if (details) {
+      return details;
+    } else {
+      p = pos - 1;
+      while (!peg$posDetailsCache[p]) {
+        p--;
+      }
+
+      details = peg$posDetailsCache[p];
+      details = {
+        line:   details.line,
+        column: details.column
+      };
+
+      while (p < pos) {
+        if (input.charCodeAt(p) === 10) {
+          details.line++;
+          details.column = 1;
+        } else {
+          details.column++;
+        }
+
+        p++;
+      }
+
+      peg$posDetailsCache[pos] = details;
+      return details;
+    }
+  }
+
+  function peg$computeLocation(startPos, endPos) {
+    var startPosDetails = peg$computePosDetails(startPos),
+        endPosDetails   = peg$computePosDetails(endPos);
+
+    return {
+      start: {
+        offset: startPos,
+        line:   startPosDetails.line,
+        column: startPosDetails.column
+      },
+      end: {
+        offset: endPos,
+        line:   endPosDetails.line,
+        column: endPosDetails.column
+      }
+    };
+  }
+
+  function peg$fail(expected) {
+    if (peg$currPos < peg$maxFailPos) { return; }
+
+    if (peg$currPos > peg$maxFailPos) {
+      peg$maxFailPos = peg$currPos;
+      peg$maxFailExpected = [];
+    }
+
+    peg$maxFailExpected.push(expected);
+  }
+
+  function peg$buildSimpleError(message, location) {
+    return new peg$SyntaxError(message, null, null, location);
+  }
+
+  function peg$buildStructuredError(expected, found, location) {
+    return new peg$SyntaxError(
+      peg$SyntaxError.buildMessage(expected, found),
+      expected,
+      found,
+      location
+    );
+  }
+
+  function peg$parseexpr() {
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
+
+    s0 = peg$currPos;
+    s1 = peg$parsepercent();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseof();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parse_();
+          if (s4 !== peg$FAILED) {
+            s5 = peg$currPos;
+            s6 = [];
+            if (peg$c0.test(input.charAt(peg$currPos))) {
+              s7 = input.charAt(peg$currPos);
+              peg$currPos++;
+            } else {
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$c1); }
+            }
+            while (s7 !== peg$FAILED) {
+              s6.push(s7);
+              if (peg$c0.test(input.charAt(peg$currPos))) {
+                s7 = input.charAt(peg$currPos);
+                peg$currPos++;
+              } else {
+                s7 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$c1); }
+              }
+            }
+            if (s6 !== peg$FAILED) {
+              s5 = input.substring(s5, peg$currPos);
+            } else {
+              s5 = s6;
+            }
+            if (s5 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c2(s1, s5);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parseamount();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        if (s2 !== peg$FAILED) {
+          s3 = peg$parserepeatEvery();
+          if (s3 !== peg$FAILED) {
+            s4 = peg$parse_();
+            if (s4 !== peg$FAILED) {
+              s5 = peg$parseweekCount();
+              if (s5 !== peg$FAILED) {
+                s6 = peg$parse_();
+                if (s6 !== peg$FAILED) {
+                  s7 = peg$parsestarting();
+                  if (s7 !== peg$FAILED) {
+                    s8 = peg$parse_();
+                    if (s8 !== peg$FAILED) {
+                      s9 = peg$parsedate();
+                      if (s9 !== peg$FAILED) {
+                        s10 = peg$parselimit();
+                        if (s10 === peg$FAILED) {
+                          s10 = null;
+                        }
+                        if (s10 !== peg$FAILED) {
+                          peg$savedPos = s0;
+                          s1 = peg$c3(s1, s5, s9, s10);
+                          s0 = s1;
+                        } else {
+                          peg$currPos = s0;
+                          s0 = peg$FAILED;
+                        }
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        s1 = peg$parseamount();
+        if (s1 !== peg$FAILED) {
+          s2 = peg$parse_();
+          if (s2 !== peg$FAILED) {
+            s3 = peg$parseby();
+            if (s3 !== peg$FAILED) {
+              s4 = peg$parse_();
+              if (s4 !== peg$FAILED) {
+                s5 = peg$parsemonth();
+                if (s5 !== peg$FAILED) {
+                  s6 = peg$parsespendFrom();
+                  if (s6 === peg$FAILED) {
+                    s6 = null;
+                  }
+                  if (s6 !== peg$FAILED) {
+                    s7 = peg$currPos;
+                    s8 = peg$parse_();
+                    if (s8 !== peg$FAILED) {
+                      s9 = peg$parserepeatEvery();
+                      if (s9 !== peg$FAILED) {
+                        s10 = peg$parse_();
+                        if (s10 !== peg$FAILED) {
+                          s11 = peg$parserepeat();
+                          if (s11 !== peg$FAILED) {
+                            s8 = [s8, s9, s10, s11];
+                            s7 = s8;
+                          } else {
+                            peg$currPos = s7;
+                            s7 = peg$FAILED;
+                          }
+                        } else {
+                          peg$currPos = s7;
+                          s7 = peg$FAILED;
+                        }
+                      } else {
+                        peg$currPos = s7;
+                        s7 = peg$FAILED;
+                      }
+                    } else {
+                      peg$currPos = s7;
+                      s7 = peg$FAILED;
+                    }
+                    if (s7 === peg$FAILED) {
+                      s7 = null;
+                    }
+                    if (s7 !== peg$FAILED) {
+                      peg$savedPos = s0;
+                      s1 = peg$c4(s1, s5, s6, s7);
+                      s0 = s1;
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          s1 = peg$parseamount();
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parselimit();
+            if (s2 === peg$FAILED) {
+              s2 = null;
+            }
+            if (s2 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c5(s1, s2);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseupTo();
+            if (s1 !== peg$FAILED) {
+              s2 = peg$parse_();
+              if (s2 !== peg$FAILED) {
+                s3 = peg$parseamount();
+                if (s3 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$c6(s3);
+                  s0 = s1;
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parserepeat() {
+    var s0, s1, s2, s3;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 5) === peg$c8) {
+      s1 = peg$c8;
+      peg$currPos += 5;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c9); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$c10();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsed();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        if (s2 !== peg$FAILED) {
+          if (input.substr(peg$currPos, 6) === peg$c11) {
+            s3 = peg$c11;
+            peg$currPos += 6;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c12); }
+          }
+          if (s3 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c13(s1);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 4) === peg$c14) {
+          s1 = peg$c14;
+          peg$currPos += 4;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c15); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c16();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          s1 = peg$parsed();
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 !== peg$FAILED) {
+              if (input.substr(peg$currPos, 5) === peg$c17) {
+                s3 = peg$c17;
+                peg$currPos += 5;
+              } else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$c18); }
+              }
+              if (s3 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c19(s1);
+                s0 = s1;
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        }
+      }
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c7); }
+    }
+
+    return s0;
+  }
+
+  function peg$parselimit() {
+    var s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseupTo();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parse_();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parseamount();
+          if (s4 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c20(s4);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseweekCount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = peg$parseweek();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$c21();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsenumber();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        if (s2 !== peg$FAILED) {
+          s3 = peg$parseweeks();
+          if (s3 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c22(s1);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsespendFrom() {
+    var s0, s1, s2, s3, s4, s5, s6;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    if (s1 !== peg$FAILED) {
+      if (input.substr(peg$currPos, 5) === peg$c23) {
+        s2 = peg$c23;
+        peg$currPos += 5;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$c24); }
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parse_();
+        if (s3 !== peg$FAILED) {
+          if (input.substr(peg$currPos, 4) === peg$c25) {
+            s4 = peg$c25;
+            peg$currPos += 4;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c26); }
+          }
+          if (s4 !== peg$FAILED) {
+            s5 = peg$parse_();
+            if (s5 !== peg$FAILED) {
+              s6 = peg$parsemonth();
+              if (s6 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c27(s6);
+                s0 = s1;
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseweek() {
+    var s0;
+
+    if (input.substr(peg$currPos, 4) === peg$c28) {
+      s0 = peg$c28;
+      peg$currPos += 4;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c29); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseweeks() {
+    var s0;
+
+    if (input.substr(peg$currPos, 5) === peg$c30) {
+      s0 = peg$c30;
+      peg$currPos += 5;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c31); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseby() {
+    var s0;
+
+    if (input.substr(peg$currPos, 2) === peg$c32) {
+      s0 = peg$c32;
+      peg$currPos += 2;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c33); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseof() {
+    var s0;
+
+    if (input.substr(peg$currPos, 2) === peg$c34) {
+      s0 = peg$c34;
+      peg$currPos += 2;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c35); }
+    }
+
+    return s0;
+  }
+
+  function peg$parserepeatEvery() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 6) === peg$c36) {
+      s1 = peg$c36;
+      peg$currPos += 6;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c37); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 !== peg$FAILED) {
+        if (input.substr(peg$currPos, 5) === peg$c38) {
+          s3 = peg$c38;
+          peg$currPos += 5;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c39); }
+        }
+        if (s3 !== peg$FAILED) {
+          s1 = [s1, s2, s3];
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsestarting() {
+    var s0;
+
+    if (input.substr(peg$currPos, 8) === peg$c40) {
+      s0 = peg$c40;
+      peg$currPos += 8;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c41); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseupTo() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c42) {
+      s1 = peg$c42;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c43); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 !== peg$FAILED) {
+        if (input.substr(peg$currPos, 2) === peg$c44) {
+          s3 = peg$c44;
+          peg$currPos += 2;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c45); }
+        }
+        if (s3 !== peg$FAILED) {
+          s1 = [s1, s2, s3];
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parse_() {
+    var s0, s1;
+
+    peg$silentFails++;
+    s0 = [];
+    if (input.charCodeAt(peg$currPos) === 32) {
+      s1 = peg$c47;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c48); }
+    }
+    if (s1 !== peg$FAILED) {
+      while (s1 !== peg$FAILED) {
+        s0.push(s1);
+        if (input.charCodeAt(peg$currPos) === 32) {
+          s1 = peg$c47;
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c48); }
+        }
+      }
+    } else {
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c46); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsed() {
+    var s0, s1;
+
+    peg$silentFails++;
+    if (peg$c50.test(input.charAt(peg$currPos))) {
+      s0 = input.charAt(peg$currPos);
+      peg$currPos++;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c51); }
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c49); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsenumber() {
+    var s0, s1, s2;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$parsed();
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parsed();
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c52); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseamount() {
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$parsecurrencySymbol();
+    if (s1 === peg$FAILED) {
+      s1 = null;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$currPos;
+        s4 = peg$currPos;
+        s5 = [];
+        s6 = peg$parsed();
+        if (s6 !== peg$FAILED) {
+          while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            s6 = peg$parsed();
+          }
+        } else {
+          s5 = peg$FAILED;
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$currPos;
+          if (input.charCodeAt(peg$currPos) === 46) {
+            s7 = peg$c54;
+            peg$currPos++;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c55); }
+          }
+          if (s7 !== peg$FAILED) {
+            s8 = peg$parsed();
+            if (s8 !== peg$FAILED) {
+              s9 = peg$parsed();
+              if (s9 !== peg$FAILED) {
+                s7 = [s7, s8, s9];
+                s6 = s7;
+              } else {
+                peg$currPos = s6;
+                s6 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s6;
+              s6 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s6;
+            s6 = peg$FAILED;
+          }
+          if (s6 === peg$FAILED) {
+            s6 = null;
+          }
+          if (s6 !== peg$FAILED) {
+            s5 = [s5, s6];
+            s4 = s5;
+          } else {
+            peg$currPos = s4;
+            s4 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+        if (s4 !== peg$FAILED) {
+          s3 = input.substring(s3, peg$currPos);
+        } else {
+          s3 = s4;
+        }
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c56(s3);
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c53); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsepercent() {
+    var s0, s1, s2, s3;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$parsed();
+    if (s3 !== peg$FAILED) {
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$parsed();
+      }
+    } else {
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) {
+      s1 = input.substring(s1, peg$currPos);
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      if (s2 !== peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 37) {
+          s3 = peg$c58;
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c59); }
+        }
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c60(s1);
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c57); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseyear() {
+    var s0, s1, s2, s3, s4, s5;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parsed();
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parsed();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parsed();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsed();
+          if (s5 !== peg$FAILED) {
+            s2 = [s2, s3, s4, s5];
+            s1 = s2;
+          } else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c61); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsemonth() {
+    var s0, s1, s2, s3, s4, s5;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parseyear();
+    if (s2 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 45) {
+        s3 = peg$c63;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$c64); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parsed();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsed();
+          if (s5 !== peg$FAILED) {
+            s2 = [s2, s3, s4, s5];
+            s1 = s2;
+          } else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c62); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseday() {
+    var s0, s1, s2, s3;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parsed();
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parsed();
+      if (s3 !== peg$FAILED) {
+        s2 = [s2, s3];
+        s1 = s2;
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c65); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsedate() {
+    var s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parsemonth();
+    if (s2 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 45) {
+        s3 = peg$c63;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$c64); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parseday();
+        if (s4 !== peg$FAILED) {
+          s2 = [s2, s3, s4];
+          s1 = s2;
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsecurrencySymbol() {
+    var s0, s1, s2;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    if (input.length > peg$currPos) {
+      s1 = input.charAt(peg$currPos);
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c67); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = peg$currPos;
+      s2 = peg$c68(s1);
+      if (s2) {
+        s2 = void 0;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c66); }
+    }
+
+    return s0;
+  }
+
+  peg$result = peg$startRuleFunction();
+
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
+    return peg$result;
+  } else {
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
+  }
+}
+
+module.exports = {
+  SyntaxError: peg$SyntaxError,
+  parse:       peg$parse
+};
+
+
+/***/ }),
+
+/***/ "./packages/loot-core/src/server/budget/goaltemplates.js":
+/*!***************************************************************!*\
+  !*** ./packages/loot-core/src/server/budget/goaltemplates.js ***!
+  \***************************************************************/
+/*! exports provided: applyTemplate, overwriteTemplate */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "applyTemplate", function() { return applyTemplate; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "overwriteTemplate", function() { return overwriteTemplate; });
+/* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/index.js");
+/* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.js");
+/* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.js");
+/* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.js");
+/* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./actions */ "./packages/loot-core/src/server/budget/actions.js");
+/* harmony import */ var _goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./goal-template.pegjs */ "./packages/loot-core/src/server/budget/goal-template.pegjs");
+/* harmony import */ var _goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__);
+
+
+
+
+
+
+function applyTemplate({
+  month
+}) {
+  return processTemplate(month, false);
+}
+function overwriteTemplate({
+  month
+}) {
+  return processTemplate(month, true);
+}
+
+async function processTemplate(month, force) {
+  let category_templates = await getCategoryTemplates();
+  let errors = [];
+  let categories = await _db__WEBPACK_IMPORTED_MODULE_3__["all"]('SELECT * FROM v_categories WHERE tombstone = 0');
+  let num_applied = 0;
+
+  for (let c = 0; c < categories.length; c++) {
+    let category = categories[c];
+    let budgeted = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(_shared_months__WEBPACK_IMPORTED_MODULE_1__["sheetForMonth"](month), `budget-${category.id}`);
+
+    if (budgeted === 0 || force) {
+      let template = category_templates[category.id];
+
+      if (template) {
+        errors = errors.concat(template.filter(t => t.type === 'error').map(({
+          line,
+          error
+        }) => [category.name + ': ' + error.message, line, ' '.repeat(TEMPLATE_PREFIX.length + error.location.start.offset) + '^'].join('\n')));
+        let to_budget = await applyCategoryTemplate(category, template, month, force);
+
+        if (to_budget != null) {
+          num_applied++;
+          await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["setBudget"])({
+            category: category.id,
+            month,
+            amount: to_budget
+          });
+        }
+      }
+    }
+  }
+
+  if (num_applied === 0) {
+    if (errors.length) {
+      return {
+        type: 'error',
+        sticky: true,
+        message: `There were errors interpreting some templates:`,
+        pre: errors.join('\n\n')
+      };
+    } else {
+      return {
+        type: 'message',
+        message: 'All categories were up to date.'
+      };
+    }
+  } else {
+    let applied = `Successfully applied templates to ${num_applied} ${num_applied === 1 ? 'category' : 'categories'}.`;
+
+    if (errors.length) {
+      return {
+        sticky: true,
+        message: `${applied} There were errors interpreting some templates:`,
+        pre: errors.join('\n\n')
+      };
+    } else {
+      return {
+        type: 'message',
+        message: applied
+      };
+    }
+  }
+}
+
+const TEMPLATE_PREFIX = '#template ';
+
+async function getCategoryTemplates() {
+  let templates = {};
+  let notes = await _db__WEBPACK_IMPORTED_MODULE_3__["all"](`SELECT * FROM notes WHERE lower(note) like '%${TEMPLATE_PREFIX}%'`);
+
+  for (let n = 0; n < notes.length; n++) {
+    let lines = notes[n].note.split('\n');
+    let template_lines = [];
+
+    for (let l = 0; l < lines.length; l++) {
+      let line = lines[l].trim();
+      if (!line.toLowerCase().startsWith(TEMPLATE_PREFIX)) continue;
+      let expression = line.slice(TEMPLATE_PREFIX.length);
+
+      try {
+        let parsed = Object(_goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__["parse"])(expression);
+        template_lines.push(parsed);
+      } catch (e) {
+        template_lines.push({
+          type: 'error',
+          line,
+          error: e
+        });
+      }
+    }
+
+    if (template_lines.length) {
+      templates[notes[n].id] = template_lines;
+    }
+  }
+
+  return templates;
+}
+
+async function applyCategoryTemplate(category, template_lines, month, force) {
+  let current_month = new Date(`${month}-01`); // remove lines for past dates, calculate repeating dates
+
+  let got_by = false;
+  template_lines = template_lines.filter(template => {
+    //debugger;
+    switch (template.type) {
+      case 'by':
+      case 'spend':
+        let target_month = new Date(`${template.month}-01`);
+        let num_months = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(target_month, current_month);
+        let repeat = template.annual ? (template.repeat || 1) * 12 : template.repeat;
+        let spend_from;
+
+        if (template.type === 'spend') {
+          spend_from = new Date(`${template.from}-01`);
+        }
+
+        while (num_months < 0 && repeat) {
+          target_month = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["addMonths"])(target_month, repeat);
+
+          if (spend_from) {
+            spend_from = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["addMonths"])(spend_from, repeat);
+          }
+
+          num_months = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(target_month, current_month);
+        }
+
+        if (num_months < 0) {
+          console.log(`${category.name}: ${`${template.month} is in the past:`} ${template.line}`);
+          return null;
+        }
+
+        template.month = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["format"])(target_month, 'yyyy-MM');
+
+        if (spend_from) {
+          template.from = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["format"])(spend_from, 'yyyy-MM');
+        }
+
+        break;
+
+      default:
+    }
+
+    return template;
+  });
+
+  if (template_lines.length > 1) {
+    template_lines = template_lines.sort((a, b) => {
+      if (a.type === 'by' && !a.annual) {
+        return Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(new Date(`${a.month}-01`), new Date(`${b.month}-01`));
+      } else {
+        return a.type.localeCompare(b.type);
+      }
+    }).filter(el => {
+      if (el.type === 'by') {
+        if (!got_by) {
+          got_by = true;
+          return el;
+        } else {
+          return null;
+        }
+      } else {
+        return el;
+      }
+    });
+  }
+
+  let to_budget = 0;
+  let limit;
+  let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_1__["sheetForMonth"](month);
+  let budgeted = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(sheetName, `budget-${category.id}`);
+  let spent = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(sheetName, `sum-amount-${category.id}`);
+  let balance = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(sheetName, `leftover-${category.id}`);
+  let last_month_balance = balance - spent - budgeted;
+
+  for (let l = 0; l < template_lines.length; l++) {
+    let template = template_lines[l];
+
+    switch (template.type) {
+      case 'simple':
+        {
+          // simple has 'monthly' and/or 'limit' params
+          if (template.limit != null) {
+            if (limit != null) {
+              console.log(`${category.name}: ${`More than one 'up to' limit found.`} ${template.line}`);
+              return null;
+            } else {
+              limit = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.limit);
+            }
+          }
+
+          if (template.monthly) {
+            let monthly = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.monthly);
+            to_budget += monthly;
+          } else {
+            to_budget += limit;
+          }
+
+          break;
+        }
+
+      case 'by':
+        {
+          // by has 'amount' and 'month' params
+          let target_month = new Date(`${template.month}-01`);
+          let target = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.amount);
+          let num_months = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(target_month, current_month);
+          let repeat = template.type === 'by' ? template.repeat : (template.repeat || 1) * 12;
+
+          while (num_months < 0 && repeat) {
+            target_month = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["addMonths"])(target_month, repeat);
+            num_months = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(target_month, current_month);
+          }
+
+          let diff = target - last_month_balance;
+
+          if (diff >= 0 && num_months > -1) {
+            to_budget += Math.round(diff / (num_months + 1));
+          }
+
+          break;
+        }
+
+      case 'week':
+        {
+          // week has 'amount', 'starting', 'weeks' and optional 'limit' params
+          let amount = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.amount);
+          let weeks = template.weeks != null ? Math.round(template.weeks) : 1;
+
+          if (template.limit != null) {
+            if (limit != null) {
+              console.log(`${category.name}: ${`More than one 'up to' limit found.`} ${template.line}`);
+              return null;
+            } else {
+              limit = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.limit);
+            }
+          }
+
+          let w = new Date(template.starting);
+          let next_month = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["addMonths"])(current_month, 1);
+
+          while (w.getTime() < next_month.getTime()) {
+            if (w.getTime() >= current_month.getTime()) {
+              to_budget += amount;
+            }
+
+            w = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["addWeeks"])(w, weeks);
+          }
+
+          break;
+        }
+
+      case 'spend':
+        {
+          // spend has 'amount' and 'from' and 'month' params
+          let from_month = new Date(`${template.from}-01`);
+          let to_month = new Date(`${template.month}-01`);
+          let already_budgeted = last_month_balance;
+          let first_month = true;
+
+          for (let m = from_month; Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(current_month, m) > 0; m = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["addMonths"])(m, 1)) {
+            let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_1__["sheetForMonth"](Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["format"])(m, 'yyyy-MM'));
+
+            if (first_month) {
+              let spent = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(sheetName, `sum-amount-${category.id}`);
+              let balance = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(sheetName, `leftover-${category.id}`);
+              already_budgeted = balance - spent;
+              first_month = false;
+            } else {
+              let budgeted = await Object(_actions__WEBPACK_IMPORTED_MODULE_4__["getSheetValue"])(sheetName, `budget-${category.id}`);
+              already_budgeted += budgeted;
+            }
+          }
+
+          let num_months = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(to_month, current_month);
+          let target = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.amount);
+
+          if (num_months < 0) {
+            console.log(`${category.name}: ${`${template.to} is in the past:`} ${template.line}`);
+            return null;
+          } else if (num_months === 0) {
+            to_budget = target - already_budgeted;
+          } else {
+            to_budget = Math.round((target - already_budgeted) / (num_months + 1));
+          }
+
+          break;
+        }
+
+      case 'percentage':
+        {
+          /*
+            let income_category = (await actual.getCategories()).filter(c => c.is_income == true && c.name == template.category);
+            let func = (getBudgetMonthTestFunc || getBudgetMonth);
+            let budget = await func(month);
+            for (var g = 0; g < budget.categoryGroups.length; g++) {
+              if (income_category.group_id == budget.categoryGroups[g].id) {
+                for (var c = 0; c < budget.categoryGroups[g].categories.length; c++)
+                  if (income_category.id == budget.categoryGroups[g].categories[c].id) {
+                    let month_category = budget.categoryGroups[g].categories[c];
+                  }
+              }
+            }
+            */
+          break;
+        }
+
+      case 'error':
+        return null;
+
+      default:
+    }
+  }
+
+  if (limit != null) {
+    if (to_budget + last_month_balance > limit) {
+      to_budget = limit - last_month_balance;
+    }
+  }
+
+  if ((category.budgeted != null && category.budgeted !== 0 || to_budget === 0) && !force) {
+    return null;
+  } else if (category.budgeted === to_budget && force) {
+    return null;
+  } else {
+    let str = category.name + ': ' + Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["integerToAmount"])(last_month_balance);
+    str += ' + ' + Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["integerToAmount"])(to_budget) + ' = ' + Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["integerToAmount"])(last_month_balance + to_budget);
+    str += ' ' + template_lines.map(x => x.line).join('\n');
+    console.log(str);
+    return to_budget;
+  }
+}
+
+/***/ }),
+
 /***/ "./packages/loot-core/src/server/budget/report.js":
 /*!********************************************************!*\
   !*** ./packages/loot-core/src/server/budget/report.js ***!
@@ -50508,7 +52282,6 @@ async function upload() {
     });
   } catch (err) {
     console.log('Upload failure', err);
-    let reason = err instanceof _errors__WEBPACK_IMPORTED_MODULE_6__["PostError"] ? err.reason : 'network';
 
     if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_6__["PostError"]) {
       throw new _errors__WEBPACK_IMPORTED_MODULE_6__["FileUploadError"](err.reason === 'unauthorized' ? 'unauthorized' : err.reason || 'network');
@@ -50534,8 +52307,7 @@ async function possiblyUpload() {
   let _prefs$getPrefs5 = _prefs__WEBPACK_IMPORTED_MODULE_9__["getPrefs"](),
       cloudFileId = _prefs$getPrefs5.cloudFileId,
       groupId = _prefs$getPrefs5.groupId,
-      lastUploaded = _prefs$getPrefs5.lastUploaded,
-      id = _prefs$getPrefs5.id;
+      lastUploaded = _prefs$getPrefs5.lastUploaded;
 
   let threshold = lastUploaded && _shared_months__WEBPACK_IMPORTED_MODULE_4__["addDays"](lastUploaded, UPLOAD_FREQUENCY_IN_DAYS);
   let currentDay = _shared_months__WEBPACK_IMPORTED_MODULE_4__["currentDay"](); // We only want to try to upload every UPLOAD_FREQUENCY_IN_DAYS days
@@ -51765,44 +53537,6 @@ async function getTransaction(id) {
   let rows = await selectWithSchema('transactions', 'SELECT * FROM v_transactions WHERE id = ?', [id]);
   return rows[0];
 }
-
-function _addFragmentForAccount(accountId, addWhere, options = {}) {
-  let _options$showClosed = options.showClosed,
-      showClosed = _options$showClosed === void 0 ? false : _options$showClosed,
-      _options$showOffbudge = options.showOffbudget,
-      showOffbudget = _options$showOffbudge === void 0 ? true : _options$showOffbudge;
-  let fragment = addWhere ? ' WHERE (' : ' AND ';
-  let params = [];
-
-  if (accountId) {
-    if (accountId === 'offbudget') {
-      fragment += 'a.closed = 0 AND a.offbudget = 1 ';
-    } else if (accountId === 'budgeted') {
-      fragment += 'a.closed = 0 AND a.offbudget = 0 ';
-    } else if (accountId === 'uncategorized') {
-      fragment += `
-          t.category IS NULL AND a.offbudget = 0 AND isParent = 0 AND (
-            ta.offbudget IS NULL OR ta.offbudget = 1
-          )
-        `;
-    } else {
-      fragment += 'a.id = ? ';
-      params.push(accountId);
-    }
-  } else {
-    fragment += showClosed ? '1' : 'a.closed = 0';
-
-    if (!showOffbudget) {
-      fragment += ' AND a.offbudget = 0';
-    }
-  }
-
-  return {
-    fragment,
-    params
-  };
-}
-
 async function getTransactionsByDate(accountId, startDate, endDate, options = {}) {
   throw new Error('`getTransactionsByDate` is deprecated');
 }
@@ -52401,10 +54135,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.js");
 /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.js");
 /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.js");
-/* harmony import */ var _tracking_events__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./tracking/events */ "./packages/loot-core/src/server/tracking/events.js");
-/* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.js");
-/* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.js");
-/* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.js");
+/* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.js");
+/* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.js");
+/* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.js");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -52469,7 +54202,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-
 
 
 const YNAB4 = __webpack_require__(/*! @actual-app/import-ynab4/importer */ "./packages/import-ynab4/importer.js");
@@ -52509,10 +54241,10 @@ function onSheetChange({
 
 let handlers = {};
 handlers['undo'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function () {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["undo"])();
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["undo"])();
 });
 handlers['redo'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(function () {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["redo"])();
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["redo"])();
 });
 handlers['transactions-batch-update'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function ({
   added,
@@ -52520,7 +54252,7 @@ handlers['transactions-batch-update'] = Object(_mutators__WEBPACK_IMPORTED_MODUL
   updated,
   learnCategories
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     let result = await Object(_accounts_transactions__WEBPACK_IMPORTED_MODULE_20__["batchUpdateTransactions"])({
       added,
       updated,
@@ -52694,7 +54426,7 @@ handlers['category-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mu
   groupId,
   isIncome
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     if (!groupId) {
       throw Object(_errors__WEBPACK_IMPORTED_MODULE_31__["APIError"])('Creating a category: groupId is required');
     }
@@ -52707,7 +54439,7 @@ handlers['category-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mu
   });
 });
 handlers['category-update'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function (category) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     try {
       await _db__WEBPACK_IMPORTED_MODULE_28__["updateCategory"](category);
     } catch (e) {
@@ -52730,7 +54462,7 @@ handlers['category-move'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["muta
   groupId,
   targetId
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["batchMessages"])(async () => {
       await _db__WEBPACK_IMPORTED_MODULE_28__["moveCategory"](id, groupId, targetId);
     });
@@ -52741,7 +54473,7 @@ handlers['category-delete'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mu
   id,
   transferId
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     let result = {};
     await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["batchMessages"])(async () => {
       let row = await _db__WEBPACK_IMPORTED_MODULE_28__["first"]('SELECT is_income FROM categories WHERE id = ?', [id]);
@@ -52786,7 +54518,7 @@ handlers['category-group-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33
   name,
   isIncome
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return _db__WEBPACK_IMPORTED_MODULE_28__["insertCategoryGroup"]({
       name,
       is_income: isIncome ? 1 : 0
@@ -52794,7 +54526,7 @@ handlers['category-group-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33
   });
 });
 handlers['category-group-update'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function (group) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return _db__WEBPACK_IMPORTED_MODULE_28__["updateCategoryGroup"](group);
   });
 });
@@ -52802,7 +54534,7 @@ handlers['category-group-move'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__
   id,
   targetId
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["batchMessages"])(async () => {
       await _db__WEBPACK_IMPORTED_MODULE_28__["moveCategoryGroup"](id, targetId);
     });
@@ -52813,7 +54545,7 @@ handlers['category-group-delete'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33
   id,
   transferId
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     const groupCategories = await _db__WEBPACK_IMPORTED_MODULE_28__["all"]('SELECT id FROM categories WHERE cat_group = ? AND tombstone = 0', [id]);
     return Object(_sync__WEBPACK_IMPORTED_MODULE_41__["batchMessages"])(async () => {
       if (transferId) {
@@ -52851,7 +54583,7 @@ handlers['must-category-transfer'] = async function ({
 handlers['payee-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function ({
   name
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return _db__WEBPACK_IMPORTED_MODULE_28__["insertPayee"]({
       name
     });
@@ -52864,7 +54596,6 @@ handlers['payees-get'] = async function () {
 
 handlers['payees-get-rule-counts'] = async function () {
   let payeeCounts = {};
-  let allRules = _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__["getRules"]();
   _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__["iterateIds"](_accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__["getRules"](), 'payee', (rule, id) => {
     if (payeeCounts[id] == null) {
       payeeCounts[id] = 0;
@@ -52879,7 +54610,7 @@ handlers['payees-merge'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutat
   targetId,
   mergeIds
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return _db__WEBPACK_IMPORTED_MODULE_28__["mergePayees"](targetId, mergeIds);
   }, {
     targetId,
@@ -52891,7 +54622,7 @@ handlers['payees-batch-change'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__
   deleted,
   updated
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return Object(_sync__WEBPACK_IMPORTED_MODULE_41__["batchMessages"])(async () => {
       if (deleted) {
         await Promise.all(deleted.map(p => _db__WEBPACK_IMPORTED_MODULE_28__["deletePayee"](p)));
@@ -52925,7 +54656,7 @@ handlers['payees-delete-rule'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__[
   id,
   payee_id
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return await _db__WEBPACK_IMPORTED_MODULE_28__["deletePayeeRule"]({
       id
     });
@@ -52934,14 +54665,14 @@ handlers['payees-delete-rule'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__[
   });
 });
 handlers['payees-update-rule'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function (rule) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     return await _db__WEBPACK_IMPORTED_MODULE_28__["updatePayeeRule"](rule);
   }, {
     payeeId: rule.payee_id
   });
 });
 handlers['payees-add-rule'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function (rule) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     let id = await _db__WEBPACK_IMPORTED_MODULE_28__["insertPayeeRule"](rule);
     return _objectSpread(_objectSpread({}, rule), {}, {
       id
@@ -53175,7 +54906,7 @@ handlers['account-update'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mut
   id,
   name
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     await _db__WEBPACK_IMPORTED_MODULE_28__["update"]('accounts', {
       id,
       name
@@ -53258,7 +54989,7 @@ handlers['account-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mut
   offBudget,
   closed
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     const id = await _db__WEBPACK_IMPORTED_MODULE_28__["insertAccount"]({
       name,
       type,
@@ -53270,7 +55001,7 @@ handlers['account-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mut
       transfer_acct: id
     });
 
-    if (balance != null) {
+    if (balance != null && balance !== 0) {
       let payee = await Object(_accounts_payees__WEBPACK_IMPORTED_MODULE_16__["getStartingBalancePayee"])();
       await _db__WEBPACK_IMPORTED_MODULE_28__["insertTransaction"]({
         account: id,
@@ -53298,7 +55029,7 @@ handlers['account-close'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["muta
   await handlers['account-unlink']({
     id
   });
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     let account = await _db__WEBPACK_IMPORTED_MODULE_28__["first"]('SELECT * FROM accounts WHERE id = ? AND tombstone = 0', [id]); // Do nothing if the account doesn't exist or it's already been
     // closed
 
@@ -53380,7 +55111,7 @@ handlers['account-close'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["muta
 handlers['account-reopen'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutator"])(async function ({
   id
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     await _db__WEBPACK_IMPORTED_MODULE_28__["update"]('accounts', {
       id,
       closed: 0
@@ -53391,7 +55122,7 @@ handlers['account-move'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mutat
   id,
   targetId
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     await _db__WEBPACK_IMPORTED_MODULE_28__["moveAccount"](id, targetId);
   });
 });
@@ -53480,9 +55211,6 @@ handlers['accounts-sync'] = async function ({
   let matchedTransactions = [];
   let updatedAccounts = [];
 
-  let _prefs$getPrefs = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
-      groupId = _prefs$getPrefs.groupId;
-
   for (var i = 0; i < accounts.length; i++) {
     const acct = accounts[i];
 
@@ -53514,7 +55242,7 @@ handlers['accounts-sync'] = async function ({
         } else {
           errors.push({
             accountId: acct.id,
-            message: 'There was an internal error. Please email help@actualbudget.com for support.',
+            message: 'There was an internal error. Please get in touch https://actualbudget.github.io/docs/Contact for support.',
             internal: err.stack
           });
           err.message = 'Failed syncing account: ' + err.message;
@@ -53543,7 +55271,7 @@ handlers['transactions-import'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__
   accountId,
   transactions
 }) {
-  return Object(_undo__WEBPACK_IMPORTED_MODULE_45__["withUndo"])(async () => {
+  return Object(_undo__WEBPACK_IMPORTED_MODULE_44__["withUndo"])(async () => {
     if (typeof accountId !== 'string') {
       throw Object(_errors__WEBPACK_IMPORTED_MODULE_31__["APIError"])('transactions-import: accountId must be an id');
     }
@@ -53641,11 +55369,6 @@ handlers['save-global-prefs'] = async function (prefs) {
     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.setItem('max-months', '' + prefs.maxMonths);
   }
 
-  if ('trackUsage' in prefs) {
-    _tracking_events__WEBPACK_IMPORTED_MODULE_44__["toggle"](prefs.trackUsage);
-    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.setItem('track-usage', '' + prefs.trackUsage);
-  }
-
   if ('autoUpdate' in prefs) {
     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.setItem('auto-update', '' + prefs.autoUpdate);
     process.send({
@@ -53668,8 +55391,8 @@ handlers['save-global-prefs'] = async function (prefs) {
 };
 
 handlers['load-global-prefs'] = async function () {
-  let _await$asyncStorage$m21 = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.multiGet(['floating-sidebar', 'seen-tutorial', 'max-months', 'track-usage', 'auto-update', 'document-dir', 'encrypt-key']),
-      _await$asyncStorage$m22 = _slicedToArray(_await$asyncStorage$m21, 7),
+  let _await$asyncStorage$m21 = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.multiGet(['floating-sidebar', 'seen-tutorial', 'max-months', 'auto-update', 'document-dir', 'encrypt-key']),
+      _await$asyncStorage$m22 = _slicedToArray(_await$asyncStorage$m21, 6),
       _await$asyncStorage$m23 = _slicedToArray(_await$asyncStorage$m22[0], 2),
       floatingSidebar = _await$asyncStorage$m23[1],
       _await$asyncStorage$m24 = _slicedToArray(_await$asyncStorage$m22[1], 2),
@@ -53677,20 +55400,16 @@ handlers['load-global-prefs'] = async function () {
       _await$asyncStorage$m25 = _slicedToArray(_await$asyncStorage$m22[2], 2),
       maxMonths = _await$asyncStorage$m25[1],
       _await$asyncStorage$m26 = _slicedToArray(_await$asyncStorage$m22[3], 2),
-      trackUsage = _await$asyncStorage$m26[1],
+      autoUpdate = _await$asyncStorage$m26[1],
       _await$asyncStorage$m27 = _slicedToArray(_await$asyncStorage$m22[4], 2),
-      autoUpdate = _await$asyncStorage$m27[1],
+      documentDir = _await$asyncStorage$m27[1],
       _await$asyncStorage$m28 = _slicedToArray(_await$asyncStorage$m22[5], 2),
-      documentDir = _await$asyncStorage$m28[1],
-      _await$asyncStorage$m29 = _slicedToArray(_await$asyncStorage$m22[6], 2),
-      encryptKey = _await$asyncStorage$m29[1];
+      encryptKey = _await$asyncStorage$m28[1];
 
   return {
     floatingSidebar: floatingSidebar === 'true' ? true : false,
     seenTutorial: seenTutorial === 'true' ? true : false,
     maxMonths: Object(_shared_util__WEBPACK_IMPORTED_MODULE_12__["stringToInteger"])(maxMonths || ''),
-    // Default to true
-    trackUsage: trackUsage == null || trackUsage === 'true' ? true : false,
     autoUpdate: autoUpdate == null || autoUpdate === 'true' ? true : false,
     documentDir: documentDir || getDefaultDocumentDir(),
     keyId: encryptKey && JSON.parse(encryptKey).id
@@ -53698,8 +55417,8 @@ handlers['load-global-prefs'] = async function () {
 };
 
 handlers['save-prefs'] = async function (prefsToSet) {
-  let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
-      cloudFileId = _prefs$getPrefs2.cloudFileId; // Need to sync the budget name on the server as well
+  let _prefs$getPrefs = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
+      cloudFileId = _prefs$getPrefs.cloudFileId; // Need to sync the budget name on the server as well
 
 
   if (prefsToSet.budgetName && cloudFileId) {
@@ -53738,7 +55457,6 @@ handlers['key-make'] = async function ({
     throw new Error('user-set-key must be called with file loaded');
   }
 
-  let cloudFileId = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"]().cloudFileId;
   let salt = _encryption__WEBPACK_IMPORTED_MODULE_30__["default"].randomBytes(32).toString('base64');
   let id = uuid.v4Sync();
   let key = await _encryption__WEBPACK_IMPORTED_MODULE_30__["default"].createKey({
@@ -53840,22 +55558,13 @@ handlers['key-test'] = async function ({
   return {};
 };
 
-handlers['should-pitch-subscribe'] = async function () {
-  let seenSubscribe = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('seenSubscribe');
-  return seenSubscribe !== 'true';
-};
-
-handlers['has-pitched-subscribe'] = async function () {
-  await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.setItem('seenSubscribe', 'true');
-  return 'ok';
-};
-
 handlers['subscribe-needs-bootstrap'] = async function ({
   url
 } = {}) {
   if (Object(_server_config__WEBPACK_IMPORTED_MODULE_39__["getServer"])(url).BASE_SERVER === UNCONFIGURED_SERVER) {
     return {
-      bootstrapped: true
+      bootstrapped: true,
+      hasServer: false
     };
   }
 
@@ -53884,7 +55593,8 @@ handlers['subscribe-needs-bootstrap'] = async function ({
   }
 
   return {
-    bootstrapped: res.data.bootstrapped
+    bootstrapped: res.data.bootstrapped,
+    hasServer: true
   };
 };
 
@@ -53965,10 +55675,9 @@ handlers['subscribe-change-password'] = async function ({
   password
 }) {
   let userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('user-token');
-  let res;
 
   try {
-    res = await Object(_post__WEBPACK_IMPORTED_MODULE_36__["post"])(Object(_server_config__WEBPACK_IMPORTED_MODULE_39__["getServer"])().SIGNUP_SERVER + '/change-password', {
+    await Object(_post__WEBPACK_IMPORTED_MODULE_36__["post"])(Object(_server_config__WEBPACK_IMPORTED_MODULE_39__["getServer"])().SIGNUP_SERVER + '/change-password', {
       token: userToken,
       password
     });
@@ -54033,19 +55742,22 @@ handlers['get-server-url'] = async function () {
 };
 
 handlers['set-server-url'] = async function ({
-  url
+  url,
+  validate = true
 }) {
   if (url != null) {
-    // Validate the server is running
-    let _await$runHandler = await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['subscribe-needs-bootstrap'], {
-      url
-    }),
-        error = _await$runHandler.error;
+    if (validate) {
+      // Validate the server is running
+      let _await$runHandler = await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['subscribe-needs-bootstrap'], {
+        url
+      }),
+          error = _await$runHandler.error;
 
-    if (error) {
-      return {
-        error
-      };
+      if (error) {
+        return {
+          error
+        };
+      }
     }
   } else {
     // When the server isn't configured, we just use a placeholder
@@ -54185,26 +55897,31 @@ handlers['download-budget'] = async function ({
     }
   }
 
-  let id = result.id; // Load the budget and do a full sync
-
-  result = await loadBudget(result.id, VERSION, {
-    showUpdate: true
+  let id = result.id;
+  await handlers['load-budget']({
+    id
+  });
+  result = await handlers['sync-budget']({
+    id
   });
+  await handlers['close-budget']();
 
   if (result.error) {
-    return {
-      error: {
-        reason: result.error
-      }
-    };
+    return result;
   }
 
-  Object(_sync__WEBPACK_IMPORTED_MODULE_41__["setSyncingMode"])('enabled');
-  await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["initialFullSync"])();
-  await handlers['close-budget']();
   return {
     id
   };
+}; // open and sync, but don’t close
+
+
+handlers['sync-budget'] = async function ({
+  id
+}) {
+  Object(_sync__WEBPACK_IMPORTED_MODULE_41__["setSyncingMode"])('enabled');
+  await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["initialFullSync"])();
+  return {};
 };
 
 handlers['load-budget'] = async function ({
@@ -54225,31 +55942,6 @@ handlers['load-budget'] = async function ({
   let res = await loadBudget(id, VERSION, {
     showUpdate: true
   });
-
-  async function trackSizes() {
-    let getFileSize = async name => {
-      let dbFile = _platform_server_fs__WEBPACK_IMPORTED_MODULE_5___default.a.join(_platform_server_fs__WEBPACK_IMPORTED_MODULE_5___default.a.getBudgetDir(id), name);
-
-      try {
-        return await _platform_server_fs__WEBPACK_IMPORTED_MODULE_5___default.a.size(dbFile);
-      } catch (err) {
-        return null;
-      }
-    };
-
-    try {
-      let dbSize = await getFileSize('db.sqlite');
-      let cacheSize = await getFileSize('cache.sqlite');
-      _tracking_events__WEBPACK_IMPORTED_MODULE_44__["track"]('app:load-budget', {
-        size: dbSize,
-        cacheSize
-      });
-    } catch (err) {
-      console.warn(err);
-    }
-  }
-
-  trackSizes();
   return res;
 };
 
@@ -54328,10 +56020,10 @@ handlers['create-budget'] = async function ({
       // Unfortunately we need to load all of the existing files first
       // so we can detect conflicting names.
       let files = await handlers['get-budgets']();
-      budgetName = await Object(_util_budget_name__WEBPACK_IMPORTED_MODULE_47__["uniqueFileName"])(files);
+      budgetName = await Object(_util_budget_name__WEBPACK_IMPORTED_MODULE_46__["uniqueFileName"])(files);
     }
 
-    id = await Object(_util_budget_name__WEBPACK_IMPORTED_MODULE_47__["idFromFileName"])(budgetName);
+    id = await Object(_util_budget_name__WEBPACK_IMPORTED_MODULE_46__["idFromFileName"])(budgetName);
   }
 
   let budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_5___default.a.getBudgetDir(id);
@@ -54510,22 +56202,21 @@ async function loadBudget(id, appVersion, {
 
 
   if (!_prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"]().userId) {
-    let _await$asyncStorage$m30 = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.multiGet(['user-token']),
-        _await$asyncStorage$m31 = _slicedToArray(_await$asyncStorage$m30, 1),
-        _await$asyncStorage$m32 = _slicedToArray(_await$asyncStorage$m31[0], 2),
-        userId = _await$asyncStorage$m32[1];
+    let _await$asyncStorage$m29 = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.multiGet(['user-token']),
+        _await$asyncStorage$m30 = _slicedToArray(_await$asyncStorage$m29, 1),
+        _await$asyncStorage$m31 = _slicedToArray(_await$asyncStorage$m30[0], 2),
+        userId = _await$asyncStorage$m31[1];
 
     _prefs__WEBPACK_IMPORTED_MODULE_37__["savePrefs"]({
       userId
     });
   }
 
-  let _prefs$getPrefs3 = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
-      budgetVersion = _prefs$getPrefs3.budgetVersion,
-      budgetId = _prefs$getPrefs3.budgetId;
+  let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
+      budgetVersion = _prefs$getPrefs2.budgetVersion;
 
   try {
-    await Object(_update__WEBPACK_IMPORTED_MODULE_46__["updateVersion"])(budgetVersion, showUpdate);
+    await Object(_update__WEBPACK_IMPORTED_MODULE_45__["updateVersion"])(budgetVersion, showUpdate);
   } catch (e) {
     console.warn('Error updating', e);
     let result;
@@ -54589,7 +56280,7 @@ async function loadBudget(id, appVersion, {
   await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__["loadRules"]();
   await _sync_migrate__WEBPACK_IMPORTED_MODULE_42__["listen"]();
   await _main_app__WEBPACK_IMPORTED_MODULE_32__["default"].startServices();
-  Object(_undo__WEBPACK_IMPORTED_MODULE_45__["clearUndo"])(); // Ensure that syncing is enabled
+  Object(_undo__WEBPACK_IMPORTED_MODULE_44__["clearUndo"])(); // Ensure that syncing is enabled
 
   if (!global.__TESTING__) {
     if (process.env.IS_BETA || id === DEMO_BUDGET_ID) {
@@ -54613,8 +56304,8 @@ async function loadBudget(id, appVersion, {
 }
 
 handlers['get-upgrade-notifications'] = async function () {
-  let _prefs$getPrefs4 = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
-      id = _prefs$getPrefs4.id;
+  let _prefs$getPrefs3 = _prefs__WEBPACK_IMPORTED_MODULE_37__["getPrefs"](),
+      id = _prefs$getPrefs3.id;
 
   if (id === TEST_BUDGET_ID || id === DEMO_BUDGET_ID) {
     return [];
@@ -54696,13 +56387,6 @@ handlers['app-focused'] = async function () {
   }
 };
 
-handlers['track'] = async function ({
-  name,
-  props
-}) {
-  _tracking_events__WEBPACK_IMPORTED_MODULE_44__["track"](name, props);
-};
-
 handlers = Object(_api__WEBPACK_IMPORTED_MODULE_21__["default"])(handlers);
 
 _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1___default.a.send = (name, args) => Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(_main_app__WEBPACK_IMPORTED_MODULE_32__["default"].handlers[name], args); // A hack for now until we clean up everything
@@ -54755,7 +56439,6 @@ async function initApp(version, isDev, socketName) {
   VERSION = version;
   await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_7__["init"]();
   await Promise.all([_platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.init(), _platform_server_fs__WEBPACK_IMPORTED_MODULE_5___default.a.init()]);
-  await _tracking_events__WEBPACK_IMPORTED_MODULE_44__["init"]();
   await setupDocumentsDir();
   let keysStr = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('encrypt-keys');
 
@@ -54770,13 +56453,13 @@ async function initApp(version, isDev, socketName) {
       console.log('Error loading key', e);
       throw new Error('load-key-error');
     }
-  }
+  } // if (isDev) {
+  // const lastBudget = await asyncStorage.getItem('lastBudget');
+  // if (lastBudget) {
+  //   loadBudget(lastBudget, VERSION);
+  // }
+  // }
 
-  if (isDev) {
-    const lastBudget = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('lastBudget'); // if (lastBudget) {
-    //   loadBudget(lastBudget, VERSION);
-    // }
-  }
 
   const url = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('server-url');
 
@@ -54785,9 +56468,6 @@ async function initApp(version, isDev, socketName) {
   }
 
   connection.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_32__["default"].handlers);
-  _tracking_events__WEBPACK_IMPORTED_MODULE_44__["track"]('app:init', {
-    platform: _platform__WEBPACK_IMPORTED_MODULE_35__["default"].isMobile ? 'mobile' : _platform__WEBPACK_IMPORTED_MODULE_35__["default"].isWeb ? 'web' : 'desktop'
-  });
 
   if (!isDev && !_platform__WEBPACK_IMPORTED_MODULE_35__["default"].isMobile && !_platform__WEBPACK_IMPORTED_MODULE_35__["default"].isWeb) {
     let autoUpdate = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('auto-update');
@@ -54806,10 +56486,7 @@ async function initApp(version, isDev, socketName) {
     global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_41__["setSyncingMode"];
   }
 }
-async function init({
-  budgetId,
-  config
-}) {
+async function init(config) {
   // Get from build
   // eslint-disable-next-line
   VERSION = "0.0.147";
@@ -54832,6 +56509,12 @@ async function init({
 
   if (serverURL) {
     Object(_server_config__WEBPACK_IMPORTED_MODULE_39__["setServer"])(serverURL);
+
+    if (config.password) {
+      await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['subscribe-sign-in'], {
+        password: config.password
+      });
+    }
   } else {
     // This turns off all server URLs. In this mode we don't want any
     // access to the server, we are doing things locally
@@ -54841,12 +56524,6 @@ async function init({
     });
   }
 
-  if (budgetId) {
-    await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['load-budget'], {
-      id: budgetId
-    });
-  }
-
   return lib;
 } // Export a few things required for the platform
 
@@ -55493,7 +57170,6 @@ function throwIfNot200(res, text) {
 async function post(url, data) {
   let text;
   let res;
-  let s = new Error().stack;
 
   try {
     res = await fetch(url, {
@@ -55912,14 +57588,14 @@ async function createSchedule({
     }]
   });
   let now = Date.now();
-  let nextDateId = await _db__WEBPACK_IMPORTED_MODULE_11__["insertWithUUID"]('schedules_next_date', {
+  await _db__WEBPACK_IMPORTED_MODULE_11__["insertWithUUID"]('schedules_next_date', {
     schedule_id: scheduleId,
     local_next_date: nextDateRepr,
     local_next_date_ts: now,
     base_next_date: nextDateRepr,
     base_next_date_ts: now
   });
-  let id = await _db__WEBPACK_IMPORTED_MODULE_11__["insertWithSchema"]('schedules', _objectSpread(_objectSpread({}, schedule), {}, {
+  await _db__WEBPACK_IMPORTED_MODULE_11__["insertWithSchema"]('schedules', _objectSpread(_objectSpread({}, schedule), {}, {
     id: scheduleId,
     rule: ruleId
   }));
@@ -55980,7 +57656,7 @@ async function updateSchedule({
       // might switch accounts from a closed one
 
 
-      if (resetNextDate || !deep_equal__WEBPACK_IMPORTED_MODULE_1___default()(oldConditions.find(c => c.field === 'account'), oldConditions.find(c => c.field === 'account')) || !deep_equal__WEBPACK_IMPORTED_MODULE_1___default()(stripType(oldConditions.find(c => c.field === 'date')), stripType(newConditions.find(c => c.field === 'date')))) {
+      if (resetNextDate || !deep_equal__WEBPACK_IMPORTED_MODULE_1___default()(oldConditions.find(c => c.field === 'account'), oldConditions.find(c => c.field === 'account')) || !deep_equal__WEBPACK_IMPORTED_MODULE_1___default()(stripType(oldConditions.find(c => c.field === 'date') || {}), stripType(newConditions.find(c => c.field === 'date') || {}))) {
         await setNextDate({
           id: schedule.id,
           conditions: newConditions,
@@ -56078,10 +57754,8 @@ function trackJSONPaths() {
 }
 
 function onApplySync(oldValues, newValues) {
-  let found = false;
   newValues.forEach((items, table) => {
     if (table === 'rules') {
-      found = true;
       items.forEach(newValue => {
         onRuleUpdate(newValue);
       });
@@ -56315,7 +57989,6 @@ function matchSchedules(allOccurs, config, partialMatchRank = 0.5) {
   for (let trans of baseOccur.transactions) {
     let threshold = Object(_shared_rules__WEBPACK_IMPORTED_MODULE_3__["getApproxNumberThreshold"])(trans.amount);
     let payee = trans.payee;
-    let account = trans.account;
     let found = occurs.map(occur => {
       let matched = occur.transactions.find(t => t.amount >= trans.amount - threshold && t.amount <= trans.amount + threshold);
       matched = matched && matched.payee === payee ? matched : null;
@@ -56354,7 +58027,6 @@ function matchSchedules(allOccurs, config, partialMatchRank = 0.5) {
 
 async function schedulesForPattern(baseStart, numDays, baseConfig, accountId, partialMatchRank) {
   let schedules = [];
-  let i = 0;
 
   for (let i = 0; i < numDays; i++) {
     let start = date_fns__WEBPACK_IMPORTED_MODULE_0__["addDays"](baseStart, i);
@@ -57238,7 +58910,7 @@ class Spreadsheet {
           result = node._run(...args);
 
           if (result instanceof Promise) {
-            console.warn('dynamic cell returned a promise! this is discouraged because errors are not handled properly');
+            console.warn(`dynamic cell ${name} returned a promise! this is discouraged because errors are not handled properly`);
           }
         } else if (node.sql) {
           result = Object(_aql__WEBPACK_IMPORTED_MODULE_1__["runCompiledQuery"])(node.query, node.sql.sqlPieces, node.sql.state);
@@ -57280,7 +58952,7 @@ class Spreadsheet {
         names: this.computeQueue
       }); // Cache the updated cells
 
-      if (this.saveCache) {
+      if (typeof this.saveCache === 'function') {
         this.saveCache(this.computeQueue);
       }
 
@@ -57619,7 +59291,6 @@ function resolveNamesAsArrays(sheets) {
   Object.keys(sheets).forEach(sheetName => {
     const sheet = sheets[sheetName];
     sheet.forEach(name => {
-      const expr = sheet[name];
       cells.push(resolveName(sheetName, name));
     });
   });
@@ -57908,9 +59579,9 @@ function apply(msg, prev) {
 
   if (dataset === 'prefs') {// Do nothing, it doesn't exist in the db
   } else {
-    try {
-      let query;
+    let query;
 
+    try {
       if (prev) {
         query = {
           sql: _db__WEBPACK_IMPORTED_MODULE_7__["cache"](`UPDATE ${dataset} SET ${column} = ? WHERE id = ?`),
@@ -57924,9 +59595,14 @@ function apply(msg, prev) {
       }
 
       _db__WEBPACK_IMPORTED_MODULE_7__["runQuery"](query.sql, query.params);
-    } catch (e) {
-      //console.log(e);
-      throw new SyncError('invalid-schema');
+    } catch (error) {
+      throw new SyncError('invalid-schema', {
+        error: {
+          message: error.message,
+          stack: error.stack
+        },
+        query
+      });
     }
   }
 }
@@ -57959,8 +59635,12 @@ async function fetchAll(table, ids) {
     try {
       let rows = await _db__WEBPACK_IMPORTED_MODULE_7__["runQuery"](sql, partIds, true);
       results = results.concat(rows);
-    } catch (e) {
-      throw new SyncError('invalid-schema');
+    } catch (error) {
+      throw new SyncError('invalid-schema', {
+        error,
+        sql,
+        params: partIds
+      });
     }
   }
 
@@ -58040,11 +59720,7 @@ function applyMessagesForImport(messages) {
   _db__WEBPACK_IMPORTED_MODULE_7__["transaction"](() => {
     for (let i = 0; i < messages.length; i++) {
       let msg = messages[i];
-      let dataset = msg.dataset,
-          row = msg.row,
-          column = msg.column,
-          timestamp = msg.timestamp,
-          value = msg.value;
+      let dataset = msg.dataset;
 
       if (!msg.old) {
         try {
@@ -58241,11 +59917,13 @@ async function _sendMessages(messages) {
         // message.
         _main_app__WEBPACK_IMPORTED_MODULE_8__["default"].events.emit('sync', {
           type: 'error',
-          subtype: 'apply-failure'
+          subtype: 'apply-failure',
+          meta: e.meta
         });
       } else {
         _main_app__WEBPACK_IMPORTED_MODULE_8__["default"].events.emit('sync', {
-          type: 'error'
+          type: 'error',
+          meta: e.meta
         });
       }
     }
@@ -58480,7 +60158,6 @@ async function _fullSync(sinceTimestamp, count, prevDiffTime) {
   }
 
   let diffTime = _crdt__WEBPACK_IMPORTED_MODULE_6__["merkle"].diff(res.merkle, Object(_crdt__WEBPACK_IMPORTED_MODULE_6__["getClock"])().merkle);
-  let result = res.messages;
 
   if (diffTime !== null) {
     // This is a bit wonky, but we loop until we are in sync with the
@@ -58585,10 +60262,9 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function migrateParentIds(oldValues, newValues) {
+function migrateParentIds(_oldValues, newValues) {
   newValues.forEach((items, table) => {
     if (table === 'transactions') {
-      let old = oldValues.get(table);
       let toApply = [];
       items.forEach(newValue => {
         if (newValue.isChild === 1 && newValue.parent_id == null && newValue.id.includes('/')) {
@@ -60287,73 +61963,6 @@ app.method('tools/fix-split-transactions', async () => {
 
 /***/ }),
 
-/***/ "./packages/loot-core/src/server/tracking/events.js":
-/*!**********************************************************!*\
-  !*** ./packages/loot-core/src/server/tracking/events.js ***!
-  \**********************************************************/
-/*! exports provided: toggle, init, login, track, setProfile */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toggle", function() { return toggle; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "init", function() { return init; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "login", function() { return login; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "track", function() { return track; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setProfile", function() { return setProfile; });
-/* harmony import */ var _encryption_internals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../encryption-internals */ "./packages/loot-core/src/server/encryption-internals.js");
-
-let currentUniqueId;
-let mixpanel;
-let isEnabled = true;
-function toggle(trackUsage) {
-  isEnabled = trackUsage == null || trackUsage === 'true' ? true : false;
-} // TODO: Figure out location, send to EU data centers if in EU
-// {
-//     host: "api-eu.mixpanel.com",
-// },
-// This must stay up-to-date with all apps that hit mixpanel! That includes the
-// website and server. If changing this, make sure to change it everywhere
-
-async function hash(userId) {
-  let hashed = await Object(_encryption_internals__WEBPACK_IMPORTED_MODULE_0__["sha256String"])(userId);
-  return `user-${hashed.replace(/[=/]/g, '')}`;
-}
-
-function isAnonymous(id) {
-  return !id.startsWith('user-');
-}
-
-async function init() {}
-async function login(userId) {}
-let BUFFERING = false;
-let BUFFER = [];
-
-function startBuffering() {
-  BUFFERING = true;
-  BUFFER = [];
-}
-
-function stopBuffering() {
-  for (let call of BUFFER) {
-    call[0](...call[1]);
-  }
-
-  BUFFERING = false;
-  BUFFER = [];
-}
-
-function buffered(func) {
-  return (...args) => {
-    if (false) {}
-  };
-}
-
-const track = buffered((distinct_id, name, props) => {});
-const setProfile = buffered((distinct_id, props) => {});
-
-/***/ }),
-
 /***/ "./packages/loot-core/src/server/undo.js":
 /*!***********************************************!*\
   !*** ./packages/loot-core/src/server/undo.js ***!
@@ -61005,6 +62614,129 @@ function once(fn) {
 
 /***/ }),
 
+/***/ "./packages/loot-core/src/shared/errors.js":
+/*!*************************************************!*\
+  !*** ./packages/loot-core/src/shared/errors.js ***!
+  \*************************************************/
+/*! exports provided: getUploadError, getDownloadError, getCreateKeyError, getTestKeyError, getSubscribeError, getSyncError */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getUploadError", function() { return getUploadError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDownloadError", function() { return getDownloadError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getCreateKeyError", function() { return getCreateKeyError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getTestKeyError", function() { return getTestKeyError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSubscribeError", function() { return getSubscribeError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSyncError", function() { return getSyncError; });
+function getUploadError({
+  reason,
+  meta
+}) {
+  switch (reason) {
+    case 'unauthorized':
+      return 'You are not logged in.';
+
+    case 'encrypt-failure':
+      if (meta.isMissingKey) {
+        return 'Encrypting your file failed because you are missing your encryption key. Create your key in the next step.';
+      }
+
+      return 'Encrypting the file failed. You have the correct key so this is an internal bug. To fix this, generate a new key in the next step.';
+
+    case 'file-has-reset':
+      // Something really weird happened - during reset a sanity
+      // check on the server failed. The user just needs to
+      // restart the whole process.
+      return 'Something went wrong while resetting your file. Please try again.';
+
+    case 'file-has-new-key':
+      return 'Unable to encrypt your data because you are missing the key. Create the latest key in the next step.';
+
+    case 'network':
+      return 'Uploading the file failed. Check your network connection.';
+
+    case 'beta-version':
+      return 'You cannot perform this action in the beta version (resetting sync, deleting a file, etc).';
+
+    default:
+      return `An internal error occurred, sorry! Contact help@actualbudget.com for support. (ref: ${reason})`;
+  }
+}
+function getDownloadError({
+  reason,
+  meta,
+  fileName
+}) {
+  switch (reason) {
+    case 'network':
+    case 'download-failure':
+      return 'Downloading the file failed. Check your network connection.';
+
+    case 'invalid-zip-file':
+    case 'invalid-meta-file':
+      return 'Downloaded file is invalid, sorry! Contact help@actualbudget.com for support.';
+
+    case 'decrypt-failure':
+      return 'Unable to decrypt file ' + (fileName || '(unknown)') + '. To change your key, first ' + 'download this file with the proper password.';
+
+    case 'out-of-sync-migrations':
+      return 'This budget cannot be loaded with this version of the app. ' + 'Make sure the app is up-to-date.';
+
+    default:
+      let info = meta && meta.fileId ? `(fileId: ${meta.fileId})` : '';
+      return 'Something went wrong trying to download that file, sorry! Contact help@actualbudget.com for support. ' + info;
+  }
+}
+function getCreateKeyError(error) {
+  return getUploadError(error);
+}
+function getTestKeyError({
+  reason
+}) {
+  switch (reason) {
+    case 'network':
+      return 'Unable to connect to the server. We need to access our server to get some information about your keys.';
+
+    case 'old-key-style':
+      return 'This file is encrypted with an old unsupported key style. Recreate the key ' + 'on a device where the file is available, or use an older version of Actual to download ' + 'it.';
+
+    case 'decrypt-failure':
+      return 'Unable to decrypt file with this password. Please try again.';
+
+    default:
+      return 'Something went wrong trying to create a key, sorry! Contact help@actualbudget.com for support.';
+  }
+}
+function getSubscribeError({
+  reason
+}) {
+  switch (reason) {
+    case 'network':
+      return 'Unable to reach the server. Check your internet connection';
+
+    case 'exists':
+      return 'An account with that email already exists. Did you mean to login?';
+
+    case 'invalid-email':
+      return 'Invalid email';
+
+    default:
+      return 'An error occurred. Please try again later.';
+  }
+}
+function getSyncError(error, id) {
+  if (error === 'out-of-sync-migrations' || error === 'out-of-sync-data') {
+    return 'This budget cannot be loaded with this version of the app.';
+  } else if (error === 'budget-not-found') {
+    return 'Budget "' + id + '" not found. Check the id of your budget in the "Advanced" section of the settings page.';
+  } else {
+    return 'We had an unknown problem opening "' + id + '".';
+  }
+}
+
+/***/ }),
+
 /***/ "./packages/loot-core/src/shared/months.js":
 /*!*************************************************!*\
   !*** ./packages/loot-core/src/shared/months.js ***!
@@ -61561,6 +63293,9 @@ function mapField(field, opts) {
     case 'amount-outflow':
       return 'amount (outflow)';
 
+    case 'cleared':
+      return 'cleared';
+
     default:
       return field;
   }
@@ -61664,7 +63399,7 @@ function getFieldError(type) {
       return 'Please choose a valid field for this type of rule';
 
     default:
-      return 'Internal error, sorry! Contact help@actualbudget.com';
+      return 'Internal error, sorry! Please get in touch https://actualbudget.github.io/docs/Contact/ for support';
   }
 }
 function sortNumbers(num1, num2) {
@@ -61680,7 +63415,7 @@ function parse(item) {
       {
         let parsed = item.value;
 
-        if (item.field === 'amount' && item.op !== 'isbetween') {
+        if (item.field === 'amount' && item.op !== 'isbetween' && parsed != null) {
           parsed = Object(_util__WEBPACK_IMPORTED_MODULE_0__["integerToAmount"])(parsed);
         }
 
@@ -61697,6 +63432,14 @@ function parse(item) {
         });
       }
 
+    case 'boolean':
+      {
+        let parsed = item.value;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          value: parsed
+        });
+      }
+
     default:
   }
 
@@ -61731,6 +63474,14 @@ function unparse(_ref) {
         });
       }
 
+    case 'boolean':
+      {
+        let unparsed = item.value == null ? false : item.value;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          value: unparsed
+        });
+      }
+
     default:
   }
 
@@ -61743,7 +63494,7 @@ function makeValue(value, cond) {
         if (cond.op !== 'isbetween') {
           return _objectSpread(_objectSpread({}, cond), {}, {
             error: null,
-            value: value ? Object(_util__WEBPACK_IMPORTED_MODULE_0__["currencyToAmount"])(value) || 0 : 0
+            value: value ? Object(_util__WEBPACK_IMPORTED_MODULE_0__["currencyToAmount"])(String(value)) || 0 : 0
           });
         }
 
@@ -61995,11 +63746,12 @@ function getScheduledAmount(amount) {
 /*!*******************************************************!*\
   !*** ./packages/loot-core/src/shared/transactions.js ***!
   \*******************************************************/
-/*! exports provided: makeChild, recalculateSplit, findParentIndex, getSplit, ungroupTransactions, groupTransaction, ungroupTransaction, applyTransactionDiff, replaceTransactions, addSplitTransaction, updateTransaction, deleteTransaction, splitTransaction, realizeTempTransactions */
+/*! exports provided: isPreviewId, makeChild, recalculateSplit, findParentIndex, getSplit, ungroupTransactions, groupTransaction, ungroupTransaction, applyTransactionDiff, replaceTransactions, addSplitTransaction, updateTransaction, deleteTransaction, splitTransaction, realizeTempTransactions */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPreviewId", function() { return isPreviewId; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "makeChild", function() { return makeChild; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recalculateSplit", function() { return recalculateSplit; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findParentIndex", function() { return findParentIndex; });
@@ -62029,8 +63781,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-const uuid = __webpack_require__(/*! ../platform/uuid */ "./packages/loot-core/src/platform/uuid/index.electron.js"); // The amount might be null when adding a new transaction
+const uuid = __webpack_require__(/*! ../platform/uuid */ "./packages/loot-core/src/platform/uuid/index.electron.js");
 
+function isPreviewId(id) {
+  return id.indexOf('preview/') !== -1;
+} // The amount might be null when adding a new transaction
 
 function num(n) {
   return typeof n === 'number' ? n : 0;
@@ -62671,7 +64426,7 @@ const MAX_SAFE_NUMBER = 2 ** 51 - 1;
 const MIN_SAFE_NUMBER = -MAX_SAFE_NUMBER;
 function safeNumber(value) {
   if (!Number.isInteger(value)) {
-    throw new Error('safeNumber: number is not an integer: ' + value);
+    throw new Error('safeNumber: number is not an integer: ' + JSON.stringify(value));
   }
 
   if (value > MAX_SAFE_NUMBER || value < MIN_SAFE_NUMBER) {